[jts] 01/01: New upstream version 1.15.0+ds
Bas Couwenberg
sebastic at debian.org
Sun Dec 10 22:55:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch upstream
in repository jts.
commit fc7668c0c168830dd6675f3a484aff9e7a068cf0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 10 21:28:44 2017 +0100
New upstream version 1.15.0+ds
---
.gitignore | 8 +
.travis.yml | 8 +
CONTRIBUTING.md | 40 +
DEVELOPING.md | 88 +
FAQ-LICENSING.md | 62 +
LICENSES.md | 21 +
LICENSE_EDLv1.txt | 30 +
LICENSE_EPLv1.txt | 216 +
MIGRATION.md | 32 +
OSGEO_LICENSE.txt | 11 +
README.md | 59 +
RELEASING.md | 15 +
USING.md | 84 +
bin/test.bat | 48 +-
bin/test_robust.bat | 48 +-
bin/test_stmlf.bat | 25 -
bin/testbuilder.bat | 39 +-
bin/testrunner.bat | 30 +-
bin/testrunner.properties | 6 +-
doc/JTS_Version_History.html | 2425 +-
doc/LICENSE.txt | 504 -
doc/sample_java_header.txt | 12 +
jts_logo.png | Bin 0 -> 9042 bytes
jtsio/src/META-INF/MANIFEST.MF | 4 -
.../jts/io/geojson/GeoJsonConstants.java | 57 -
.../jts/io/geojson/GeoJsonReader.java | 494 -
.../jts/io/geojson/GeoJsonWriter.java | 325 -
.../com/vividsolutions/jts/io/oracle/OraGeom.java | 521 -
.../vividsolutions/jts/io/oracle/OraReader.java | 650 -
.../com/vividsolutions/jts/io/oracle/OraUtil.java | 161 -
.../vividsolutions/jts/io/oracle/OraWriter.java | 715 -
.../com/vividsolutions/jts/io/sde/SdeReader.java | 264 -
locationtech_mark.png | Bin 0 -> 7190 bytes
modules/app/pom.xml | 66 +
.../jtstest/TestCoordinateSequenceFactory.java | 32 +
.../jtstest/clean/CleanDuplicatePoints.java | 111 +
.../function/AffineTransformationFunctions.java | 158 +
.../jtstest/function/BoundaryFunctions.java | 38 +
.../jtstest/function/BufferByUnionFunctions.java | 84 +
.../jtstest/function/BufferFunctions.java | 193 +
.../jtstest/function/ConstructionFunctions.java | 41 +
.../jtstest/function/ConversionFunctions.java | 70 +
.../function/CreateFractalShapeFunctions.java | 36 +
.../function/CreateRandomShapeFunctions.java | 281 +
.../jtstest/function/CreateShapeFunctions.java | 220 +
.../jtstest/function/DissolveFunctions.java | 25 +
.../jtstest/function/DistanceFunctions.java | 66 +
.../jtstest/function/DoubleKeyMap.java | 59 +
.../jtstest/function/FunctionsUtil.java | 98 +
.../jtstest/function/GeometryFunctions.java | 116 +
.../jtstest/function/JTSFunctions.java | 139 +
.../jtstest/function/LineHandlingFunctions.java | 90 +
.../jtstest/function/LineSegmentFunctions.java | 71 +
.../function/LinearReferencingFunctions.java | 50 +
.../jtstest/function/NodingFunctions.java | 152 +
.../jtstest/function/OffsetCurveFunctions.java | 34 +
.../jtstest/function/OrientationFunctions.java | 41 +
.../OverlayCommonBitsRemovedFunctions.java | 26 +
.../OverlayEnhancedPrecisionFunctions.java | 24 +
.../jtstest/function/OverlayFunctions.java | 46 +
.../jtstest/function/OverlayNoSnapFunctions.java | 24 +
.../jtstest/function/PointLocationFunctions.java | 21 +
.../jtstest/function/PolygonOverlayFunctions.java | 54 +
.../jtstest/function/PolygonizeFunctions.java | 83 +
.../jtstest/function/PrecisionFunctions.java | 54 +
.../function/PreparedGeometryFunctions.java | 53 +
.../jtstest/function/SelectionFunctions.java | 166 +
.../jtstest/function/SimplificationFunctions.java | 30 +
.../jtstest/function/SnappingFunctions.java | 36 +
.../jtstest/function/SortingFunctions.java | 82 +
.../jtstest/function/SpatialIndexFunctions.java | 152 +
.../function/SpatialPredicateFunctions.java | 37 +
.../function/TestCaseGeometryFunctions.java | 60 +
.../jtstest/function/TriangleFunctions.java | 91 +
.../jtstest/function/TriangulationFunctions.java | 145 +
.../jtstest/function/ValidationFunctions.java | 66 +
.../jtstest/function/WriterFunctions.java | 73 +
.../jtstest/geomfunction/BaseGeometryFunction.java | 190 +
.../jtstest/geomfunction/GeometryFunction.java | 100 +
.../geomfunction/GeometryFunctionInvocation.java | 62 +
.../geomfunction/GeometryFunctionRegistry.java | 323 +
.../jtstest/geomfunction/GeometryFunctionUtil.java | 26 +
.../jtstest/geomfunction/Metadata.java | 22 +
.../jtstest/geomfunction/MetadataUtil.java | 40 +
.../geomfunction/RepeaterGeometryFunction.java | 105 +
.../geomfunction/StaticMethodGeometryFunction.java | 205 +
.../org/locationtech/jtstest/test/TestCase.java | 360 +
.../locationtech/jtstest/test/TestCaseList.java | 76 +
.../org/locationtech/jtstest/test/Testable.java | 50 +
.../jtstest/testbuilder/AppConstants.java | 74 +
.../jtstest/testbuilder/AppCursors.java | 37 +
.../jtstest/testbuilder/AppStrings.java | 70 +
.../jtstest/testbuilder/BusyDialog.java | 166 +
.../testbuilder/GeometryEditControlPanel.java | 313 +
.../jtstest/testbuilder/GeometryEditPanel.java | 681 +
.../testbuilder/GeometryFunctionListPanel.java | 145 +
.../testbuilder/GeometryFunctionTreePanel.java | 194 +
.../jtstest/testbuilder/GeometryInputDialog.java | 242 +
.../testbuilder/GeometryInspectorDialog.java | 61 +
.../jtstest/testbuilder/GeometryPopupMenu.java | 76 +
.../jtstest/testbuilder/GeometryTreeModel.java | 541 +
.../jtstest/testbuilder/GeometryTreePanel.java | 162 +
.../jtstest/testbuilder/IconLoader.java | 25 +
.../jtstest/testbuilder/InfoPanel.java | 97 +
.../jtstest/testbuilder/InspectorPanel.java | 167 +
.../jtstest/testbuilder/JTSTestBuilder.java | 180 +
.../jtstest/testbuilder/JTSTestBuilderFrame.java | 873 +
.../jtstest/testbuilder/JTSTestBuilderMenuBar.java | 326 +
.../jtstest/testbuilder/JTSTestBuilderToolBar.java | 540 +
.../testbuilder/JTSTestBuilder_AboutBox.java | 133 +
.../jtstest/testbuilder/LayerCheckBoxList.java | 74 +
.../jtstest/testbuilder/LayerControlList.java | 200 +
.../jtstest/testbuilder/LayerListPanel.java | 92 +
.../jtstest/testbuilder/LoadTestCasesDialog.java | 190 +
.../jtstest/testbuilder/PrecisionModelDialog.java | 77 +
.../jtstest/testbuilder/PrecisionModelPanel.java | 155 +
.../jtstest/testbuilder/RelatePanel.java | 564 +
.../jtstest/testbuilder/ResultValuePanel.java | 111 +
.../jtstest/testbuilder/ResultWKTPanel.java | 214 +
.../jtstest/testbuilder/ScalarFunctionPanel.java | 252 +
.../jtstest/testbuilder/SpatialFunctionPanel.java | 467 +
.../jtstest/testbuilder/StatsPanel.java | 96 +
.../jtstest/testbuilder/TestBuilderPanel.java | 40 +
.../jtstest/testbuilder/TestCasePanel.java | 316 +
.../jtstest/testbuilder/TestCaseTextDialog.java | 294 +
.../jtstest/testbuilder/TestListPanel.java | 160 +
.../jtstest/testbuilder/ValidPanel.java | 272 +
.../locationtech/jtstest/testbuilder/WKTPanel.java | 499 +
.../controller/JTSTestBuilderController.java | 176 +
.../testbuilder/controller/ResultController.java | 213 +
.../testbuilder/event/GeometryFunctionEvent.java | 28 +
.../event/GeometryFunctionListener.java | 22 +
.../event/SpatialFunctionPanelEvent.java | 42 +
.../event/SpatialFunctionPanelListener.java | 27 +
.../jtstest/testbuilder/event/ValidPanelEvent.java | 30 +
.../testbuilder/event/ValidPanelListener.java | 27 +
.../testbuilder/geom/AdjacentVertexFinder.java | 86 +
.../jtstest/testbuilder/geom/ComponentLocater.java | 85 +
.../jtstest/testbuilder/geom/EnvelopeUtil.java | 33 +
.../jtstest/testbuilder/geom/FacetLocater.java | 155 +
.../testbuilder/geom/GeometryBoxDeleter.java | 160 +
.../jtstest/testbuilder/geom/GeometryCombiner.java | 120 +
.../jtstest/testbuilder/geom/GeometryLocation.java | 169 +
.../testbuilder/geom/GeometryPointLocater.java | 183 +
.../jtstest/testbuilder/geom/GeometryUtil.java | 41 +
.../testbuilder/geom/GeometryVertexDeleter.java | 79 +
.../testbuilder/geom/GeometryVertexInserter.java | 60 +
.../testbuilder/geom/GeometryVertexMover.java | 56 +
.../testbuilder/geom/NearestPointFinder.java | 73 +
.../jtstest/testbuilder/geom/VertexLocater.java | 143 +
.../io/shapefile/EndianDataInputStream.java | 134 +
.../io/shapefile/InvalidShapefileException.java | 31 +
.../testbuilder/io/shapefile/MultiLineHandler.java | 296 +
.../io/shapefile/MultiPointHandler.java | 203 +
.../testbuilder/io/shapefile/PointHandler.java | 106 +
.../testbuilder/io/shapefile/PolygonHandler.java | 421 +
.../testbuilder/io/shapefile/ShapeHandler.java | 31 +
.../shapefile/ShapeTypeNotSupportedException.java | 24 +
.../testbuilder/io/shapefile/Shapefile.java | 334 +
.../io/shapefile/ShapefileException.java | 38 +
.../testbuilder/io/shapefile/ShapefileHeader.java | 121 +
.../testbuilder/model/DisplayParameters.java | 100 +
.../jtstest/testbuilder/model/DrawingGrid.java | 88 +
.../testbuilder/model/GeometryContainer.java | 19 +
.../testbuilder/model/GeometryDepiction.java | 74 +
.../testbuilder/model/GeometryEditModel.java | 318 +
.../jtstest/testbuilder/model/GeometryEvent.java | 29 +
.../testbuilder/model/GeometryListener.java | 24 +
.../testbuilder/model/GeometryStretcherView.java | 146 +
.../testbuilder/model/GeometryTransferable.java | 76 +
.../jtstest/testbuilder/model/GeometryType.java | 26 +
.../jtstest/testbuilder/model/HtmlWriter.java | 544 +
.../model/IndexedGeometryContainer.java | 35 +
.../jtstest/testbuilder/model/JavaTestWriter.java | 81 +
.../jtstest/testbuilder/model/Layer.java | 133 +
.../jtstest/testbuilder/model/LayerList.java | 108 +
.../jtstest/testbuilder/model/PNGWriter.java | 100 +
.../testbuilder/model/ResultGeometryContainer.java | 32 +
.../jtstest/testbuilder/model/SVGTestWriter.java | 80 +
.../testbuilder/model/StaticGeometryContainer.java | 30 +
.../testbuilder/model/TestBuilderModel.java | 552 +
.../jtstest/testbuilder/model/TestCaseEdit.java | 156 +
.../jtstest/testbuilder/model/TestModel.java | 23 +
.../model/TestRunnerTestCaseAdapter.java | 286 +
.../jtstest/testbuilder/model/TestWriter.java | 23 +
.../jtstest/testbuilder/model/XMLTestWriter.java | 209 +
.../topostretch/GeometryVerticesMover.java | 84 +
.../testbuilder/topostretch/StretchedVertex.java | 340 +
.../topostretch/StretchedVertexFinder.java | 181 +
.../testbuilder/topostretch/TopologyStretcher.java | 152 +
.../jtstest/testbuilder/ui/ClipImage.java | 51 +
.../jtstest/testbuilder/ui/ColorUtil.java | 63 +
.../testbuilder/ui/GeometryLocationsWriter.java | 243 +
.../jtstest/testbuilder/ui/GraphicsUtil.java | 24 +
.../jtstest/testbuilder/ui/ImageUtil.java | 60 +
.../jtstest/testbuilder/ui/SwingUtil.java | 240 +
.../jtstest/testbuilder/ui/SwingWorker.java | 144 +
.../jtstest/testbuilder/ui/Viewport.java | 391 +
.../jtstest/testbuilder/ui/dnd/FileDrop.java | 605 +
.../testbuilder/ui/render/GeometryPainter.java | 200 +
.../testbuilder/ui/render/GridRenderer.java | 436 +
.../testbuilder/ui/render/LayerRenderer.java | 156 +
.../ui/render/OperationMonitorManager.java | 68 +
.../testbuilder/ui/render/RenderManager.java | 156 +
.../jtstest/testbuilder/ui/render/Renderer.java | 42 +
.../jtstest/testbuilder/ui/style/AWTUtil.java | 37 +
.../testbuilder/ui/style/ArrowEndpointStyle.java | 89 +
.../testbuilder/ui/style/ArrowLineStyle.java | 121 +
.../jtstest/testbuilder/ui/style/BasicStyle.java | 50 +
.../testbuilder/ui/style/CircleEndpointStyle.java | 67 +
.../testbuilder/ui/style/ComponentStyle.java | 46 +
.../testbuilder/ui/style/DataLabelStyle.java | 58 +
.../jtstest/testbuilder/ui/style/LayerStyle.java | 42 +
.../ui/style/LineStringEndpointStyle.java | 53 +
.../testbuilder/ui/style/LineStringStyle.java | 84 +
.../testbuilder/ui/style/MidArrowLineStyle.java | 56 +
.../ui/style/PolygonStructureStyle.java | 69 +
.../testbuilder/ui/style/SegmentIndexStyle.java | 90 +
.../jtstest/testbuilder/ui/style/SegmentStyle.java | 57 +
.../jtstest/testbuilder/ui/style/Style.java | 24 +
.../jtstest/testbuilder/ui/style/StyleList.java | 120 +
.../jtstest/testbuilder/ui/style/VertexStyle.java | 62 +
.../testbuilder/ui/tools/AbstractDrawTool.java | 54 +
.../ui/tools/AbstractStreamDrawTool.java | 77 +
.../jtstest/testbuilder/ui/tools/BasicTool.java | 187 +
.../jtstest/testbuilder/ui/tools/BoxBandTool.java | 182 +
.../testbuilder/ui/tools/DeleteVertexTool.java | 45 +
.../testbuilder/ui/tools/EditVertexTool.java | 136 +
.../testbuilder/ui/tools/ExtractComponentTool.java | 39 +
.../testbuilder/ui/tools/IndicatorTool.java | 173 +
.../jtstest/testbuilder/ui/tools/InfoTool.java | 40 +
.../jtstest/testbuilder/ui/tools/LineBandTool.java | 233 +
.../testbuilder/ui/tools/LineStringTool.java | 38 +
.../jtstest/testbuilder/ui/tools/PanTool.java | 66 +
.../jtstest/testbuilder/ui/tools/PointTool.java | 40 +
.../jtstest/testbuilder/ui/tools/PolygonTool.java | 38 +
.../testbuilder/ui/tools/RectangleTool.java | 43 +
.../testbuilder/ui/tools/StreamPolygonTool.java | 39 +
.../jtstest/testbuilder/ui/tools/Tool.java | 34 +
.../jtstest/testbuilder/ui/tools/ZoomTool.java | 118 +
.../org/locationtech/jtstest/util/ClassUtil.java | 109 +
.../jtstest/util/ExceptionFormatter.java | 22 +
.../org/locationtech/jtstest/util/FileUtil.java | 133 +
.../jtstest/util/GeometryDataUtil.java | 26 +
.../jtstest/util/GeometryTextCleaner.java | 51 +
.../org/locationtech/jtstest/util/HSBPalette.java | 79 +
.../jtstest/util/io/GeoJsonMultiReader.java | 77 +
.../org/locationtech/jtstest/util/io/IOUtil.java | 161 +
.../jtstest/util/io/MultiFormatReader.java | 142 +
.../locationtech/jtstest/util/io/SVGWriter.java | 610 +
.../jtstest/testbuilder/BinaryGeomFunction.png | Bin 0 -> 916 bytes
.../testbuilder/BinaryGeomFunctionWithParam.png | Bin 0 -> 173 bytes
.../locationtech/jtstest/testbuilder/Circle.gif | Bin 0 -> 996 bytes
.../org/locationtech/jtstest/testbuilder/Copy.png | Bin 0 -> 858 bytes
.../locationtech/jtstest/testbuilder/CopyCase.png | Bin 0 -> 852 bytes
.../jtstest/testbuilder/CopyToTest.png | Bin 0 -> 184 bytes
.../org/locationtech/jtstest/testbuilder/Cut.gif | Bin 0 -> 868 bytes
.../locationtech/jtstest/testbuilder/Delete.png | Bin 0 -> 360 bytes
.../jtstest/testbuilder/DeleteVertex.png | Bin 0 -> 199 bytes
.../jtstest/testbuilder/Delete_small.png | Bin 0 -> 170 bytes
.../org/locationtech/jtstest/testbuilder/Down.png | Bin 0 -> 961 bytes
.../org/locationtech/jtstest/testbuilder/Draw.gif | Bin 0 -> 953 bytes
.../jtstest/testbuilder/DrawCursor.png | Bin 0 -> 988 bytes
.../jtstest/testbuilder/DrawLineString.png | Bin 0 -> 916 bytes
.../jtstest/testbuilder/DrawLineStringB.png | Bin 0 -> 170 bytes
.../jtstest/testbuilder/DrawLinearRing.png | Bin 0 -> 211 bytes
.../jtstest/testbuilder/DrawLinearRingB.png | Bin 0 -> 254 bytes
.../locationtech/jtstest/testbuilder/DrawPoint.gif | Bin 0 -> 907 bytes
.../locationtech/jtstest/testbuilder/DrawPoint.png | Bin 0 -> 909 bytes
.../jtstest/testbuilder/DrawPointB.png | Bin 0 -> 163 bytes
.../jtstest/testbuilder/DrawPolygon.png | Bin 0 -> 956 bytes
.../jtstest/testbuilder/DrawPolygonB.png | Bin 0 -> 213 bytes
.../jtstest/testbuilder/DrawRectangle.png | Bin 0 -> 917 bytes
.../jtstest/testbuilder/DrawRectangleB.png | Bin 0 -> 174 bytes
.../jtstest/testbuilder/ExchangeGeoms.png | Bin 0 -> 961 bytes
.../jtstest/testbuilder/ExecuteProject.gif | Bin 0 -> 249 bytes
.../jtstest/testbuilder/ExtractComponent.png | Bin 0 -> 960 bytes
.../locationtech/jtstest/testbuilder/FingerUp.gif | Bin 0 -> 745 bytes
.../org/locationtech/jtstest/testbuilder/Hand.gif | Bin 0 -> 923 bytes
.../org/locationtech/jtstest/testbuilder/Home.gif | Bin 0 -> 1003 bytes
.../locationtech/jtstest/testbuilder/Hourglass.gif | Bin 0 -> 987 bytes
.../jtstest/testbuilder/Icon_GeomCollection.png | Bin 0 -> 250 bytes
.../jtstest/testbuilder/Icon_GeomCollection_B.png | Bin 0 -> 272 bytes
.../jtstest/testbuilder/Icon_LineString.png | Bin 0 -> 226 bytes
.../jtstest/testbuilder/Icon_LineString_B.png | Bin 0 -> 233 bytes
.../jtstest/testbuilder/Icon_LinearRing.png | Bin 0 -> 182 bytes
.../jtstest/testbuilder/Icon_LinearRing_B.png | Bin 0 -> 191 bytes
.../jtstest/testbuilder/Icon_Point.png | Bin 0 -> 180 bytes
.../jtstest/testbuilder/Icon_Point_B.png | Bin 0 -> 181 bytes
.../jtstest/testbuilder/Icon_Polygon.png | Bin 0 -> 187 bytes
.../jtstest/testbuilder/Icon_Polygon_B.png | Bin 0 -> 193 bytes
.../org/locationtech/jtstest/testbuilder/Info.png | Bin 0 -> 222 bytes
.../jtstest/testbuilder/InspectGeometry.png | Bin 0 -> 965 bytes
.../org/locationtech/jtstest/testbuilder/Left.png | Bin 0 -> 972 bytes
.../jtstest/testbuilder/LoadWKTToTest.png | Bin 0 -> 953 bytes
.../jtstest/testbuilder/MagnifyCursor.gif | Bin 0 -> 927 bytes
.../jtstest/testbuilder/MagnifyMinus.gif | Bin 0 -> 994 bytes
.../jtstest/testbuilder/MagnifyPlus.gif | Bin 0 -> 990 bytes
.../jtstest/testbuilder/MoveVertex.png | Bin 0 -> 967 bytes
.../jtstest/testbuilder/MoveVertexCursor.gif | Bin 0 -> 923 bytes
.../org/locationtech/jtstest/testbuilder/Paste.png | Bin 0 -> 852 bytes
.../org/locationtech/jtstest/testbuilder/Plus.png | Bin 0 -> 899 bytes
.../org/locationtech/jtstest/testbuilder/Right.png | Bin 0 -> 965 bytes
.../locationtech/jtstest/testbuilder/Select.gif | Bin 0 -> 925 bytes
.../jtstest/testbuilder/UnaryGeomFunction.png | Bin 0 -> 905 bytes
.../org/locationtech/jtstest/testbuilder/Up.png | Bin 0 -> 958 bytes
.../jtstest/testbuilder/YellowCircle.gif | Bin 0 -> 987 bytes
.../locationtech/jtstest/testbuilder/ZoomAll.png | Bin 0 -> 939 bytes
.../locationtech/jtstest/testbuilder/ZoomInput.png | Bin 0 -> 923 bytes
.../jtstest/testbuilder/ZoomInputA.png | Bin 0 -> 910 bytes
.../jtstest/testbuilder/ZoomInputB.png | Bin 0 -> 910 bytes
.../jtstest/testbuilder/ZoomOneToOne.png | Bin 0 -> 938 bytes
.../jtstest/testbuilder/ZoomResult.png | Bin 0 -> 154 bytes
.../locationtech/jtstest/testbuilder/app-icon.gif | Bin 0 -> 949 bytes
.../jtstest/testbuilder/booleanGeomFunction.png | Bin 0 -> 930 bytes
.../org/locationtech/jtstest/testbuilder/clear.gif | Bin 0 -> 832 bytes
.../jtstest/testbuilder/crossShaded.gif | Bin 0 -> 878 bytes
.../locationtech/jtstest/testbuilder/logo64.png | Bin 0 -> 347 bytes
.../jtstest/testbuilder/numGeomFunction.png | Bin 0 -> 185 bytes
.../jtstest/testbuilder/tickShaded.gif | Bin 0 -> 876 bytes
.../org/locationtech/jtstest/TestBuilderTest.java | 48 +
.../jtstest/TestFileGeometryExtractor.java | 68 +
.../org/locationtech/jtstest/TestReaderTest.java | 284 +
modules/core/pom.xml | 54 +
.../main/java/org/locationtech/jts/JTSVersion.java | 98 +
.../java/org/locationtech/jts/algorithm/Angle.java | 289 +
.../java/org/locationtech/jts/algorithm/Area.java | 115 +
.../jts/algorithm/BoundaryNodeRule.java | 195 +
.../locationtech/jts/algorithm/CGAlgorithms.java | 575 +
.../locationtech/jts/algorithm/CGAlgorithms3D.java | 163 +
.../locationtech/jts/algorithm/CGAlgorithmsDD.java | 206 +
.../org/locationtech/jts/algorithm/Centroid.java | 256 +
.../org/locationtech/jts/algorithm/ConvexHull.java | 509 +
.../org/locationtech/jts/algorithm/Distance.java | 222 +
.../locationtech/jts/algorithm/HCoordinate.java | 167 +
.../jts/algorithm/InteriorPointArea.java | 246 +
.../jts/algorithm/InteriorPointLine.java | 109 +
.../jts/algorithm/InteriorPointPoint.java | 70 +
.../org/locationtech/jts/algorithm/Length.java | 60 +
.../jts/algorithm/LineIntersector.java | 418 +
.../jts/algorithm/MinimumBoundingCircle.java | 346 +
.../jts/algorithm/MinimumDiameter.java | 343 +
.../jts/algorithm/NotRepresentableException.java | 30 +
.../locationtech/jts/algorithm/Orientation.java | 189 +
.../locationtech/jts/algorithm/PointLocation.java | 117 +
.../locationtech/jts/algorithm/PointLocator.java | 206 +
.../jts/algorithm/RayCrossingCounter.java | 221 +
.../jts/algorithm/RectangleLineIntersector.java | 145 +
.../jts/algorithm/RobustDeterminant.java | 402 +
.../jts/algorithm/RobustLineIntersector.java | 459 +
.../distance/DiscreteHausdorffDistance.java | 209 +
.../jts/algorithm/distance/DistanceToPoint.java | 76 +
.../jts/algorithm/distance/PointPairDistance.java | 99 +
.../jts/algorithm/distance/package.html | 13 +
.../locate/IndexedPointInAreaLocator.java | 152 +
.../algorithm/locate/PointOnGeometryLocator.java | 33 +
.../algorithm/locate/SimplePointInAreaLocator.java | 143 +
.../locationtech/jts/algorithm/locate/package.html | 13 +
.../jts/algorithm/match/AreaSimilarityMeasure.java | 51 +
.../match/HausdorffSimilarityMeasure.java | 75 +
.../jts/algorithm/match/SimilarityMeasure.java | 34 +
.../algorithm/match/SimilarityMeasureCombiner.java | 28 +
.../locationtech/jts/algorithm/match/package.html | 13 +
.../org/locationtech/jts/algorithm/package.html | 50 +
.../org/locationtech/jts/awt/FontGlyphReader.java | 124 +
.../jts/awt/GeometryCollectionShape.java | 109 +
.../jts/awt/IdentityPointTransformation.java | 31 +
.../locationtech/jts/awt/PointShapeFactory.java | 376 +
.../locationtech/jts/awt/PointTransformation.java | 35 +
.../org/locationtech/jts/awt/PolygonShape.java | 143 +
.../jts/awt/ShapeCollectionPathIterator.java | 100 +
.../java/org/locationtech/jts/awt/ShapeReader.java | 177 +
.../java/org/locationtech/jts/awt/ShapeWriter.java | 310 +
.../java/org/locationtech/jts/awt/package.html | 13 +
.../org/locationtech/jts/densify/Densifier.java | 172 +
.../java/org/locationtech/jts/densify/package.html | 13 +
.../jts/dissolve/DissolveEdgeGraph.java | 34 +
.../jts/dissolve/DissolveHalfEdge.java | 52 +
.../locationtech/jts/dissolve/LineDissolver.java | 300 +
.../org/locationtech/jts/edgegraph/EdgeGraph.java | 157 +
.../jts/edgegraph/EdgeGraphBuilder.java | 90 +
.../org/locationtech/jts/edgegraph/HalfEdge.java | 363 +
.../locationtech/jts/edgegraph/MarkHalfEdge.java | 122 +
.../java/org/locationtech/jts/geom/Coordinate.java | 428 +
.../locationtech/jts/geom/CoordinateArrays.java | 472 +
.../locationtech/jts/geom/CoordinateFilter.java | 45 +
.../org/locationtech/jts/geom/CoordinateList.java | 229 +
.../locationtech/jts/geom/CoordinateSequence.java | 177 +
.../jts/geom/CoordinateSequenceComparator.java | 142 +
.../jts/geom/CoordinateSequenceFactory.java | 58 +
.../jts/geom/CoordinateSequenceFilter.java | 82 +
.../locationtech/jts/geom/CoordinateSequences.java | 223 +
.../jts/geom/DefaultCoordinateSequence.java | 206 +
.../jts/geom/DefaultCoordinateSequenceFactory.java | 72 +
.../java/org/locationtech/jts/geom/Dimension.java | 143 +
.../java/org/locationtech/jts/geom/Envelope.java | 781 +
.../java/org/locationtech/jts/geom/Geometry.java | 1907 +
.../locationtech/jts/geom/GeometryCollection.java | 297 +
.../jts/geom/GeometryCollectionIterator.java | 139 +
.../jts/geom/GeometryComponentFilter.java | 47 +
.../org/locationtech/jts/geom/GeometryFactory.java | 628 +
.../org/locationtech/jts/geom/GeometryFilter.java | 37 +
.../locationtech/jts/geom/IntersectionMatrix.java | 577 +
.../org/locationtech/jts/geom/LineSegment.java | 655 +
.../java/org/locationtech/jts/geom/LineString.java | 336 +
.../java/org/locationtech/jts/geom/Lineal.java | 24 +
.../java/org/locationtech/jts/geom/LinearRing.java | 142 +
.../java/org/locationtech/jts/geom/Location.java | 71 +
.../org/locationtech/jts/geom/MultiLineString.java | 135 +
.../java/org/locationtech/jts/geom/MultiPoint.java | 114 +
.../org/locationtech/jts/geom/MultiPolygon.java | 146 +
.../locationtech/jts/geom/OctagonalEnvelope.java | 362 +
.../main/java/org/locationtech/jts/geom/Point.java | 228 +
.../java/org/locationtech/jts/geom/Polygon.java | 446 +
.../java/org/locationtech/jts/geom/Polygonal.java | 26 +
.../org/locationtech/jts/geom/PrecisionModel.java | 469 +
.../java/org/locationtech/jts/geom/Puntal.java | 24 +
.../locationtech/jts/geom/TopologyException.java | 47 +
.../java/org/locationtech/jts/geom/Triangle.java | 559 +
.../jts/geom/impl/CoordinateArraySequence.java | 273 +
.../geom/impl/CoordinateArraySequenceFactory.java | 81 +
.../jts/geom/impl/PackedCoordinateSequence.java | 492 +
.../geom/impl/PackedCoordinateSequenceFactory.java | 154 +
.../org/locationtech/jts/geom/impl/package.html | 13 +
.../java/org/locationtech/jts/geom/package.html | 25 +
.../geom/prep/AbstractPreparedPolygonContains.java | 226 +
.../jts/geom/prep/BasicPreparedGeometry.java | 203 +
.../jts/geom/prep/PreparedGeometry.java | 172 +
.../jts/geom/prep/PreparedGeometryFactory.java | 67 +
.../jts/geom/prep/PreparedLineString.java | 60 +
.../geom/prep/PreparedLineStringIntersects.java | 125 +
.../locationtech/jts/geom/prep/PreparedPoint.java | 48 +
.../jts/geom/prep/PreparedPolygon.java | 123 +
.../jts/geom/prep/PreparedPolygonContains.java | 80 +
.../geom/prep/PreparedPolygonContainsProperly.java | 105 +
.../jts/geom/prep/PreparedPolygonCovers.java | 80 +
.../jts/geom/prep/PreparedPolygonIntersects.java | 106 +
.../jts/geom/prep/PreparedPolygonPredicate.java | 149 +
.../org/locationtech/jts/geom/prep/package.html | 13 +
.../jts/geom/util/AffineTransformation.java | 1097 +
.../jts/geom/util/AffineTransformationBuilder.java | 143 +
.../jts/geom/util/AffineTransformationFactory.java | 178 +
.../geom/util/ComponentCoordinateExtracter.java | 68 +
.../jts/geom/util/GeometryCollectionMapper.java | 56 +
.../jts/geom/util/GeometryCombiner.java | 175 +
.../locationtech/jts/geom/util/GeometryEditor.java | 357 +
.../jts/geom/util/GeometryExtracter.java | 88 +
.../locationtech/jts/geom/util/GeometryMapper.java | 83 +
.../jts/geom/util/GeometryTransformer.java | 297 +
.../jts/geom/util/LineStringExtracter.java | 93 +
.../jts/geom/util/LinearComponentExtracter.java | 209 +
.../util/NoninvertibleTransformationException.java | 32 +
.../locationtech/jts/geom/util/PointExtracter.java | 81 +
.../jts/geom/util/PolygonExtracter.java | 77 +
.../geom/util/ShortCircuitedGeometryVisitor.java | 49 +
.../jts/geom/util/SineStarFactory.java | 130 +
.../org/locationtech/jts/geom/util/package.html | 13 +
.../java/org/locationtech/jts/geomgraph/Depth.java | 137 +
.../locationtech/jts/geomgraph/DirectedEdge.java | 219 +
.../jts/geomgraph/DirectedEdgeStar.java | 389 +
.../java/org/locationtech/jts/geomgraph/Edge.java | 270 +
.../org/locationtech/jts/geomgraph/EdgeEnd.java | 129 +
.../locationtech/jts/geomgraph/EdgeEndStar.java | 338 +
.../jts/geomgraph/EdgeIntersection.java | 87 +
.../jts/geomgraph/EdgeIntersectionList.java | 151 +
.../org/locationtech/jts/geomgraph/EdgeList.java | 114 +
.../jts/geomgraph/EdgeNodingValidator.java | 81 +
.../org/locationtech/jts/geomgraph/EdgeRing.java | 231 +
.../locationtech/jts/geomgraph/GeometryGraph.java | 475 +
.../locationtech/jts/geomgraph/GraphComponent.java | 84 +
.../java/org/locationtech/jts/geomgraph/Label.java | 201 +
.../java/org/locationtech/jts/geomgraph/Node.java | 154 +
.../locationtech/jts/geomgraph/NodeFactory.java | 29 +
.../org/locationtech/jts/geomgraph/NodeMap.java | 120 +
.../locationtech/jts/geomgraph/PlanarGraph.java | 238 +
.../org/locationtech/jts/geomgraph/Position.java | 40 +
.../org/locationtech/jts/geomgraph/Quadrant.java | 139 +
.../jts/geomgraph/TopologyLocation.java | 185 +
.../jts/geomgraph/index/EdgeSetIntersector.java | 57 +
.../jts/geomgraph/index/MonotoneChain.java | 34 +
.../jts/geomgraph/index/MonotoneChainEdge.java | 142 +
.../jts/geomgraph/index/MonotoneChainIndexer.java | 99 +
.../jts/geomgraph/index/SegmentIntersector.java | 206 +
.../geomgraph/index/SimpleEdgeSetIntersector.java | 82 +
.../index/SimpleMCSweepLineIntersector.java | 151 +
.../index/SimpleSweepLineIntersector.java | 144 +
.../jts/geomgraph/index/SweepLineEvent.java | 91 +
.../jts/geomgraph/index/SweepLineSegment.java | 53 +
.../locationtech/jts/geomgraph/index/package.html | 13 +
.../org/locationtech/jts/geomgraph/package.html | 25 +
.../locationtech/jts/index/ArrayListVisitor.java | 35 +
.../org/locationtech/jts/index/ItemVisitor.java | 24 +
.../org/locationtech/jts/index/SpatialIndex.java | 67 +
.../locationtech/jts/index/bintree/Bintree.java | 190 +
.../locationtech/jts/index/bintree/Interval.java | 84 +
.../org/locationtech/jts/index/bintree/Key.java | 75 +
.../org/locationtech/jts/index/bintree/Node.java | 152 +
.../locationtech/jts/index/bintree/NodeBase.java | 173 +
.../org/locationtech/jts/index/bintree/Root.java | 100 +
.../locationtech/jts/index/bintree/package.html | 13 +
.../jts/index/chain/MonotoneChain.java | 242 +
.../jts/index/chain/MonotoneChainBuilder.java | 120 +
.../index/chain/MonotoneChainOverlapAction.java | 51 +
.../jts/index/chain/MonotoneChainSelectAction.java | 55 +
.../org/locationtech/jts/index/chain/package.html | 13 +
.../intervalrtree/IntervalRTreeBranchNode.java | 46 +
.../index/intervalrtree/IntervalRTreeLeafNode.java | 37 +
.../jts/index/intervalrtree/IntervalRTreeNode.java | 58 +
.../intervalrtree/SortedPackedIntervalRTree.java | 141 +
.../jts/index/intervalrtree/package.html | 13 +
.../org/locationtech/jts/index/kdtree/KdNode.java | 144 +
.../jts/index/kdtree/KdNodeVisitor.java | 29 +
.../org/locationtech/jts/index/kdtree/KdTree.java | 349 +
.../org/locationtech/jts/index/kdtree/package.html | 13 +
.../java/org/locationtech/jts/index/package.html | 13 +
.../jts/index/quadtree/DoubleBits.java | 153 +
.../jts/index/quadtree/IntervalSize.java | 52 +
.../org/locationtech/jts/index/quadtree/Key.java | 81 +
.../org/locationtech/jts/index/quadtree/Node.java | 179 +
.../locationtech/jts/index/quadtree/NodeBase.java | 236 +
.../locationtech/jts/index/quadtree/Quadtree.java | 242 +
.../org/locationtech/jts/index/quadtree/Root.java | 99 +
.../locationtech/jts/index/quadtree/package.html | 13 +
.../jts/index/strtree/AbstractNode.java | 125 +
.../jts/index/strtree/AbstractSTRtree.java | 450 +
.../locationtech/jts/index/strtree/Boundable.java | 30 +
.../jts/index/strtree/BoundablePair.java | 211 +
.../strtree/BoundablePairDistanceComparator.java | 65 +
.../jts/index/strtree/GeometryItemDistance.java | 43 +
.../locationtech/jts/index/strtree/Interval.java | 57 +
.../jts/index/strtree/ItemBoundable.java | 37 +
.../jts/index/strtree/ItemDistance.java | 37 +
.../locationtech/jts/index/strtree/SIRtree.java | 109 +
.../locationtech/jts/index/strtree/STRtree.java | 500 +
.../locationtech/jts/index/strtree/package.html | 8 +
.../jts/index/sweepline/SweepLineEvent.java | 66 +
.../jts/index/sweepline/SweepLineIndex.java | 95 +
.../jts/index/sweepline/SweepLineInterval.java | 40 +
.../index/sweepline/SweepLineOverlapAction.java | 25 +
.../locationtech/jts/index/sweepline/package.html | 13 +
.../org/locationtech/jts/io/ByteArrayInStream.java | 70 +
.../locationtech/jts/io/ByteOrderDataInStream.java | 87 +
.../org/locationtech/jts/io/ByteOrderValues.java | 118 +
.../java/org/locationtech/jts/io/InStream.java | 33 +
.../locationtech/jts/io/InputStreamInStream.java | 34 +
.../java/org/locationtech/jts/io/OutStream.java | 24 +
.../locationtech/jts/io/OutputStreamOutStream.java | 33 +
.../org/locationtech/jts/io/ParseException.java | 54 +
.../java/org/locationtech/jts/io/WKBConstants.java | 28 +
.../org/locationtech/jts/io/WKBHexFileReader.java | 171 +
.../java/org/locationtech/jts/io/WKBReader.java | 387 +
.../java/org/locationtech/jts/io/WKBWriter.java | 427 +
.../org/locationtech/jts/io/WKTFileReader.java | 168 +
.../java/org/locationtech/jts/io/WKTReader.java | 755 +
.../java/org/locationtech/jts/io/WKTWriter.java | 770 +
.../org/locationtech/jts/io/gml2/GMLConstants.java | 53 +
.../org/locationtech/jts/io/gml2/GMLHandler.java | 274 +
.../org/locationtech/jts/io/gml2/GMLReader.java | 120 +
.../org/locationtech/jts/io/gml2/GMLWriter.java | 477 +
.../jts/io/gml2/GeometryStrategies.java | 527 +
.../java/org/locationtech/jts/io/gml2/package.html | 6 +
.../org/locationtech/jts/io/kml/KMLWriter.java | 399 +
.../main/java/org/locationtech/jts/io/package.html | 25 +
.../jts/linearref/ExtractLineByLocation.java | 191 +
.../jts/linearref/LengthIndexOfPoint.java | 129 +
.../jts/linearref/LengthIndexedLine.java | 253 +
.../jts/linearref/LengthLocationMap.java | 204 +
.../jts/linearref/LinearGeometryBuilder.java | 138 +
.../locationtech/jts/linearref/LinearIterator.java | 192 +
.../locationtech/jts/linearref/LinearLocation.java | 477 +
.../jts/linearref/LocationIndexOfLine.java | 66 +
.../jts/linearref/LocationIndexOfPoint.java | 159 +
.../jts/linearref/LocationIndexedLine.java | 214 +
.../org/locationtech/jts/linearref/package.html | 37 +
.../main/java/org/locationtech/jts/math/DD.java | 1380 +
.../java/org/locationtech/jts/math/MathUtil.java | 125 +
.../java/org/locationtech/jts/math/Matrix.java | 99 +
.../java/org/locationtech/jts/math/Plane3D.java | 91 +
.../java/org/locationtech/jts/math/Vector2D.java | 339 +
.../java/org/locationtech/jts/math/Vector3D.java | 161 +
.../jts/noding/BasicSegmentString.java | 89 +
.../jts/noding/FastNodingValidator.java | 156 +
.../noding/FastSegmentSetIntersectionFinder.java | 79 +
.../jts/noding/InteriorIntersectionFinder.java | 259 +
.../noding/InteriorIntersectionFinderAdder.java | 93 +
.../locationtech/jts/noding/IntersectionAdder.java | 164 +
.../jts/noding/IntersectionFinderAdder.java | 94 +
.../org/locationtech/jts/noding/IteratedNoder.java | 122 +
.../org/locationtech/jts/noding/MCIndexNoder.java | 125 +
.../noding/MCIndexSegmentSetMutualIntersector.java | 142 +
.../jts/noding/NodableSegmentString.java | 33 +
.../jts/noding/NodedSegmentString.java | 195 +
.../java/org/locationtech/jts/noding/Noder.java | 46 +
.../locationtech/jts/noding/NodingValidator.java | 165 +
.../java/org/locationtech/jts/noding/Octant.java | 89 +
.../jts/noding/OrientedCoordinateArray.java | 110 +
.../org/locationtech/jts/noding/ScaledNoder.java | 129 +
.../jts/noding/SegmentIntersectionDetector.java | 216 +
.../jts/noding/SegmentIntersector.java | 46 +
.../org/locationtech/jts/noding/SegmentNode.java | 82 +
.../locationtech/jts/noding/SegmentNodeList.java | 369 +
.../jts/noding/SegmentPointComparator.java | 77 +
.../jts/noding/SegmentSetMutualIntersector.java | 49 +
.../org/locationtech/jts/noding/SegmentString.java | 44 +
.../jts/noding/SegmentStringDissolver.java | 156 +
.../locationtech/jts/noding/SegmentStringUtil.java | 100 +
.../org/locationtech/jts/noding/SimpleNoder.java | 65 +
.../noding/SimpleSegmentSetMutualIntersector.java | 83 +
.../locationtech/jts/noding/SinglePassNoder.java | 70 +
.../java/org/locationtech/jts/noding/package.html | 13 +
.../jts/noding/snapround/GeometryNoder.java | 133 +
.../jts/noding/snapround/HotPixel.java | 300 +
.../jts/noding/snapround/MCIndexPointSnapper.java | 113 +
.../jts/noding/snapround/MCIndexSnapRounder.java | 156 +
.../jts/noding/snapround/SimpleSnapRounder.java | 185 +
.../locationtech/jts/noding/snapround/package.html | 13 +
.../org/locationtech/jts/operation/BoundaryOp.java | 183 +
.../jts/operation/GeometryGraphOperation.java | 73 +
.../org/locationtech/jts/operation/IsSimpleOp.java | 345 +
.../jts/operation/buffer/BufferBuilder.java | 325 +
.../buffer/BufferInputLineSimplifier.java | 241 +
.../jts/operation/buffer/BufferOp.java | 371 +
.../jts/operation/buffer/BufferParameters.java | 345 +
.../jts/operation/buffer/BufferSubgraph.java | 318 +
.../jts/operation/buffer/OffsetCurveBuilder.java | 341 +
.../operation/buffer/OffsetCurveSetBuilder.java | 308 +
.../operation/buffer/OffsetSegmentGenerator.java | 656 +
.../jts/operation/buffer/OffsetSegmentString.java | 139 +
.../jts/operation/buffer/RightmostEdgeFinder.java | 171 +
.../jts/operation/buffer/SubgraphDepthLocater.java | 245 +
.../locationtech/jts/operation/buffer/package.html | 13 +
.../validate/BufferCurveMaximumDistanceFinder.java | 126 +
.../buffer/validate/BufferDistanceValidator.java | 239 +
.../buffer/validate/BufferResultValidator.java | 210 +
.../buffer/validate/DistanceToPointFinder.java | 74 +
.../buffer/validate/PointPairDistance.java | 92 +
.../jts/operation/buffer/validate/package.html | 13 +
.../distance/ConnectedElementLocationFilter.java | 65 +
.../distance/ConnectedElementPointFilter.java | 63 +
.../jts/operation/distance/DistanceOp.java | 418 +
.../jts/operation/distance/FacetSequence.java | 172 +
.../distance/FacetSequenceTreeBuilder.java | 85 +
.../jts/operation/distance/GeometryLocation.java | 92 +
.../operation/distance/IndexedFacetDistance.java | 167 +
.../jts/operation/distance/package.html | 13 +
.../distance3d/AxisPlaneCoordinateSequence.java | 142 +
.../jts/operation/distance3d/Distance3DOp.java | 566 +
.../jts/operation/distance3d/PlanarPolygon3D.java | 174 +
.../jts/operation/linemerge/EdgeString.java | 83 +
.../operation/linemerge/LineMergeDirectedEdge.java | 59 +
.../jts/operation/linemerge/LineMergeEdge.java | 38 +
.../jts/operation/linemerge/LineMergeGraph.java | 70 +
.../jts/operation/linemerge/LineMerger.java | 178 +
.../jts/operation/linemerge/LineSequencer.java | 471 +
.../jts/operation/linemerge/package.html | 13 +
.../overlay/ConsistentPolygonRingChecker.java | 144 +
.../jts/operation/overlay/EdgeSetNoder.java | 61 +
.../jts/operation/overlay/LineBuilder.java | 188 +
.../jts/operation/overlay/MaximalEdgeRing.java | 88 +
.../jts/operation/overlay/MinimalEdgeRing.java | 46 +
.../jts/operation/overlay/OverlayNodeFactory.java | 38 +
.../jts/operation/overlay/OverlayOp.java | 689 +
.../jts/operation/overlay/PointBuilder.java | 111 +
.../jts/operation/overlay/PolygonBuilder.java | 289 +
.../jts/operation/overlay/package.html | 41 +
.../operation/overlay/snap/GeometrySnapper.java | 263 +
.../operation/overlay/snap/LineStringSnapper.java | 218 +
.../overlay/snap/SnapIfNeededOverlayOp.java | 103 +
.../jts/operation/overlay/snap/SnapOverlayOp.java | 138 +
.../jts/operation/overlay/snap/package.html | 13 +
.../overlay/validate/FuzzyPointLocator.java | 141 +
.../overlay/validate/OffsetPointGenerator.java | 117 +
.../overlay/validate/OverlayResultValidator.java | 165 +
.../jts/operation/overlay/validate/package.html | 13 +
.../org/locationtech/jts/operation/package.html | 13 +
.../jts/operation/polygonize/EdgeRing.java | 467 +
.../polygonize/PolygonizeDirectedEdge.java | 93 +
.../jts/operation/polygonize/PolygonizeEdge.java | 35 +
.../jts/operation/polygonize/PolygonizeGraph.java | 437 +
.../jts/operation/polygonize/Polygonizer.java | 359 +
.../jts/operation/polygonize/package.html | 13 +
.../jts/operation/predicate/RectangleContains.java | 171 +
.../operation/predicate/RectangleIntersects.java | 341 +
.../jts/operation/predicate/package.html | 13 +
.../jts/operation/relate/EdgeEndBuilder.java | 150 +
.../jts/operation/relate/EdgeEndBundle.java | 192 +
.../jts/operation/relate/EdgeEndBundleStar.java | 69 +
.../jts/operation/relate/RelateComputer.java | 389 +
.../jts/operation/relate/RelateNode.java | 52 +
.../jts/operation/relate/RelateNodeFactory.java | 33 +
.../jts/operation/relate/RelateNodeGraph.java | 135 +
.../jts/operation/relate/RelateOp.java | 115 +
.../locationtech/jts/operation/relate/package.html | 52 +
.../jts/operation/union/CascadedPolygonUnion.java | 412 +
.../jts/operation/union/PointGeometryUnion.java | 86 +
.../jts/operation/union/UnaryUnionOp.java | 278 +
.../jts/operation/union/UnionInteracting.java | 133 +
.../locationtech/jts/operation/union/package.html | 13 +
.../operation/valid/ConnectedInteriorTester.java | 233 +
.../jts/operation/valid/ConsistentAreaTester.java | 149 +
.../operation/valid/IndexedNestedRingTester.java | 108 +
.../jts/operation/valid/IsValidOp.java | 618 +
.../jts/operation/valid/RepeatedPointTester.java | 81 +
.../operation/valid/TopologyValidationError.java | 173 +
.../locationtech/jts/operation/valid/package.html | 13 +
.../locationtech/jts/planargraph/DirectedEdge.java | 213 +
.../jts/planargraph/DirectedEdgeStar.java | 163 +
.../org/locationtech/jts/planargraph/Edge.java | 120 +
.../jts/planargraph/GraphComponent.java | 151 +
.../org/locationtech/jts/planargraph/Node.java | 128 +
.../org/locationtech/jts/planargraph/NodeMap.java | 81 +
.../locationtech/jts/planargraph/PlanarGraph.java | 220 +
.../org/locationtech/jts/planargraph/Subgraph.java | 107 +
.../algorithm/ConnectedSubgraphFinder.java | 96 +
.../jts/planargraph/algorithm/package.html | 13 +
.../org/locationtech/jts/planargraph/package.html | 13 +
.../org/locationtech/jts/precision/CommonBits.java | 139 +
.../locationtech/jts/precision/CommonBitsOp.java | 163 +
.../jts/precision/CommonBitsRemover.java | 158 +
.../CoordinatePrecisionReducerFilter.java | 68 +
.../jts/precision/EnhancedPrecisionOp.java | 204 +
.../jts/precision/GeometryPrecisionReducer.java | 217 +
.../jts/precision/MinimumClearance.java | 315 +
.../PrecisionReducerCoordinateOperation.java | 77 +
.../precision/SimpleGeometryPrecisionReducer.java | 153 +
.../jts/precision/SimpleMinimumClearance.java | 164 +
.../jts/precision/doc-files/minClearance.png | Bin 0 -> 6539 bytes
.../org/locationtech/jts/precision/package.html | 14 +
.../jts/shape/GeometricShapeBuilder.java | 94 +
.../jts/shape/fractal/KochSnowflakeBuilder.java | 103 +
.../jts/shape/fractal/SierpinskiCarpetBuilder.java | 100 +
.../jts/shape/random/RandomPointsBuilder.java | 107 +
.../shape/random/RandomPointsInGridBuilder.java | 151 +
.../jts/simplify/DouglasPeuckerLineSimplifier.java | 97 +
.../jts/simplify/DouglasPeuckerSimplifier.java | 210 +
.../jts/simplify/LineSegmentIndex.java | 95 +
.../jts/simplify/TaggedLineSegment.java | 42 +
.../jts/simplify/TaggedLineString.java | 102 +
.../jts/simplify/TaggedLineStringSimplifier.java | 238 +
.../jts/simplify/TaggedLinesSimplifier.java | 63 +
.../jts/simplify/TopologyPreservingSimplifier.java | 185 +
.../jts/simplify/VWLineSimplifier.java | 174 +
.../locationtech/jts/simplify/VWSimplifier.java | 213 +
.../org/locationtech/jts/simplify/package.html | 13 +
.../ConformingDelaunayTriangulationBuilder.java | 198 +
.../ConformingDelaunayTriangulator.java | 544 +
.../ConstraintEnforcementException.java | 64 +
.../triangulate/ConstraintSplitPointFinder.java | 38 +
.../jts/triangulate/ConstraintVertex.java | 88 +
.../jts/triangulate/ConstraintVertexFactory.java | 25 +
.../triangulate/DelaunayTriangulationBuilder.java | 190 +
.../IncrementalDelaunayTriangulator.java | 123 +
.../jts/triangulate/MidpointSplitPointFinder.java | 41 +
.../NonEncroachingSplitPointFinder.java | 73 +
.../org/locationtech/jts/triangulate/Segment.java | 201 +
.../locationtech/jts/triangulate/SplitSegment.java | 89 +
.../VertexTaggedGeometryDataMapper.java | 94 +
.../jts/triangulate/VoronoiDiagramBuilder.java | 179 +
.../org/locationtech/jts/triangulate/package.html | 13 +
.../quadedge/EdgeConnectedTriangleTraversal.java | 73 +
.../quadedge/LastFoundQuadEdgeLocator.java | 56 +
.../quadedge/LocateFailureException.java | 48 +
.../jts/triangulate/quadedge/QuadEdge.java | 414 +
.../jts/triangulate/quadedge/QuadEdgeLocator.java | 26 +
.../triangulate/quadedge/QuadEdgeSubdivision.java | 950 +
.../jts/triangulate/quadedge/QuadEdgeTriangle.java | 340 +
.../jts/triangulate/quadedge/QuadEdgeUtil.java | 47 +
.../jts/triangulate/quadedge/TraversalVisitor.java | 38 +
.../triangulate/quadedge/TrianglePredicate.java | 314 +
.../jts/triangulate/quadedge/TriangleVisitor.java | 28 +
.../jts/triangulate/quadedge/Vertex.java | 380 +
.../jts/triangulate/quadedge/package.html | 14 +
.../java/org/locationtech/jts/util/Assert.java | 103 +
.../jts/util/AssertionFailedException.java | 42 +
.../org/locationtech/jts/util/CollectionUtil.java | 82 +
.../jts/util/CoordinateArrayFilter.java | 53 +
.../jts/util/CoordinateCountFilter.java | 43 +
.../main/java/org/locationtech/jts/util/Debug.java | 328 +
.../jts/util/GeometricShapeFactory.java | 446 +
.../java/org/locationtech/jts/util/Memory.java | 87 +
.../java/org/locationtech/jts/util/NumberUtil.java | 23 +
.../org/locationtech/jts/util/ObjectCounter.java | 75 +
.../org/locationtech/jts/util/PriorityQueue.java | 133 +
.../java/org/locationtech/jts/util/Stopwatch.java | 87 +
.../java/org/locationtech/jts/util/StringUtil.java | 106 +
.../jts/util/UniqueCoordinateArrayFilter.java | 69 +
.../java/org/locationtech/jts/util/package.html | 8 +
modules/core/src/main/javadoc/overview.html | 12 +
.../jts/algorithm/AbstractPointInRingTest.java | 112 +
.../org/locationtech/jts/algorithm/AngleTest.java | 105 +
.../org/locationtech/jts/algorithm/AreaTest.java | 63 +
.../jts/algorithm/CGAlgorithmsDDTest.java | 23 +
.../locationtech/jts/algorithm/CentroidTest.java | 50 +
.../locationtech/jts/algorithm/ConvexHullTest.java | 146 +
.../locationtech/jts/algorithm/DistanceTest.java | 47 +
.../jts/algorithm/InteriorPointTest.java | 92 +
.../org/locationtech/jts/algorithm/IsCCWTest.java | 54 +
.../org/locationtech/jts/algorithm/LengthTest.java | 38 +
.../jts/algorithm/LocatePointInRingTest.java | 42 +
.../jts/algorithm/MinimumBoundingCircleTest.java | 117 +
.../jts/algorithm/MinimumDiameterTest.java | 69 +
.../jts/algorithm/NonRobustCGAlgorithms.java | 247 +
.../jts/algorithm/NonRobustLineIntersector.java | 297 +
.../algorithm/NonRobustLineIntersectorTest.java | 52 +
.../jts/algorithm/NonRobustRayCrossingCounter.java | 236 +
.../jts/algorithm/OrientationIndexFailureTest.java | 206 +
.../jts/algorithm/OrientationIndexTest.java | 101 +
.../jts/algorithm/PerturbedGridPolygonBuilder.java | 110 +
.../jts/algorithm/PointInRingTest.java | 49 +
.../jts/algorithm/PointLocationOnLineTest.java | 58 +
.../jts/algorithm/PointLocatorTest.java | 70 +
.../jts/algorithm/RayCrossingCounterTest.java | 42 +
.../algorithm/RectangleLineIntersectorTest.java | 163 +
.../jts/algorithm/RobustLineIntersectionTest.java | 368 +
.../jts/algorithm/RobustLineIntersectorTest.java | 161 +
.../jts/algorithm/ShewchuksDeterminant.java | 798 +
.../distance/DiscreteHausdorffDistanceTest.java | 81 +
.../locate/IndexedPointInAreaLocatorTest.java | 46 +
.../locate/SimplePointInAreaLocatorTest.java | 46 +
.../jts/dissolve/LineDissolverTest.java | 154 +
.../locationtech/jts/edgegraph/EdgeGraphTest.java | 71 +
.../jts/generator/GeometryGenerator.java | 150 +
.../locationtech/jts/generator/GridGenerator.java | 155 +
.../jts/generator/LineStringGenerator.java | 201 +
.../locationtech/jts/generator/MultiGenerator.java | 175 +
.../locationtech/jts/generator/PointGenerator.java | 44 +
.../jts/generator/PolygonGenerator.java | 310 +
.../org/locationtech/jts/geom/AreaLengthTest.java | 68 +
.../jts/geom/BidirectionalComparatorTest.java | 69 +
.../jts/geom/CoordinateArraysTest.java | 84 +
.../jts/geom/CoordinateSequencesTest.java | 70 +
.../org/locationtech/jts/geom/CoordinateTest.java | 168 +
.../org/locationtech/jts/geom/EnvelopeTest.java | 269 +
.../jts/geom/GeometryCollectionImplTest.java | 78 +
.../jts/geom/GeometryCollectionIteratorTest.java | 54 +
.../locationtech/jts/geom/GeometryFactoryTest.java | 110 +
.../locationtech/jts/geom/GeometryImplTest.java | 448 +
.../jts/geom/IntersectionMatrixTest.java | 118 +
.../org/locationtech/jts/geom/IsRectangleTest.java | 83 +
.../org/locationtech/jts/geom/LineSegmentTest.java | 137 +
.../locationtech/jts/geom/LineStringImplTest.java | 185 +
.../locationtech/jts/geom/MultiPointImplTest.java | 87 +
.../org/locationtech/jts/geom/NormalizeTest.java | 198 +
.../org/locationtech/jts/geom/PointImplTest.java | 104 +
.../locationtech/jts/geom/PrecisionModelTest.java | 68 +
.../jts/geom/PredicateShortCircuitTest.java | 84 +
.../jts/geom/RectanglePredicateSyntheticTest.java | 145 +
.../jts/geom/RectanglePredicateTest.java | 82 +
.../locationtech/jts/geom/SegmentDensifier.java | 66 +
.../org/locationtech/jts/geom/TriangleTest.java | 226 +
.../jts/geom/impl/BasicCoordinateSequenceTest.java | 53 +
.../jts/geom/impl/CoordinateArraySequenceTest.java | 40 +
.../jts/geom/impl/CoordinateSequenceTestBase.java | 185 +
.../geom/impl/PackedCoordinateSequenceTest.java | 40 +
.../prep/PreparedPolygonIntersectsStressTest.java | 143 +
.../prep/PreparedPolygonPredicateStressTest.java | 89 +
.../jts/geom/prep/StressTestHarness.java | 124 +
.../geom/util/AffineTransformationBuilderTest.java | 240 +
.../jts/geom/util/AffineTransformationTest.java | 260 +
.../locationtech/jts/index/SpatialIndexTester.java | 160 +
.../locationtech/jts/index/kdtree/KdTreeTest.java | 150 +
.../jts/index/quadtree/DoubleBitsTest.java | 36 +
.../jts/index/quadtree/IsEmptyTest.java | 33 +
.../jts/index/quadtree/QuadtreeTest.java | 70 +
.../index/strtree/GeometryDistanceComparator.java | 70 +
.../jts/index/strtree/IntervalTest.java | 68 +
.../jts/index/strtree/SIRtreeTest.java | 67 +
.../jts/index/strtree/STRtreeTest.java | 256 +
.../locationtech/jts/io/SerializabilityTest.java | 49 +
.../org/locationtech/jts/io/WKBReaderTest.java | 204 +
.../test/java/org/locationtech/jts/io/WKBTest.java | 245 +
.../org/locationtech/jts/io/WKBWriterTest.java | 66 +
.../org/locationtech/jts/io/WKTReaderExpTest.java | 91 +
.../jts/io/WKTReaderParseErrorTest.java | 86 +
.../org/locationtech/jts/io/WKTReaderTest.java | 149 +
.../org/locationtech/jts/io/WKTWriterTest.java | 166 +
.../jts/io/gml2/GMLReaderTestCase.java | 136 +
.../jts/io/gml2/StaticLineStringTest.java | 73 +
.../jts/io/gml2/StaticMultiLineStringTest.java | 78 +
.../jts/io/gml2/StaticMultiPointTest.java | 56 +
.../jts/io/gml2/StaticMultiPolygonTest.java | 151 +
.../locationtech/jts/io/gml2/StaticPointTest.java | 52 +
.../jts/io/gml2/StaticPolygonTest.java | 123 +
.../locationtech/jts/io/gml2/WritingTestCase.java | 86 +
.../java/org/locationtech/jts/io/gml2/geometry.xsd | 349 +
.../org/locationtech/jts/io/kml/KMLWriterTest.java | 166 +
.../jts/linearref/AbstractIndexedLineTest.java | 253 +
.../jts/linearref/LengthIndexedLineTest.java | 223 +
.../jts/linearref/LinearLocationTest.java | 165 +
.../jts/linearref/LocationIndexedLineTest.java | 105 +
.../org/locationtech/jts/math/DDBasicTest.java | 318 +
.../org/locationtech/jts/math/DDComputeTest.java | 132 +
.../java/org/locationtech/jts/math/DDIOTest.java | 243 +
.../java/org/locationtech/jts/math/DDTest.java | 49 +
.../org/locationtech/jts/math/Vector2DTest.java | 62 +
.../jts/noding/SegmentPointComparatorFullTest.java | 125 +
.../jts/noding/SegmentPointComparatorTest.java | 54 +
.../jts/noding/snapround/SnapRoundingTest.java | 176 +
.../locationtech/jts/operation/BoundaryTest.java | 139 +
.../locationtech/jts/operation/IsSimpleTest.java | 132 +
.../buffer/BufferResultValidatorTest.java | 59 +
.../jts/operation/buffer/BufferTest.java | 478 +
.../jts/operation/buffer/BufferValidator.java | 266 +
.../jts/operation/buffer/DepthSegmentTest.java | 62 +
.../jts/operation/distance/DistanceTest.java | 100 +
.../jts/operation/distance3d/Distance3DOpTest.java | 381 +
.../operation/distance3d/WithinDistance3DTest.java | 272 +
.../jts/operation/linemerge/LineMergerTest.java | 132 +
.../jts/operation/linemerge/LineSequencerTest.java | 250 +
.../overlay/FixedPrecisionSnappingTest.java | 45 +
.../jts/operation/polygonize/PolygonizeTest.java | 183 +
.../jts/operation/relate/ContainsTest.java | 70 +
.../relate/RelateBoundaryNodeRuleTest.java | 118 +
.../jts/operation/relate/RelateTest.java | 75 +
.../union/CascadedPolygonUnionFileTest.java | 74 +
.../operation/union/CascadedPolygonUnionTest.java | 103 +
.../union/CascadedPolygonUnionTester.java | 115 +
.../jts/operation/union/UnaryUnionTest.java | 74 +
.../jts/operation/valid/IsValidTest.java | 56 +
.../operation/valid/SimpleNestedRingTester.java | 80 +
.../jts/operation/valid/ValidClosedRingTest.java | 111 +
.../ValidSelfTouchingRingFormingHoleTest.java | 143 +
.../jts/precision/CommonBitsOpTest.java | 41 +
.../precision/GeometryPrecisionReducerTest.java | 146 +
.../jts/precision/MinimumClearanceTest.java | 58 +
.../SimpleGeometryPrecisionReducerTest.java | 110 +
.../jts/simplify/DouglasPeuckerSimplifierTest.java | 170 +
.../jts/simplify/GeometryOperationValidator.java | 106 +
.../jts/simplify/SameStructureTester.java | 79 +
.../simplify/TopologyPreservingSimplifierTest.java | 205 +
.../jts/simplify/VWSimplifierTest.java | 86 +
.../jts/triangulate/ConformingDelaunayTest.java | 76 +
.../locationtech/jts/triangulate/DelaunayTest.java | 112 +
.../locationtech/jts/triangulate/VoronoiTest.java | 71 +
.../locationtech/jts/util/PriorityQueueTest.java | 67 +
.../src/test/java/test/jts/GeometryTestCase.java | 93 +
.../core/src/test/java/test/jts/IsValidTester.java | 39 +
.../java/test/jts/LineIntersectorBenchmark.java | 125 +
modules/core/src/test/java/test/jts/TestFiles.java | 23 +
.../jts/geom/CoordinateSequenceExperiment2.java | 108 +
.../java/test/jts/geom/GeometryTestFactory.java | 176 +
.../test/java/test/jts/geom/TestSerializable.java | 153 +
.../java/test/jts/index/BinTreeCorrectTest.java | 136 +
.../src/test/java/test/jts/index/EnvelopeList.java | 50 +
.../core/src/test/java/test/jts/index/Index.java | 30 +
.../src/test/java/test/jts/index/IndexTester.java | 137 +
.../src/test/java/test/jts/index/IntervalList.java | 50 +
.../java/test/jts/index/QuadtreeCorrectTest.java | 161 +
.../src/test/java/test/jts/index/STRtreeDemo.java | 163 +
.../src/test/java/test/jts/index/TreeTimeTest.java | 127 +
.../core/src/test/java/test/jts/insert-header.rb | 100 +
.../test/java/test/jts/junit/GeometryUtils.java | 79 +
.../src/test/java/test/jts/junit/MasterTester.java | 132 +
.../java/test/jts/junit/MiscellaneousTest.java | 486 +
.../java/test/jts/junit/MiscellaneousTest2.java | 161 +
.../src/test/java/test/jts/junit/SimpleTest.java | 36 +
.../test/java/test/jts/perf/ExamplePerfTest.java | 65 +
.../java/test/jts/perf/PerformanceTestCase.java | 134 +
.../java/test/jts/perf/PerformanceTestRunner.java | 98 +
.../test/java/test/jts/perf/ThreadTestCase.java | 33 +
.../test/java/test/jts/perf/ThreadTestRunner.java | 38 +
.../jts/perf/algorithm/AreaPrecisionPerfTest.java | 94 +
.../algorithm/DDOrientationIndexAccuracyTest.java | 91 +
.../perf/algorithm/DistanceLineLineStressTest.java | 75 +
.../algorithm/IndexedPointInAreaStressTest.java | 63 +
.../algorithm/MCIndexedPointInAreaLocator.java | 146 +
.../algorithm/MinimumBoundingCircleStressTest.java | 81 +
.../jts/perf/algorithm/PointInAreaPerfTest.java | 63 +
.../jts/perf/algorithm/PointInAreaPerfTester.java | 98 +
.../perf/algorithm/PointInAreaStressTester.java | 138 +
.../perf/algorithm/PointInRingRobustnessTest.java | 196 +
.../RectangleLineIntersectorPerfTest.java | 168 +
.../algorithm/SimpleRayCrossingStressTest.java | 107 +
.../jts/perf/dissolve/LineDissolvePerfTest.java | 96 +
.../impl/PackedCoordinateSequenceMemoryTest.java | 65 +
.../geom/prep/PreparedGeometryThreadSafeTest.java | 83 +
.../geom/prep/PreparedLineIntersectsPerfTest.java | 161 +
.../prep/PreparedPolygonIntersectsPerfTest.java | 217 +
.../test/jts/perf/geom/prep/TestDataBuilder.java | 109 +
.../java/test/jts/perf/math/DDExpressionPerf.java | 166 +
.../test/java/test/jts/perf/math/InCirclePerf.java | 106 +
.../test/java/test/jts/perf/math/TriPredicate.java | 268 +
.../operation/buffer/BufferCorrectnessTest.java | 138 +
.../operation/buffer/DepthSegmentStressTest.java | 259 +
.../perf/operation/buffer/FileBufferPerfTest.java | 87 +
.../buffer/FileBufferResultValidatorTest.java | 104 +
.../operation/buffer/IteratedBufferStressTest.java | 80 +
.../buffer/OffsetCurveCorrectnessTest.java | 76 +
.../operation/buffer/PolygonBufferStressTest.java | 157 +
.../buffer/RandomLineBufferStressTest.java | 103 +
.../buffer/RandomOffsetLineStringGenerator.java | 137 +
.../perf/operation/distance/CachedBABDistance.java | 36 +
.../distance/TestPerfDistanceGeomPair.java | 156 +
.../distance/TestPerfDistanceGeomSet.java | 159 +
.../distance/TestPerfDistanceLinesPoints.java | 222 +
.../distance/TestPerfFastDistanceFile.java | 129 +
.../operation/overlay/OverlayNodingStressTest.java | 187 +
.../predicate/RectangleIntersectsPerfTest.java | 172 +
.../relate/RelateMonotoneLinesPerfTest.java | 105 +
.../perf/operation/union/FileUnionPerfTest.java | 70 +
.../perf/operation/union/PolygonUnionPerfTest.java | 153 +
.../jts/perf/operation/union/UnionPerfTester.java | 166 +
.../operation/valid/QuadtreeNestedRingTester.java | 100 +
.../operation/valid/SweeplineNestedRingTester.java | 115 +
.../jts/perf/operation/valid/ValidStressTest.java | 159 +
.../jts/perf/triangulate/DelaunayPerfTest.java | 96 +
.../jts/perf/triangulate/DelaunayRobustTest.java | 99 +
.../test/jts/perf/triangulate/VoronoiPerfTest.java | 72 +
.../core/src/test/java/test/jts/util/IOUtil.java | 31 +
.../test/java/test/jts/util/SerializationUtil.java | 40 +
.../core/src/test/resources/testdata/africa.wkt | 1681 +
.../core/src/test/resources/testdata/bc-250k.wkt | 177 +
.../core/src/test/resources/testdata/bc_20K.wkt | 84875 +++++++++++++++++++
.../core/src/test/resources/testdata/europe.wkt | 3323 +
modules/core/src/test/resources/testdata/papua.wkt | 630 +
modules/core/src/test/resources/testdata/plane.wkt | 260 +
.../core/src/test/resources/testdata/polygon.wkb | 1 +
.../core/src/test/resources/testdata/uk-arrows.wkt | 4 +
modules/core/src/test/resources/testdata/uk.wkt | 171 +
modules/core/src/test/resources/testdata/world.wkt | 40607 +++++++++
modules/example/pom.xml | 18 +
.../locationtech/jtsexample/geom/BasicExample.java | 45 +
.../jtsexample/geom/ConstructionExample.java | 52 +
.../jtsexample/geom/ExtendedCoordinate.java | 76 +
.../jtsexample/geom/ExtendedCoordinateExample.java | 68 +
.../geom/ExtendedCoordinateSequence.java | 201 +
.../geom/ExtendedCoordinateSequenceFactory.java | 62 +
.../jtsexample/geom/PrecisionModelExample.java | 109 +
.../jtsexample/geom/SimpleMethodsExample.java | 70 +
.../geom/prep/PreparedGeometryExample.java | 73 +
.../jtsexample/io/gml2/KMLReaderExample.java | 182 +
.../jtsexample/linearref/LinearRefExample.java | 66 +
.../operation/distance/ClosestPointExample.java | 87 +
.../operation/linemerge/LineMergeExample.java | 86 +
.../operation/polygonize/PolygonizeExample.java | 65 +
.../java/org/locationtech/jtsexample/package.html | 14 +
.../precision/EnhancedPrecisionOpExample.java | 66 +
.../technique/LineStringSelfIntersections.java | 78 +
.../technique/PolygonUnionUsingBuffer.java | 62 +
.../SearchUsingPreparedGeometryIndex.java | 224 +
modules/io/common/pom.xml | 25 +
.../jts/io/geojson/GeoJsonConstants.java | 36 +
.../locationtech/jts/io/geojson/GeoJsonReader.java | 473 +
.../locationtech/jts/io/geojson/GeoJsonWriter.java | 304 +
.../locationtech/jts/io/geojson/GeoJsonTest.java | 102 +
.../jts/io/geojson/GeoJsonWriterTest.java | 128 +
modules/io/ora/README.md | 11 +
modules/io/ora/pom.xml | 21 +
.../org/locationtech/jts/io/oracle/OraGeom.java | 501 +
.../org/locationtech/jts/io/oracle/OraReader.java | 623 +
.../org/locationtech/jts/io/oracle/OraUtil.java | 173 +
.../org/locationtech/jts/io/oracle/OraWriter.java | 688 +
.../org/locationtech/jts/io/oracle/package.html | 6 +
.../jts/io/oracle/BaseOraTestCase.java | 32 +
.../jts/io/oracle/ConnectedTestCase.java | 103 +
.../java/org/locationtech/jts/io/oracle/MDSYS.java | 52 +
.../jts/io/oracle/OraReaderCreateTest.java | 455 +
.../jts/io/oracle/OraWriterCreateTest.java | 308 +
.../jts/io/oracle/OraWriterSQLTest.java | 79 +
.../jts/io/oracle/StaticLineStringTest.java | 172 +
.../jts/io/oracle/StaticMultiLineStringTest.java | 189 +
.../jts/io/oracle/StaticMultiPointTest.java | 153 +
.../jts/io/oracle/StaticMultiPolygonTest.java | 376 +
.../jts/io/oracle/StaticPointTest.java | 141 +
.../jts/io/oracle/StaticPolygonTest.java | 332 +
.../jts/io/oracle/connection.properties | 5 +
modules/io/pom.xml | 45 +
modules/io/sde/README.md | 18 +
modules/io/sde/pom.xml | 37 +
.../org/locationtech/jts/io/sde/SdeReader.java | 244 +
.../java/org/locationtech/jts/io/sde/package.html | 6 +
modules/lab/README.md | 7 +
modules/lab/pom.xml | 32 +
.../org/locationtech/jts/hull/ConcaveHull.java | 53 +
.../jts/operation/buffer/VariableWidthBuffer.java | 171 +
.../org/locationtech/jtslab/RemoverFunctions.java | 24 +
.../locationtech/jtslab/SnapRoundFunctions.java | 57 +
.../jtslab/SnapRoundOverlayFunctions.java | 66 +
.../org/locationtech/jtslab/clean/HoleRemover.java | 105 +
.../jtslab/clean/InvalidHoleRemover.java | 119 +
.../jtslab/clean/SmallHoleRemover.java | 50 +
.../jtslab/geom/util/GeometryEditorEx.java | 428 +
.../snapround/GeometryCoordinateReplacer.java | 76 +
.../jtslab/snapround/GeometrySnapRounder.java | 211 +
.../jtslab/snapround/PolygonCleaner.java | 68 +
.../jts/geom/OctagonalEnvelopeTest.java | 41 +
.../org/locationtech/jts/hull/ConcaveHullTest.java | 45 +
.../jtslab/clean/InvalidHoleRemoverTest.java | 92 +
.../jtslab/clean/SmallHoleRemoverTest.java | 87 +
modules/pom.xml | 42 +
modules/tests/pom.xml | 60 +
.../jtstest/TestCoordinateSequenceFactory.java | 32 +
.../locationtech/jtstest/command/CommandLine.java | 148 +
.../org/locationtech/jtstest/command/Option.java | 40 +
.../locationtech/jtstest/command/OptionSpec.java | 129 +
.../jtstest/command/ParseException.java | 30 +
.../jtstest/geomop/ArgumentConverter.java | 83 +
.../jtstest/geomop/BaseGeometryFunction.java | 165 +
.../geomop/BufferValidatedGeometryOperation.java | 203 +
.../jtstest/geomop/GeometryFunction.java | 80 +
.../jtstest/geomop/GeometryFunctionOperation.java | 105 +
.../jtstest/geomop/GeometryFunctionRegistry.java | 169 +
.../jtstest/geomop/GeometryMatcher.java | 27 +
.../jtstest/geomop/GeometryMethodOperation.java | 219 +
.../jtstest/geomop/GeometryOperation.java | 51 +
.../jtstest/geomop/LoggingGeometryOperation.java | 59 +
.../jtstest/geomop/NormalizedGeometryMatcher.java | 43 +
.../geomop/OverlayValidatedGeometryOperation.java | 177 +
.../jtstest/geomop/PreparedGeometryOperation.java | 127 +
.../geomop/PreparedGeometryTeeOperation.java | 136 +
.../geomop/StaticMethodGeometryFunction.java | 136 +
.../jtstest/geomop/TeeGeometryOperation.java | 80 +
.../jtstest/geomop/TestCaseGeometryFunctions.java | 60 +
.../jtstest/testrunner/BooleanResult.java | 47 +
.../jtstest/testrunner/BufferResultMatcher.java | 114 +
.../jtstest/testrunner/DoubleResult.java | 49 +
.../jtstest/testrunner/EqualityResultMatcher.java | 40 +
.../testrunner/GeometryOperationLoader.java | 50 +
.../jtstest/testrunner/GeometryResult.java | 60 +
.../locationtech/jtstest/testrunner/GuiUtil.java | 160 +
.../jtstest/testrunner/IntegerResult.java | 49 +
.../testrunner/JTSTestReflectionException.java | 44 +
.../jtstest/testrunner/JTSTestRunnerCmd.java | 243 +
.../locationtech/jtstest/testrunner/Logger.java | 43 +
.../jtstest/testrunner/NullResultMatcher.java | 39 +
.../jtstest/testrunner/Parameters.java | 113 +
.../jtstest/testrunner/ReportWriter.java | 22 +
.../locationtech/jtstest/testrunner/Result.java | 29 +
.../jtstest/testrunner/ResultMatcher.java | 43 +
.../jtstest/testrunner/SimpleReportWriter.java | 177 +
.../org/locationtech/jtstest/testrunner/Test.java | 235 +
.../locationtech/jtstest/testrunner/TestCase.java | 167 +
.../jtstest/testrunner/TestEngine.java | 195 +
.../jtstest/testrunner/TestParseException.java | 23 +
.../jtstest/testrunner/TestReader.java | 596 +
.../locationtech/jtstest/testrunner/TestRun.java | 139 +
.../jtstest/testrunner/TopologyTestApp.java | 608 +
.../org/locationtech/jtstest/util/FilesUtil.java | 62 +
.../org/locationtech/jtstest/util/StringUtil.java | 511 +
.../jtstest/util/io/WKTOrWKBReader.java | 68 +
.../locationtech/jtstest/CoreGeometryXMLTest.java | 73 +
.../test/resources/testxml/external/GEOSBuffer.xml | 59 +
.../testxml/external/TestBufferExternal.xml | 58 +
.../testxml/external/TestBufferExternal2.xml | 508 +
.../testxml/external/TestBufferJagged.xml | 75 +
.../resources/testxml/external/TestOverlay.xml | 109 +
.../test/resources/testxml/external/TestValid.xml | 26 +
.../testxml}/external/geos-bug356-buffer.xml | 0
.../testxml/failure/TestBigNastyBuffer.xml | 27 +
.../testxml/failure/TestBufferFailure.xml | 91 +
.../testxml/failure/TestBufferInsideNonEmpty.xml | 22 +
.../testxml/failure/TestOverlayFailure.xml | 280 +
.../test/resources/testxml}/failure/bug368jts.xml | 0
.../testxml}/failure/geos-bug368-union.xml | 0
.../resources/testxml/general/TestBoundary.xml | 165 +
.../test/resources/testxml/general/TestBuffer.xml | 135 +
.../testxml/general/TestBufferMitredJoin.xml | 60 +
.../resources/testxml/general/TestCentroid.xml | 271 +
.../testxml/general/TestConvexHull-big.xml | 17 +
.../resources/testxml/general/TestConvexHull.xml | 186 +
.../test/resources/testxml/general/TestDensify.xml | 57 +
.../resources/testxml/general/TestDistance.xml | 60 +
.../resources/testxml/general/TestEqualsExact.xml | 157 +
.../resources/testxml/general/TestFunctionAA.xml | 633 +
.../testxml/general/TestFunctionAAPrec.xml | 828 +
.../resources/testxml/general/TestFunctionLA.xml | 522 +
.../testxml/general/TestFunctionLAPrec.xml | 59 +
.../resources/testxml/general/TestFunctionLL.xml | 375 +
.../testxml/general/TestFunctionLLPrec.xml | 28 +
.../resources/testxml/general/TestFunctionPA.xml | 155 +
.../resources/testxml/general/TestFunctionPL.xml | 286 +
.../testxml/general/TestFunctionPLPrec.xml | 19 +
.../resources/testxml/general/TestFunctionPP.xml | 269 +
.../testxml/general/TestInteriorPoint.xml | 128 +
.../testxml/general/TestMinimumClearance.xml | 89 +
.../resources/testxml/general/TestOverlayEmpty.xml | 1021 +
.../testxml/general/TestPreparedPointPredicate.xml | 34 +
.../general/TestPreparedPolygonPredicate.xml | 191 +
...estPreparedPredicatesWithGeometryCollection.xml | 81 +
.../testxml/general/TestRectanglePredicate.xml | 304 +
.../resources/testxml/general/TestRelateAA.xml | 235 +
.../resources/testxml/general/TestRelateAC.xml | 27 +
.../resources/testxml/general/TestRelateLA.xml | 190 +
.../resources/testxml/general/TestRelateLC.xml | 41 +
.../resources/testxml/general/TestRelateLL.xml | 311 +
.../resources/testxml/general/TestRelatePA.xml | 103 +
.../resources/testxml/general/TestRelatePL.xml | 124 +
.../resources/testxml/general/TestRelatePP.xml | 64 +
.../test/resources/testxml/general/TestSimple.xml | 357 +
.../resources/testxml/general/TestUnaryUnion.xml | 161 +
.../testxml/general/TestUnaryUnionFloating.xml | 20 +
.../test/resources/testxml/general/TestValid.xml | 746 +
.../resources/testxml/general/TestValid2-big.xml | 18 +
.../test/resources/testxml/general/TestValid2.xml | 5246 ++
.../testxml/general/TestWithinDistance.xml | 92 +
.../testxml/robust/ExternalRobustness.xml | 220 +
.../resources/testxml/robust/MagnifyTopology.xml | 86 +
.../testxml/robust/TestRobustOverlayError.xml | 19 +
.../testxml/robust/TestRobustOverlayFixed.xml | 18 +
.../testxml/robust/TestRobustOverlayFloat.xml | 104 +
.../resources/testxml/robust/TestRobustRelate.xml | 19 +
.../testxml/robust/TestRobustRelateFloat.xml | 40 +
.../testxml/validate/TestRelateAA-big.xml | 34 +
.../resources/testxml/validate/TestRelateAA.xml | 2833 +
.../resources/testxml/validate/TestRelateAC.xml | 36 +
.../resources/testxml/validate/TestRelateLA.xml | 1932 +
.../resources/testxml/validate/TestRelateLC.xml | 57 +
.../resources/testxml/validate/TestRelateLL.xml | 3388 +
.../resources/testxml/validate/TestRelatePA.xml | 1018 +
.../resources/testxml/validate/TestRelatePL.xml | 2286 +
.../resources/testxml/validate/TestRelatePP.xml | 303 +
pom.xml | 274 +
src/META-INF/MANIFEST.MF | 4 -
src/com/vividsolutions/jts/JTSVersion.java | 119 -
src/com/vividsolutions/jts/algorithm/Angle.java | 309 -
.../jts/algorithm/BoundaryNodeRule.java | 210 -
.../vividsolutions/jts/algorithm/CGAlgorithms.java | 595 -
.../jts/algorithm/CGAlgorithms3D.java | 182 -
.../jts/algorithm/CGAlgorithmsDD.java | 206 -
.../jts/algorithm/CentralEndpointIntersector.java | 153 -
src/com/vividsolutions/jts/algorithm/Centroid.java | 273 -
.../vividsolutions/jts/algorithm/CentroidArea.java | 202 -
.../vividsolutions/jts/algorithm/CentroidLine.java | 108 -
.../jts/algorithm/CentroidPoint.java | 92 -
.../vividsolutions/jts/algorithm/ConvexHull.java | 516 -
.../vividsolutions/jts/algorithm/HCoordinate.java | 188 -
.../jts/algorithm/InteriorPointArea.java | 260 -
.../jts/algorithm/InteriorPointLine.java | 127 -
.../jts/algorithm/InteriorPointPoint.java | 88 -
.../jts/algorithm/LineIntersector.java | 438 -
.../jts/algorithm/MCPointInRing.java | 164 -
.../jts/algorithm/MinimumBoundingCircle.java | 362 -
.../jts/algorithm/MinimumDiameter.java | 358 -
.../jts/algorithm/NonRobustCGAlgorithms.java | 282 -
.../jts/algorithm/NonRobustLineIntersector.java | 320 -
.../jts/algorithm/NotRepresentableException.java | 51 -
.../vividsolutions/jts/algorithm/PointInRing.java | 49 -
.../vividsolutions/jts/algorithm/PointLocator.java | 214 -
.../jts/algorithm/RayCrossingCounter.java | 250 -
.../jts/algorithm/RectangleLineIntersector.java | 165 -
.../jts/algorithm/RobustCGAlgorithms.java | 47 -
.../jts/algorithm/RobustDeterminant.java | 424 -
.../jts/algorithm/RobustLineIntersector.java | 482 -
.../jts/algorithm/SimplePointInRing.java | 59 -
.../distance/DiscreteHausdorffDistance.java | 226 -
.../jts/algorithm/distance/DistanceToPoint.java | 92 -
.../jts/algorithm/distance/PointPairDistance.java | 120 -
.../locate/IndexedPointInAreaLocator.java | 154 -
.../algorithm/locate/PointOnGeometryLocator.java | 52 -
.../algorithm/locate/SimplePointInAreaLocator.java | 129 -
.../jts/algorithm/match/AreaSimilarityMeasure.java | 73 -
.../match/HausdorffSimilarityMeasure.java | 95 -
.../jts/algorithm/match/SimilarityMeasure.java | 55 -
.../algorithm/match/SimilarityMeasureCombiner.java | 49 -
.../vividsolutions/jts/awt/FontGlyphReader.java | 137 -
.../jts/awt/GeometryCollectionShape.java | 128 -
.../jts/awt/IdentityPointTransformation.java | 51 -
.../vividsolutions/jts/awt/PointShapeFactory.java | 397 -
.../jts/awt/PointTransformation.java | 54 -
src/com/vividsolutions/jts/awt/PolygonShape.java | 163 -
.../jts/awt/ShapeCollectionPathIterator.java | 121 -
src/com/vividsolutions/jts/awt/ShapeReader.java | 193 -
src/com/vividsolutions/jts/awt/ShapeWriter.java | 325 -
src/com/vividsolutions/jts/densify/Densifier.java | 179 -
.../jts/dissolve/DissolveEdgeGraph.java | 22 -
.../jts/dissolve/DissolveHalfEdge.java | 40 -
.../vividsolutions/jts/dissolve/LineDissolver.java | 286 -
.../vividsolutions/jts/edgegraph/EdgeGraph.java | 144 -
.../jts/edgegraph/EdgeGraphBuilder.java | 77 -
src/com/vividsolutions/jts/edgegraph/HalfEdge.java | 351 -
.../vividsolutions/jts/edgegraph/MarkHalfEdge.java | 110 -
src/com/vividsolutions/jts/geom/Coordinate.java | 445 -
.../vividsolutions/jts/geom/CoordinateArrays.java | 489 -
.../vividsolutions/jts/geom/CoordinateFilter.java | 66 -
.../vividsolutions/jts/geom/CoordinateList.java | 246 -
.../jts/geom/CoordinateSequence.java | 187 -
.../jts/geom/CoordinateSequenceComparator.java | 163 -
.../jts/geom/CoordinateSequenceFactory.java | 79 -
.../jts/geom/CoordinateSequenceFilter.java | 101 -
.../jts/geom/CoordinateSequences.java | 244 -
.../jts/geom/DefaultCoordinateSequence.java | 218 -
.../jts/geom/DefaultCoordinateSequenceFactory.java | 93 -
src/com/vividsolutions/jts/geom/Dimension.java | 164 -
src/com/vividsolutions/jts/geom/Envelope.java | 779 -
src/com/vividsolutions/jts/geom/Geometry.java | 1889 -
.../jts/geom/GeometryCollection.java | 303 -
.../jts/geom/GeometryCollectionIterator.java | 160 -
.../jts/geom/GeometryComponentFilter.java | 68 -
.../vividsolutions/jts/geom/GeometryFactory.java | 601 -
.../vividsolutions/jts/geom/GeometryFilter.java | 58 -
.../jts/geom/IntersectionMatrix.java | 598 -
src/com/vividsolutions/jts/geom/LineSegment.java | 670 -
src/com/vividsolutions/jts/geom/LineString.java | 342 -
src/com/vividsolutions/jts/geom/Lineal.java | 45 -
src/com/vividsolutions/jts/geom/LinearRing.java | 155 -
src/com/vividsolutions/jts/geom/Location.java | 92 -
.../vividsolutions/jts/geom/MultiLineString.java | 145 -
src/com/vividsolutions/jts/geom/MultiPoint.java | 123 -
src/com/vividsolutions/jts/geom/MultiPolygon.java | 155 -
.../vividsolutions/jts/geom/OctagonalEnvelope.java | 377 -
src/com/vividsolutions/jts/geom/Point.java | 237 -
src/com/vividsolutions/jts/geom/Polygon.java | 450 -
src/com/vividsolutions/jts/geom/Polygonal.java | 47 -
.../vividsolutions/jts/geom/PrecisionModel.java | 488 -
src/com/vividsolutions/jts/geom/Puntal.java | 45 -
.../vividsolutions/jts/geom/TopologyException.java | 68 -
src/com/vividsolutions/jts/geom/Triangle.java | 578 -
.../jts/geom/impl/CoordinateArraySequence.java | 281 -
.../geom/impl/CoordinateArraySequenceFactory.java | 99 -
.../jts/geom/impl/PackedCoordinateSequence.java | 493 -
.../geom/impl/PackedCoordinateSequenceFactory.java | 169 -
.../geom/prep/AbstractPreparedPolygonContains.java | 245 -
.../jts/geom/prep/BasicPreparedGeometry.java | 223 -
.../jts/geom/prep/PreparedGeometry.java | 192 -
.../jts/geom/prep/PreparedGeometryFactory.java | 85 -
.../jts/geom/prep/PreparedLineString.java | 79 -
.../geom/prep/PreparedLineStringIntersects.java | 143 -
.../jts/geom/prep/PreparedPoint.java | 68 -
.../jts/geom/prep/PreparedPolygon.java | 138 -
.../jts/geom/prep/PreparedPolygonContains.java | 101 -
.../geom/prep/PreparedPolygonContainsProperly.java | 126 -
.../jts/geom/prep/PreparedPolygonCovers.java | 101 -
.../jts/geom/prep/PreparedPolygonIntersects.java | 126 -
.../jts/geom/prep/PreparedPolygonPredicate.java | 167 -
.../jts/geom/util/AffineTransformation.java | 1115 -
.../jts/geom/util/AffineTransformationBuilder.java | 165 -
.../jts/geom/util/AffineTransformationFactory.java | 199 -
.../geom/util/ComponentCoordinateExtracter.java | 83 -
.../jts/geom/util/GeometryCollectionMapper.java | 73 -
.../jts/geom/util/GeometryCombiner.java | 189 -
.../jts/geom/util/GeometryEditor.java | 365 -
.../jts/geom/util/GeometryExtracter.java | 105 -
.../jts/geom/util/GeometryMapper.java | 99 -
.../jts/geom/util/GeometryTransformer.java | 306 -
.../jts/geom/util/LineStringExtracter.java | 108 -
.../jts/geom/util/LinearComponentExtracter.java | 222 -
.../util/NoninvertibleTransformationException.java | 53 -
.../jts/geom/util/PointExtracter.java | 96 -
.../jts/geom/util/PolygonExtracter.java | 93 -
.../geom/util/ShortCircuitedGeometryVisitor.java | 69 -
.../jts/geom/util/SineStarFactory.java | 148 -
src/com/vividsolutions/jts/geomgraph/Depth.java | 159 -
.../vividsolutions/jts/geomgraph/DirectedEdge.java | 239 -
.../jts/geomgraph/DirectedEdgeStar.java | 406 -
src/com/vividsolutions/jts/geomgraph/Edge.java | 291 -
src/com/vividsolutions/jts/geomgraph/EdgeEnd.java | 150 -
.../vividsolutions/jts/geomgraph/EdgeEndStar.java | 352 -
.../jts/geomgraph/EdgeIntersection.java | 107 -
.../jts/geomgraph/EdgeIntersectionList.java | 168 -
src/com/vividsolutions/jts/geomgraph/EdgeList.java | 132 -
.../jts/geomgraph/EdgeNodingValidator.java | 97 -
src/com/vividsolutions/jts/geomgraph/EdgeRing.java | 246 -
.../jts/geomgraph/GeometryGraph.java | 459 -
.../jts/geomgraph/GraphComponent.java | 107 -
src/com/vividsolutions/jts/geomgraph/Label.java | 222 -
src/com/vividsolutions/jts/geomgraph/Node.java | 177 -
.../vividsolutions/jts/geomgraph/NodeFactory.java | 50 -
src/com/vividsolutions/jts/geomgraph/NodeMap.java | 137 -
.../vividsolutions/jts/geomgraph/PlanarGraph.java | 255 -
src/com/vividsolutions/jts/geomgraph/Position.java | 61 -
src/com/vividsolutions/jts/geomgraph/Quadrant.java | 160 -
.../jts/geomgraph/TopologyLocation.java | 207 -
.../jts/geomgraph/index/EdgeSetIntersector.java | 79 -
.../jts/geomgraph/index/MonotoneChain.java | 55 -
.../jts/geomgraph/index/MonotoneChainEdge.java | 154 -
.../jts/geomgraph/index/MonotoneChainIndexer.java | 118 -
.../jts/geomgraph/index/SegmentIntersector.java | 216 -
.../geomgraph/index/SimpleEdgeSetIntersector.java | 101 -
.../index/SimpleMCSweepLineIntersector.java | 165 -
.../index/SimpleSweepLineIntersector.java | 161 -
.../jts/geomgraph/index/SweepLineEvent.java | 112 -
.../jts/geomgraph/index/SweepLineSegment.java | 74 -
.../vividsolutions/jts/index/ArrayListVisitor.java | 57 -
src/com/vividsolutions/jts/index/ItemVisitor.java | 45 -
src/com/vividsolutions/jts/index/SpatialIndex.java | 87 -
.../vividsolutions/jts/index/bintree/Bintree.java | 212 -
.../vividsolutions/jts/index/bintree/Interval.java | 105 -
src/com/vividsolutions/jts/index/bintree/Key.java | 96 -
src/com/vividsolutions/jts/index/bintree/Node.java | 173 -
.../vividsolutions/jts/index/bintree/NodeBase.java | 195 -
src/com/vividsolutions/jts/index/bintree/Root.java | 121 -
.../jts/index/chain/MonotoneChain.java | 249 -
.../jts/index/chain/MonotoneChainBuilder.java | 139 -
.../index/chain/MonotoneChainOverlapAction.java | 76 -
.../jts/index/chain/MonotoneChainSelectAction.java | 75 -
.../intervalrtree/IntervalRTreeBranchNode.java | 67 -
.../index/intervalrtree/IntervalRTreeLeafNode.java | 58 -
.../jts/index/intervalrtree/IntervalRTreeNode.java | 78 -
.../intervalrtree/SortedPackedIntervalRTree.java | 159 -
.../vividsolutions/jts/index/kdtree/KdNode.java | 165 -
.../jts/index/kdtree/KdNodeVisitor.java | 50 -
.../vividsolutions/jts/index/kdtree/KdTree.java | 371 -
.../jts/index/quadtree/DoubleBits.java | 174 -
.../jts/index/quadtree/IntervalSize.java | 73 -
src/com/vividsolutions/jts/index/quadtree/Key.java | 102 -
.../vividsolutions/jts/index/quadtree/Node.java | 199 -
.../jts/index/quadtree/NodeBase.java | 252 -
.../jts/index/quadtree/Quadtree.java | 259 -
.../vividsolutions/jts/index/quadtree/Root.java | 120 -
.../jts/index/strtree/AbstractNode.java | 144 -
.../jts/index/strtree/AbstractSTRtree.java | 465 -
.../jts/index/strtree/Boundable.java | 51 -
.../jts/index/strtree/BoundablePair.java | 231 -
.../jts/index/strtree/GeometryItemDistance.java | 64 -
.../vividsolutions/jts/index/strtree/Interval.java | 78 -
.../jts/index/strtree/ItemBoundable.java | 58 -
.../jts/index/strtree/ItemDistance.java | 58 -
.../vividsolutions/jts/index/strtree/SIRtree.java | 130 -
.../vividsolutions/jts/index/strtree/STRtree.java | 393 -
.../jts/index/sweepline/SweepLineEvent.java | 87 -
.../jts/index/sweepline/SweepLineIndex.java | 114 -
.../jts/index/sweepline/SweepLineInterval.java | 61 -
.../index/sweepline/SweepLineOverlapAction.java | 46 -
.../vividsolutions/jts/io/ByteArrayInStream.java | 91 -
.../jts/io/ByteOrderDataInStream.java | 108 -
src/com/vividsolutions/jts/io/ByteOrderValues.java | 139 -
src/com/vividsolutions/jts/io/InStream.java | 54 -
.../vividsolutions/jts/io/InputStreamInStream.java | 54 -
src/com/vividsolutions/jts/io/OutStream.java | 45 -
.../jts/io/OutputStreamOutStream.java | 54 -
src/com/vividsolutions/jts/io/ParseException.java | 75 -
src/com/vividsolutions/jts/io/WKBConstants.java | 49 -
.../vividsolutions/jts/io/WKBHexFileReader.java | 185 -
src/com/vividsolutions/jts/io/WKBReader.java | 375 -
src/com/vividsolutions/jts/io/WKBWriter.java | 436 -
src/com/vividsolutions/jts/io/WKTFileReader.java | 182 -
src/com/vividsolutions/jts/io/WKTReader.java | 735 -
src/com/vividsolutions/jts/io/WKTWriter.java | 777 -
.../vividsolutions/jts/io/gml2/GMLConstants.java | 74 -
src/com/vividsolutions/jts/io/gml2/GMLHandler.java | 288 -
src/com/vividsolutions/jts/io/gml2/GMLReader.java | 132 -
src/com/vividsolutions/jts/io/gml2/GMLWriter.java | 486 -
.../jts/io/gml2/GeometryStrategies.java | 534 -
src/com/vividsolutions/jts/io/kml/KMLWriter.java | 386 -
.../jts/linearref/ExtractLineByLocation.java | 208 -
.../jts/linearref/LengthIndexOfPoint.java | 148 -
.../jts/linearref/LengthIndexedLine.java | 272 -
.../jts/linearref/LengthLocationMap.java | 224 -
.../jts/linearref/LinearGeometryBuilder.java | 152 -
.../jts/linearref/LinearIterator.java | 209 -
.../jts/linearref/LinearLocation.java | 484 -
.../jts/linearref/LocationIndexOfLine.java | 85 -
.../jts/linearref/LocationIndexOfPoint.java | 178 -
.../jts/linearref/LocationIndexedLine.java | 232 -
src/com/vividsolutions/jts/math/DD.java | 1401 -
src/com/vividsolutions/jts/math/MathUtil.java | 146 -
src/com/vividsolutions/jts/math/Matrix.java | 120 -
src/com/vividsolutions/jts/math/Plane3D.java | 112 -
src/com/vividsolutions/jts/math/Vector2D.java | 360 -
src/com/vividsolutions/jts/math/Vector3D.java | 182 -
.../jts/noding/BasicSegmentString.java | 112 -
.../jts/noding/FastNodingValidator.java | 174 -
.../noding/FastSegmentSetIntersectionFinder.java | 100 -
.../jts/noding/InteriorIntersectionFinder.java | 280 -
.../noding/InteriorIntersectionFinderAdder.java | 113 -
.../jts/noding/IntersectionAdder.java | 185 -
.../jts/noding/IntersectionFinderAdder.java | 114 -
.../vividsolutions/jts/noding/IteratedNoder.java | 140 -
.../vividsolutions/jts/noding/MCIndexNoder.java | 140 -
.../noding/MCIndexSegmentSetMutualIntersector.java | 159 -
.../jts/noding/NodableSegmentString.java | 54 -
.../jts/noding/NodedSegmentString.java | 212 -
src/com/vividsolutions/jts/noding/Noder.java | 67 -
.../vividsolutions/jts/noding/NodingValidator.java | 180 -
src/com/vividsolutions/jts/noding/Octant.java | 110 -
.../jts/noding/OrientedCoordinateArray.java | 131 -
src/com/vividsolutions/jts/noding/ScaledNoder.java | 156 -
.../jts/noding/SegmentIntersectionDetector.java | 237 -
.../jts/noding/SegmentIntersector.java | 72 -
src/com/vividsolutions/jts/noding/SegmentNode.java | 102 -
.../vividsolutions/jts/noding/SegmentNodeList.java | 383 -
.../jts/noding/SegmentPointComparator.java | 98 -
.../jts/noding/SegmentSetMutualIntersector.java | 70 -
.../vividsolutions/jts/noding/SegmentString.java | 65 -
.../jts/noding/SegmentStringDissolver.java | 173 -
.../jts/noding/SegmentStringUtil.java | 120 -
src/com/vividsolutions/jts/noding/SimpleNoder.java | 84 -
.../noding/SimpleSegmentSetMutualIntersector.java | 102 -
.../vividsolutions/jts/noding/SinglePassNoder.java | 91 -
.../jts/noding/snapround/GeometryNoder.java | 145 -
.../jts/noding/snapround/HotPixel.java | 321 -
.../jts/noding/snapround/MCIndexPointSnapper.java | 134 -
.../jts/noding/snapround/MCIndexSnapRounder.java | 167 -
.../jts/noding/snapround/SimpleSnapRounder.java | 195 -
.../vividsolutions/jts/operation/BoundaryOp.java | 191 -
.../jts/operation/GeometryGraphOperation.java | 91 -
.../vividsolutions/jts/operation/IsSimpleOp.java | 347 -
.../jts/operation/buffer/BufferBuilder.java | 328 -
.../buffer/BufferInputLineSimplifier.java | 260 -
.../jts/operation/buffer/BufferOp.java | 388 -
.../jts/operation/buffer/BufferParameters.java | 366 -
.../jts/operation/buffer/BufferSubgraph.java | 330 -
.../jts/operation/buffer/OffsetCurveBuilder.java | 362 -
.../operation/buffer/OffsetCurveSetBuilder.java | 311 -
.../operation/buffer/OffsetSegmentGenerator.java | 678 -
.../jts/operation/buffer/OffsetSegmentString.java | 156 -
.../jts/operation/buffer/RightmostEdgeFinder.java | 187 -
.../jts/operation/buffer/SubgraphDepthLocater.java | 258 -
.../validate/BufferCurveMaximumDistanceFinder.java | 143 -
.../buffer/validate/BufferDistanceValidator.java | 252 -
.../buffer/validate/BufferResultValidator.java | 227 -
.../buffer/validate/DistanceToPointFinder.java | 90 -
.../buffer/validate/PointPairDistance.java | 113 -
.../distance/ConnectedElementLocationFilter.java | 80 -
.../distance/ConnectedElementPointFilter.java | 78 -
.../jts/operation/distance/DistanceOp.java | 425 -
.../jts/operation/distance/FacetSequence.java | 190 -
.../distance/FacetSequenceTreeBuilder.java | 106 -
.../jts/operation/distance/GeometryLocation.java | 112 -
.../operation/distance/IndexedFacetDistance.java | 188 -
.../distance3d/AxisPlaneCoordinateSequence.java | 159 -
.../jts/operation/distance3d/Distance3DOp.java | 587 -
.../jts/operation/distance3d/PlanarPolygon3D.java | 195 -
.../jts/operation/linemerge/EdgeString.java | 103 -
.../operation/linemerge/LineMergeDirectedEdge.java | 80 -
.../jts/operation/linemerge/LineMergeEdge.java | 59 -
.../jts/operation/linemerge/LineMergeGraph.java | 91 -
.../jts/operation/linemerge/LineMerger.java | 198 -
.../jts/operation/linemerge/LineSequencer.java | 476 -
.../overlay/ConsistentPolygonRingChecker.java | 160 -
.../jts/operation/overlay/EdgeSetNoder.java | 78 -
.../jts/operation/overlay/LineBuilder.java | 201 -
.../jts/operation/overlay/MaximalEdgeRing.java | 105 -
.../jts/operation/overlay/MinimalEdgeRing.java | 66 -
.../jts/operation/overlay/OverlayNodeFactory.java | 56 -
.../jts/operation/overlay/OverlayOp.java | 695 -
.../jts/operation/overlay/PointBuilder.java | 126 -
.../jts/operation/overlay/PolygonBuilder.java | 299 -
.../operation/overlay/snap/GeometrySnapper.java | 276 -
.../operation/overlay/snap/LineStringSnapper.java | 236 -
.../overlay/snap/SnapIfNeededOverlayOp.java | 124 -
.../jts/operation/overlay/snap/SnapOverlayOp.java | 159 -
.../overlay/validate/FuzzyPointLocator.java | 151 -
.../overlay/validate/OffsetPointGenerator.java | 133 -
.../overlay/validate/OverlayResultValidator.java | 182 -
.../jts/operation/polygonize/EdgeRing.java | 476 -
.../polygonize/PolygonizeDirectedEdge.java | 114 -
.../jts/operation/polygonize/PolygonizeEdge.java | 56 -
.../jts/operation/polygonize/PolygonizeGraph.java | 444 -
.../jts/operation/polygonize/Polygonizer.java | 373 -
.../jts/operation/predicate/RectangleContains.java | 185 -
.../operation/predicate/RectangleIntersects.java | 353 -
.../jts/operation/relate/EdgeEndBuilder.java | 165 -
.../jts/operation/relate/EdgeEndBundle.java | 206 -
.../jts/operation/relate/EdgeEndBundleStar.java | 91 -
.../jts/operation/relate/RelateComputer.java | 396 -
.../jts/operation/relate/RelateNode.java | 81 -
.../jts/operation/relate/RelateNodeFactory.java | 52 -
.../jts/operation/relate/RelateNodeGraph.java | 150 -
.../jts/operation/relate/RelateOp.java | 141 -
.../jts/operation/union/CascadedPolygonUnion.java | 424 -
.../jts/operation/union/PointGeometryUnion.java | 99 -
.../jts/operation/union/UnaryUnionOp.java | 288 -
.../jts/operation/union/UnionInteracting.java | 152 -
.../operation/valid/ConnectedInteriorTester.java | 239 -
.../jts/operation/valid/ConsistentAreaTester.java | 162 -
.../operation/valid/IndexedNestedRingTester.java | 126 -
.../jts/operation/valid/IsValidOp.java | 618 -
.../operation/valid/QuadtreeNestedRingTester.java | 116 -
.../jts/operation/valid/RepeatedPointTester.java | 96 -
.../operation/valid/SimpleNestedRingTester.java | 98 -
.../operation/valid/SweeplineNestedRingTester.java | 129 -
.../operation/valid/TopologyValidationError.java | 193 -
.../jts/planargraph/DirectedEdge.java | 230 -
.../jts/planargraph/DirectedEdgeStar.java | 180 -
src/com/vividsolutions/jts/planargraph/Edge.java | 141 -
.../jts/planargraph/GraphComponent.java | 171 -
src/com/vividsolutions/jts/planargraph/Node.java | 145 -
.../vividsolutions/jts/planargraph/NodeMap.java | 101 -
.../jts/planargraph/PlanarGraph.java | 235 -
.../vividsolutions/jts/planargraph/Subgraph.java | 124 -
.../algorithm/ConnectedSubgraphFinder.java | 107 -
.../vividsolutions/jts/precision/CommonBits.java | 160 -
.../vividsolutions/jts/precision/CommonBitsOp.java | 184 -
.../jts/precision/CommonBitsRemover.java | 175 -
.../CoordinatePrecisionReducerFilter.java | 86 -
.../jts/precision/EnhancedPrecisionOp.java | 226 -
.../jts/precision/GeometryPrecisionReducer.java | 235 -
.../jts/precision/MinimumClearance.java | 334 -
.../PrecisionReducerCoordinateOperation.java | 98 -
.../precision/SimpleGeometryPrecisionReducer.java | 167 -
.../jts/precision/SimpleMinimumClearance.java | 181 -
.../jts/shape/GeometricShapeBuilder.java | 111 -
.../jts/shape/fractal/KochSnowflakeBuilder.java | 120 -
.../jts/shape/fractal/SierpinskiCarpetBuilder.java | 113 -
.../jts/shape/random/RandomPointsBuilder.java | 123 -
.../shape/random/RandomPointsInGridBuilder.java | 173 -
.../jts/simplify/DouglasPeuckerLineSimplifier.java | 116 -
.../jts/simplify/DouglasPeuckerSimplifier.java | 224 -
.../jts/simplify/LineSegmentIndex.java | 113 -
.../jts/simplify/TaggedLineSegment.java | 61 -
.../jts/simplify/TaggedLineString.java | 118 -
.../jts/simplify/TaggedLineStringSimplifier.java | 256 -
.../jts/simplify/TaggedLinesSimplifier.java | 84 -
.../jts/simplify/TopologyPreservingSimplifier.java | 187 -
.../jts/simplify/VWLineSimplifier.java | 162 -
.../vividsolutions/jts/simplify/VWSimplifier.java | 227 -
.../ConformingDelaunayTriangulationBuilder.java | 205 -
.../ConformingDelaunayTriangulator.java | 564 -
.../ConstraintEnforcementException.java | 85 -
.../triangulate/ConstraintSplitPointFinder.java | 59 -
.../jts/triangulate/ConstraintVertex.java | 109 -
.../jts/triangulate/ConstraintVertexFactory.java | 47 -
.../triangulate/DelaunayTriangulationBuilder.java | 197 -
.../IncrementalDelaunayTriangulator.java | 143 -
.../jts/triangulate/MidpointSplitPointFinder.java | 62 -
.../NonEncroachingSplitPointFinder.java | 94 -
.../vividsolutions/jts/triangulate/Segment.java | 222 -
.../jts/triangulate/SplitSegment.java | 110 -
.../VertexTaggedGeometryDataMapper.java | 108 -
.../jts/triangulate/VoronoiDiagramBuilder.java | 191 -
.../quadedge/EdgeConnectedTriangleTraversal.java | 94 -
.../quadedge/LastFoundQuadEdgeLocator.java | 77 -
.../quadedge/LocateFailureException.java | 69 -
.../jts/triangulate/quadedge/QuadEdge.java | 434 -
.../jts/triangulate/quadedge/QuadEdgeLocator.java | 47 -
.../triangulate/quadedge/QuadEdgeSubdivision.java | 954 -
.../jts/triangulate/quadedge/QuadEdgeTriangle.java | 359 -
.../jts/triangulate/quadedge/QuadEdgeUtil.java | 71 -
.../jts/triangulate/quadedge/TraversalVisitor.java | 59 -
.../triangulate/quadedge/TrianglePredicate.java | 335 -
.../jts/triangulate/quadedge/TriangleVisitor.java | 49 -
.../jts/triangulate/quadedge/Vertex.java | 403 -
src/com/vividsolutions/jts/util/Assert.java | 126 -
.../jts/util/AssertionFailedException.java | 63 -
.../vividsolutions/jts/util/CollectionUtil.java | 100 -
.../jts/util/CoordinateArrayFilter.java | 72 -
.../jts/util/CoordinateCountFilter.java | 63 -
src/com/vividsolutions/jts/util/Debug.java | 342 -
.../jts/util/GeometricShapeFactory.java | 460 -
src/com/vividsolutions/jts/util/Memory.java | 108 -
src/com/vividsolutions/jts/util/NumberUtil.java | 11 -
src/com/vividsolutions/jts/util/ObjectCounter.java | 95 -
src/com/vividsolutions/jts/util/PriorityQueue.java | 154 -
src/com/vividsolutions/jts/util/Stopwatch.java | 108 -
src/com/vividsolutions/jts/util/StringUtil.java | 94 -
.../jts/util/UniqueCoordinateArrayFilter.java | 89 -
testxml/external/GEOSBuffer.xml | 59 -
testxml/external/TestBufferExternal.xml | 58 -
testxml/external/TestBufferExternal2.xml | 508 -
testxml/external/TestBufferJagged.xml | 75 -
testxml/external/TestOverlay.xml | 109 -
testxml/external/TestValid.xml | 26 -
testxml/failure/TestBigNastyBuffer.xml | 27 -
testxml/failure/TestBufferFailure.xml | 91 -
testxml/failure/TestBufferInsideNonEmpty.xml | 22 -
testxml/failure/TestOverlayFailure.xml | 280 -
testxml/general/TestBoundary.xml | 165 -
testxml/general/TestBuffer.xml | 135 -
testxml/general/TestBufferMitredJoin.xml | 60 -
testxml/general/TestCentroid.xml | 247 -
testxml/general/TestConvexHull-big.xml | 17 -
testxml/general/TestConvexHull.xml | 186 -
testxml/general/TestDensify.xml | 57 -
testxml/general/TestDistance.xml | 60 -
testxml/general/TestEqualsExact.xml | 157 -
testxml/general/TestFunctionAA.xml | 633 -
testxml/general/TestFunctionAAPrec.xml | 828 -
testxml/general/TestFunctionLA.xml | 522 -
testxml/general/TestFunctionLAPrec.xml | 59 -
testxml/general/TestFunctionLL.xml | 375 -
testxml/general/TestFunctionLLPrec.xml | 28 -
testxml/general/TestFunctionPA.xml | 155 -
testxml/general/TestFunctionPL.xml | 286 -
testxml/general/TestFunctionPLPrec.xml | 19 -
testxml/general/TestFunctionPP.xml | 269 -
testxml/general/TestInteriorPoint.xml | 128 -
testxml/general/TestMinimumClearance.xml | 89 -
testxml/general/TestOverlayEmpty.xml | 1021 -
testxml/general/TestPreparedPointPredicate.xml | 34 -
testxml/general/TestPreparedPolygonPredicate.xml | 191 -
...estPreparedPredicatesWithGeometryCollection.xml | 81 -
testxml/general/TestRectanglePredicate.xml | 304 -
testxml/general/TestRelateAA.xml | 235 -
testxml/general/TestRelateAC.xml | 27 -
testxml/general/TestRelateLA.xml | 190 -
testxml/general/TestRelateLC.xml | 41 -
testxml/general/TestRelateLL.xml | 311 -
testxml/general/TestRelatePA.xml | 103 -
testxml/general/TestRelatePL.xml | 124 -
testxml/general/TestRelatePP.xml | 64 -
testxml/general/TestSimple.xml | 357 -
testxml/general/TestUnaryUnion.xml | 161 -
testxml/general/TestUnaryUnionFloating.xml | 20 -
testxml/general/TestValid.xml | 746 -
testxml/general/TestValid2-big.xml | 18 -
testxml/general/TestValid2.xml | 5246 --
testxml/general/TestWithinDistance.xml | 92 -
testxml/robust/ExternalRobustness.xml | 220 -
testxml/robust/MagnifyTopology.xml | 86 -
testxml/robust/TestRobustOverlayError.xml | 19 -
testxml/robust/TestRobustOverlayFixed.xml | 18 -
testxml/robust/TestRobustOverlayFloat.xml | 104 -
testxml/robust/TestRobustRelate.xml | 19 -
testxml/stmlf/stmlf-cases-20061018_int.xml | 44826 ----------
testxml/stmlf/stmlf-cases-20061020_int.xml | 337 -
testxml/validate/TestRelateAA-big.xml | 34 -
testxml/validate/TestRelateAA.xml | 2833 -
testxml/validate/TestRelateAC.xml | 36 -
testxml/validate/TestRelateLA.xml | 1932 -
testxml/validate/TestRelateLC.xml | 57 -
testxml/validate/TestRelateLL.xml | 3388 -
testxml/validate/TestRelatePA.xml | 1018 -
testxml/validate/TestRelatePL.xml | 2263 -
testxml/validate/TestRelatePP.xml | 303 -
1705 files changed, 312474 insertions(+), 161688 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..71554b4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+.idea
+*.iml
+target
+.classpath
+.project
+.settings
+.externalToolBuilders
+build
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..20e9a0b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: java
+jdk:
+ - oraclejdk8
+sudo: false
+cache:
+ directories:
+ - $HOME/.m2
+install: mvn install -B -V
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..1f26198
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,40 @@
+# Contributing to JTS
+
+The project welcomes contributions. JTS is a mature, widely-used library, so contributions will be reviewed carefully to ensure they do not compromise the quality of the codebase.
+
+To start, it helps to announce what you are working on ahead of time to confirm that it is an acceptable contribution. To do this post to the [JTS Mailing List](https://locationtech.org/mailman/listinfo/jts-dev).
+
+The following sections outline workflows involved with contributions.
+
+## Become a Contributor
+
+In order to have code contributions accepted, the submitter must:
+
+1. Sign the [Eclipse Contributor Agreement](https://www.eclipse.org/legal/ECA.php) (ECA) with the Eclipse Foundation. Use the registered email with the Git commits associated to the GitHub pull request.
+
+## Develop a Contribution
+
+Code contributions must include a license header at the top of each file. A sample header for Java files is [here](doc/sample_java_header.txt).
+
+Code contributions should include the following:
+
+* Javadoc on classes and methods
+* Unit Tests to demonstrate code correctness and allow this to be maintained going forward. In the case of bug fixes the unit test should demonstrate the bug in the absence of the fix (if any). Unit Tests are usually JUnit classes, or in some cases may be JTS TestRunner test cases
+* License information on __all__ provided source files. An example license header can be found [here](doc/sample_java_header.txt).
+
+## Make a Pull Request
+
+The easiest and most visible way to make a contribution is to submit a Pull Request (PR) to the [GitHub repo](https://github.com/locationtech/jts).
+
+When preparing a PR please do the following:
+
+1. Acknowledge that the code contribution is IP clean by 'signing off' the commits in the pull request with the '-s' option to 'git commit'.
+
+2. Labeling the PR helps to track and prioritize the contribution. Use the following labels:
+ * The contribution type: enhancement, bug, api
+ * The module being contributed to: jts-core, jst-io, jts-app, jts-doc, jts-build
+
+3. When a PR is submitted Travis CI will run to check the commiter Eclipse status and the build correctness.
+ Please check the PR status, and fix any reported problems
+
+If you have questions about this, please ask on the jts-dev list.
diff --git a/DEVELOPING.md b/DEVELOPING.md
new file mode 100644
index 0000000..e2a5848
--- /dev/null
+++ b/DEVELOPING.md
@@ -0,0 +1,88 @@
+# JTS Developing Guide
+
+## Building
+
+The JTS build chain uses Maven. Build commands are executed at the project root directory (this one).
+
+* Build JTS, with tests:
+
+ mvn clean install
+
+* Build JTS, no tests:
+
+ mvn clean install -DskipTests
+
+* Build `jts-io-ora`:
+
+ mvn install -Poracle
+
+* Build `jts-io-sde`:
+
+ mvn install -Parcsde
+
+* Build everything:
+
+ mvn install -Pall
+
+## Javadoc
+
+* Build Javadoc for core modules
+
+ mvn javadoc:aggregate
+
+## Eclipse Configuration
+
+* Generate Eclipse configuration using `mvn eclipse:eclipse`
+* Import the generated projects into an Eclipse workspace
+
+### Run Configurations
+
+It is convenient to define the following Run Configurations:
+
+
+* **JTS TestRunner** - for executing XML tests:
+
+Field | Value
+------|------
+Type | Java Application
+Project | `jts-tests`
+Main class | `org.locationtech.jtstest.testrunner.JTSTestRunnerCmd`
+Program arguments | `-files validate general`
+Working directory | `${workspace_loc:jts-tests/src/test/resources/testxml}`
+
+* **JTS TestBuilder** - for viewing and processing geometry with JTS
+
+Field | Value
+------|------
+Type | Java Application
+Project | `jts-app`
+Main class | `org.locationtech.jtstest.testbuilder.JTSTestBuilder`
+Program arguments (optional) | `-geomfunc <classname> ...`
+VM args | `-Xmx1000M`
+VM args (optional, for Mac) | `-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel`
+Working directory | Default
+
+## Testing
+
+JTS aims for 100% code coverage for unit tests.
+
+There are two kinds of unit tests:
+
+### JUnit tests
+
+Used for verifying API code, internal data structures, and ancillary algorithms.
+
+### XML Tests
+
+JTS provides a code-independent, declarative XML-based format for expressing geometric functional tests.
+This format has the following advantages:
+
+* allows encoding large geometries
+* provides geometric test cases in a reusable way
+* easily consumed by external tools such as the JTS TestBuilder or other geometry libraries (e.g. GEOS)
+* allows geometric tests to be used with other operation implementations, for testing or comparison purposes
+
+This format should be used for tests which involve large geometries, or which
+express fundamental geometric semantics of the JTS library.
+
+
diff --git a/FAQ-LICENSING.md b/FAQ-LICENSING.md
new file mode 100644
index 0000000..63d970a
--- /dev/null
+++ b/FAQ-LICENSING.md
@@ -0,0 +1,62 @@
+# JTS Licensing FAQ
+
+JTS is dual-licensed under:
+
+* the [Eclipse Public License 1.0](https://www.eclipse.org/legal/epl-v10.html) ("EPL")
+* the [Eclipse Distribution License 1.0](http://www.eclipse.org/org/documents/edl-v10.php) (a Revised BSD-style license).
+
+More detail is provided in the [LICENSES](LICENSES.md) document.
+
+This FAQ clarifies the implications of the JTS software licensing.
+
+## Terminology
+
+* **Downstream projects** are codebases which link to JTS libraries
+ * e.g. GeoTools, GeoServer, etc.
+* **Derivative projects** are ports of JTS to other languages
+ * e.g. GEOS, JSTS, etc.
+
+
+## Licensing Frequently Asked Questions
+
+**A1. What is the difference between EDL and Revised BSD?**
+
+ Revised BSD is a license *family* (see [Wikipedia entry](https://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22BSD_License_2.0.22.2C_.22Revised_BSD_License.22.2C_.22New_BSD_License.22.2C_or_.22Modified_BSD_License.22.29)).
+ Revised BSD is also known as "Modified BSD", "BSD 2.0" or "3-clause BSD". It is a less restrictive version of the original BSD license.
+
+ EDL is the actual defined license.
+ It is called that because Eclipse is the distributing organization.
+
+**A2. JTS no longer uses LGPL. What does this mean for downstream projects?**
+
+ JTS is now released under a dual license: EDL **or** EPL.
+
+ Dual-licensing gives downstream projects their choice of either:
+
+* The **EDL** is a Revised BSD-style license. This license is **more** permissive than the LGPL, allowing a wider variety of uses.
+
+* The **EPL** provides a similar permissiveness to LGPL, with different wording around patents and requires a notice of where source code for JTS is available.
+
+The choice of which license to use is up to you.
+
+**A3. But I thought LGPL and EPL do not mix? How does this affect derivative projects like the LGPL GEOS project?**
+
+ An LGPL project (like GEOS or GeoTools) can use JTS as a dependency, under the terms of the EDL license.
+ The three clauses in the EDL (common to all BSD-style licenses) allow GEOS to
+ port the JTS work to C and distribute the resulting work under the LGPL.
+ Although the LGPL license contains additional restrictions
+ (notably a requirement to share modifications under the same license)
+ that exceed what is required by the EDL, these do not conflict with the EDL.
+
+ For further information about the compatibility of Revised BSD-style licenses
+ with the GPL see the [FSF License Comments](https://www.gnu.org/licenses/license-list.en.html).
+
+**A4. How can an LGPL-licensed project (such as GEOS) contribute code to JTS?**
+
+ From the JTS perspective this works in the same way as any other contribution.
+ The contributor must have an Eclipse *Contributor License Agreement* (CLA) in place.
+ For details see the [**Contributing Guide**](CONTRIBUTING.md).
+
+ Code contributed to JTS **must** be releasable under the EDL & EPL licenses.
+ Therefore the contributor must have permission from the contributing project (e.g. via OSGeo CLA or similar)
+ to relicense the work in question.
diff --git a/LICENSES.md b/LICENSES.md
new file mode 100644
index 0000000..9710953
--- /dev/null
+++ b/LICENSES.md
@@ -0,0 +1,21 @@
+# JTS Topology Suite Licensing
+
+May 30th, 2017
+
+## Project Licenses
+
+The Eclipse Foundation makes available all content in this project ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of either the [Eclipse Public License 1.0](https://www.eclipse.org/legal/epl-v10.html) ("EPL") or the [Eclipse Distribution License 1.0](http://www.eclipse.org/org/documents/edl-v10.php) (a BSD Style License). For purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source [...]
+
+## Third Party Content
+
+The Content includes items that have been sourced from third parties as set out below. If you did not receive this Content directly from the Eclipse Foundation, the following is provided for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.
+
+### GeoTools
+
+JTS includes some code from the GeoTools project. This code has been licensed to the JTS project under the OSGeo BSD License [2] by the GeoTools PSC [3,4].
+
+[2] https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+[3] https://github.com/geotools/geotools/wiki/JTS-ORA-Contribution
+[4] https://github.com/geotools/geotools/wiki/JTS-Shapefile-Contribution
diff --git a/LICENSE_EDLv1.txt b/LICENSE_EDLv1.txt
new file mode 100644
index 0000000..52646c2
--- /dev/null
+++ b/LICENSE_EDLv1.txt
@@ -0,0 +1,30 @@
+Eclipse Distribution License - v 1.0
+
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ Neither the name of the Eclipse Foundation, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE_EPLv1.txt b/LICENSE_EPLv1.txt
new file mode 100644
index 0000000..7d44921
--- /dev/null
+++ b/LICENSE_EPLv1.txt
@@ -0,0 +1,216 @@
+Eclipse Public License, Version 1.0 (EPL-1.0)
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and
+ documentation distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates'
+from a Contributor if it was added to the Program by such Contributor itself
+or anyone acting on such Contributor's behalf. Contributions do not include
+additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license agreement,
+and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or
+when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with
+this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly
+ perform, distribute and sublicense the Contribution of such
+ Contributor, if any, and such derivative works,
+ in source code and object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and
+ otherwise transfer the Contribution of such Contributor, if any,
+ in source code and object code form. This patent license shall apply
+ to the combination of the Contribution and the Program if, at the time
+ the Contribution is added by the Contributor, such addition of the
+ Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution.
+ No hardware per se is licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby assumes
+ sole responsibility to secure any other intellectual property rights
+ needed, if any. For example, if a third party patent license is
+ required to allow Recipient to distribute the Program, it is
+ Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties
+ and conditions, express and implied, including warranties or
+ conditions of title and non-infringement, and implied warranties or
+ conditions of merchantability and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability
+ for damages, including direct, indirect, special, incidental and
+ consequential damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are
+ offered by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable
+ manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+ b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to
+identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering,
+such Contributor ("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor") against any
+losses, damages and costs (collectively "Losses") arising from claims,
+lawsuits and other legal actions brought by a third party against the
+Indemnified Contributor to the extent caused by the acts or omissions of
+such Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not apply
+to any claims or Losses relating to any actual or alleged intellectual
+property infringement. In order to qualify, an Indemnified Contributor must:
+a) promptly notify the Commercial Contributor in writing of such claim,
+and b) allow the Commercial Contributor to control, and cooperate with the
+Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any such
+claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor.
+If that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties
+are such Commercial Contributor's responsibility alone. Under this section,
+the Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result,
+the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+Each Recipient is solely responsible for determining the appropriateness of
+using and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability
+or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by
+the parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and
+does not cure such failure in a reasonable period of time after becoming
+aware of such noncompliance. If all Recipient's rights under this
+Agreement terminate, Recipient agrees to cease use and distribution of the
+Program as soon as reasonably practicable. However, Recipient's obligations
+under this Agreement and any licenses granted by Recipient relating to the
+Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and may
+only be modified in the following manner. The Agreement Steward reserves
+the right to publish new versions (including revisions) of this Agreement
+from time to time. No one other than the Agreement Steward has the right to
+modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version
+of the Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to
+this Agreement will bring a legal action under this Agreement more than one
+year after the cause of action arose. Each party waives its rights to a
+jury trial in any resulting litigation.
diff --git a/MIGRATION.md b/MIGRATION.md
new file mode 100644
index 0000000..9ead150
--- /dev/null
+++ b/MIGRATION.md
@@ -0,0 +1,32 @@
+JTS Upgrade Guide
+=================
+
+The JTS Topology Suite has a long history, and in 2016/2017, [Vivid Solutions](http://www.vividsolutions.com/) brought the project to the LocationTech working group of the Eclipse Foundation.
+
+During that transition, the Java package names and Maven GAVs have changed. For package names (typically used in imports), the change is reflected below:
+
+| | **JTS 1.14.0 and before** | **JTS 1.15.0 and later** |
+|---------------|:--------------------------|:----------------------------|
+| Maven GroupId | com.vividsolutions | org.locationtech.jts |
+| Package names | com.vividsolutions.jts.* | org.locationtech.jts.* |
+
+To upgrade a Maven project (or another build tool using Maven dependency management), one can do a find and replace on ```pom.xml``` files (or similiar build files). In the source code, one could do a find and replace on the package names. As a concrete example, one could use these two commands to handle most of the migration.
+
+```
+git grep -l com.vividsolutions | grep pom.xml | xargs sed -i "s/com.vividsolutions/org.locationtech.jts/g"
+git grep -l com.vividsolutions | xargs sed -i "s/com.vividsolutions/org.locationtech/g"
+```
+
+## Using JTS with Maven
+
+To include JTS in a Maven project, add a dependency block like the following:
+
+```xml
+<dependency>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-core</artifactId>
+ <version>${jts.version}</version>
+</dependency>
+```
+
+Where ${jts.version} is the released version of JTS one chooses to use. See the [releases](https://github.com/locationtech/jts/releases) page for options.
diff --git a/OSGEO_LICENSE.txt b/OSGEO_LICENSE.txt
new file mode 100644
index 0000000..0c81f79
--- /dev/null
+++ b/OSGEO_LICENSE.txt
@@ -0,0 +1,11 @@
+Copyright (c) 2003, Open Source Geospatial Foundation.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of the Open Source Geospatial Foundation, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFI [...]
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..237429d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,59 @@
+JTS Topology Suite
+==================
+
+The JTS Topology Suite is a Java library for creating and manipulating vector geometry. It also provides a comprehensive set of geometry test cases, and the TestBuilder GUI application for working with and visualizing geometry and JTS functions.
+
+
+
+[](http://travis-ci.org/locationtech/jts) [](https://gitter.im/locationtech/jts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+
+JTS is in incubation with the [LocationTech](http://www.locationtech.org) working group of the Eclipse Foundation.
+
+
+
+## Locations
+
+* Git Repo: [github.com/locationtech/jts](https://github.com/locationtech/jts)
+* Mailing List: [locationtech.org/mailman/listinfo/jts-dev](https://locationtech.org/mailman/listinfo/jts-dev)
+* LocationTech Home: [locationtech.org/projects/technology.jts](https://locationtech.org/projects/technology.jts)
+* GitHub web pages: [locationtech.github.io/jts/](https://locationtech.github.io/jts/)
+* Gitter Channel: [gitter.im/locationtech/jts](https://gitter.im/locationtech/jts)
+
+## License
+
+JTS is open source software. It is dual-licensed under:
+
+* [Eclipse Public License 1.0](https://www.eclipse.org/legal/epl-v10.html)
+* [Eclipse Distribution License 1.0](http://www.eclipse.org/org/documents/edl-v10.php) (a BSD Style License)
+
+See also:
+
+* [License details](LICENSES.md)
+* Licensing [FAQ](FAQ-LICENSING.md)
+
+## Documentation
+
+* Javadoc: [https://locationtech.github.io/jts/javadoc](https://locationtech.github.io/jts/javadoc)
+* Installing and using JTS is described in the [**User Guide**](USING.md).
+* Building and developing with JTS is described in the [**Developing Guide**](DEVELOPING.md).
+
+## Contributing
+
+If you are interested in contributing to JTS please read the [**Contributing Guide**](CONTRIBUTING.md).
+
+## Downstream Projects
+
+### Derivative (ports to other languages)
+* [**GEOS**](https://trac.osgeo.org/geos) - C++
+* [**NetTopologySuite**](https://github.com/NetTopologySuite/NetTopologySuite) - .NET
+* [**JSTS**](https://github.com/bjornharrtell/jsts) - JavaScript
+
+### Via GEOS
+* [**Shapely**](https://github.com/Toblerity/Shapely) - Python wrapper of GEOS
+* [**R-GEOS**](https://cran.r-project.org/web/packages/rgeos/index.html) - R wrapper of GEOS
+* [**rgeo**](https://github.com/rgeo/rgeo) - Ruby wrapper of GEOS
+* [**GEOSwift**](https://github.com/GEOSwift/GEOSwift)- Swift library using GEOS
+
+
+
diff --git a/RELEASING.md b/RELEASING.md
new file mode 100644
index 0000000..3dc8653
--- /dev/null
+++ b/RELEASING.md
@@ -0,0 +1,15 @@
+# JTS Release Guide
+
+This guide is intended for JTS project maintainers,
+to assist them in preparing releases of the project.
+
+## Release Checklist
+
+* Set the version number in the following artifacts:
+ * Maven POMs
+ * Java class `JTSVersion`
+* Create a Release Milestone, and tag it to Issues and PRs wanted in the release
+* Confirm Maven build executes with no errors
+* Review scripts in `bin` to confirm correctness
+* Update the Version History, to record significant changes
+
diff --git a/USING.md b/USING.md
new file mode 100644
index 0000000..41270d0
--- /dev/null
+++ b/USING.md
@@ -0,0 +1,84 @@
+# JTS User Guide
+
+## Project Structure
+
+JTS consists of several Java modules.
+Each one corresponds to a separate JAR file.
+
+The core modules are:
+
+* `jts-core` - The JTS core: geometry model, operations, algorithms, and spatial data structures
+* `jts-io-common` - I/O classes for open spatial formats
+
+The following modules depend on proprietary libraries, and are not built by default:
+
+* `jts-io-ora` - Oracle reader and writer
+* `jts-io-sde` - SDE reader and writer
+
+The following modules are applications and data for testing and working with JTS
+
+* `jts-tests` - The JTS XML test suite and the Test Runner application
+* `jts-app` -The TestBuilder GUI, for working with JTS geometry interactively
+
+## Using JTS with Maven
+
+To include JTS in a Maven project, add a dependency block like the following:
+
+```xml
+<dependency>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-core</artifactId>
+ <version>${jts.version}</version>
+</dependency>
+```
+
+JTS snapshot artifacts are published to the LocationTech Maven repository. To include JTS in a project, add the following repositories to the pom.
+
+```xml
+<repositories>
+ <repository>
+ <id>locationtech-releases</id>
+ <url>https://repo.locationtech.org/content/groups/releases</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jts-snapshots</id>
+ <url>https://repo.locationtech.org/content/repositories/jts-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+</repositories>
+```
+## Using older versions of JTS with Maven
+
+Older versions of JTS are available on Maven Central.
+
+### 1.14
+
+```xml
+<dependency>
+ <groupId>com.vividsolutions</groupId>
+ <artifactId>jts-core</artifactId>
+ <version>1.14.0</version>
+</dependency>
+<dependency>
+ <groupId>com.vividsolutions</groupId>
+ <artifactId>jts-io</artifactId>
+ <version>1.14.0</version>
+</dependency>
+```
+### 1.13
+
+```xml
+<dependency>
+ <groupId>com.vividsolutions</groupId>
+ <artifactId>jts</artifactId>
+ <version>1.13</version>
+</dependency>
+```
diff --git a/bin/test.bat b/bin/test.bat
index 759f65e..4b868bb 100644
--- a/bin/test.bat
+++ b/bin/test.bat
@@ -1,25 +1,25 @@
- at echo off
-rem A batch file to run the XML test files written by Geographic Data BC.
-
-set CLASSPATH=
-for %%i in (..\lib\*.*) do (
- set jarfile=%%i
-
- rem If we append to a variable inside the for, only the last entry will
- rem be kept. So append to the variable outside the for.
- rem See http://www.experts-exchange.com/Operating_Systems/MSDOS/Q_20561701.html.
- rem [Jon Aquino]
-
- call :setclass
-)
-
-java com.vividsolutions.jtstest.testrunner.TopologyTestApp -Files ..\testxml\validate ..\testxml\general
-pause
-
-goto :eof
-
-:setclass
-set CLASSPATH=%jarfile%;%CLASSPATH%
-set jarfile=
-
+ at echo off
+rem A batch file to run the XML test files written by Geographic Data BC.
+
+set CLASSPATH=
+for %%i in (..\lib\*.*) do (
+ set jarfile=%%i
+
+ rem If we append to a variable inside the for, only the last entry will
+ rem be kept. So append to the variable outside the for.
+ rem See http://www.experts-exchange.com/Operating_Systems/MSDOS/Q_20561701.html.
+ rem [Jon Aquino]
+
+ call :setclass
+)
+
+java com.vividsolutions.jtstest.testrunner.TopologyTestApp -Files ..\testxml\validate ..\testxml\general
+pause
+
+goto :eof
+
+:setclass
+set CLASSPATH=%jarfile%;%CLASSPATH%
+set jarfile=
+
:eof
\ No newline at end of file
diff --git a/bin/test_robust.bat b/bin/test_robust.bat
index a206dca..1fa34ae 100644
--- a/bin/test_robust.bat
+++ b/bin/test_robust.bat
@@ -1,25 +1,25 @@
- at echo off
-rem A batch file to run a XML test files
-
-set CLASSPATH=
-for %%i in (..\lib\*.*) do (
- set jarfile=%%i
-
- rem If we append to a variable inside the for, only the last entry will
- rem be kept. So append to the variable outside the for.
- rem See http://www.experts-exchange.com/Operating_Systems/MSDOS/Q_20561701.html.
- rem [Jon Aquino]
-
- call :setclass
-)
-
-java com.vividsolutions.jtstest.testrunner.TopologyTestApp -Files ..\testxml\robust
-pause
-
-goto :eof
-
-:setclass
-set CLASSPATH=%jarfile%;%CLASSPATH%
-set jarfile=
-
+ at echo off
+rem A batch file to run a XML test files
+
+set CLASSPATH=
+for %%i in (..\lib\*.*) do (
+ set jarfile=%%i
+
+ rem If we append to a variable inside the for, only the last entry will
+ rem be kept. So append to the variable outside the for.
+ rem See http://www.experts-exchange.com/Operating_Systems/MSDOS/Q_20561701.html.
+ rem [Jon Aquino]
+
+ call :setclass
+)
+
+java com.vividsolutions.jtstest.testrunner.TopologyTestApp -Files ..\testxml\robust
+pause
+
+goto :eof
+
+:setclass
+set CLASSPATH=%jarfile%;%CLASSPATH%
+set jarfile=
+
:eof
\ No newline at end of file
diff --git a/bin/test_stmlf.bat b/bin/test_stmlf.bat
deleted file mode 100644
index 1335594..0000000
--- a/bin/test_stmlf.bat
+++ /dev/null
@@ -1,25 +0,0 @@
- at echo off
-rem A batch file to run a XML test files
-
-set CLASSPATH=
-for %%i in (..\lib\*.*) do (
- set jarfile=%%i
-
- rem If we append to a variable inside the for, only the last entry will
- rem be kept. So append to the variable outside the for.
- rem See http://www.experts-exchange.com/Operating_Systems/MSDOS/Q_20561701.html.
- rem [Jon Aquino]
-
- call :setclass
-)
-
-java com.vividsolutions.jtstest.testrunner.TopologyTestApp -Files ..\testxml\stmlf -geomop com.vividsolutions.jtstest.geomop.OverlayValidatedGeometryOperation
-pause
-
-goto :eof
-
-:setclass
-set CLASSPATH=%jarfile%;%CLASSPATH%
-set jarfile=
-
-:eof
\ No newline at end of file
diff --git a/bin/testbuilder.bat b/bin/testbuilder.bat
index cf0a6ed..77084d6 100644
--- a/bin/testbuilder.bat
+++ b/bin/testbuilder.bat
@@ -1,26 +1,13 @@
- at echo off
-rem A batch file to run the JTS Test Builder
-
-set CLASSPATH=
-for %%i in (..\lib\*.*) do (
- set jarfile=%%i
-
- rem If we append to a variable inside the for, only the last entry will
- rem be kept. So append to the variable outside the for.
- rem See http://www.experts-exchange.com/Operating_Systems/MSDOS/Q_20561701.html.
- rem [Jon Aquino]
-
- call :setclass
-)
-
-set MEMSIZE=256
-
-start javaw -Xmx%MEMSIZE%M com.vividsolutions.jtstest.testbuilder.JTSTestBuilder
-
-goto :eof
-
-:setclass
-set CLASSPATH=%jarfile%;%CLASSPATH%
-set jarfile=
-
-:eof
\ No newline at end of file
+ at echo off
+rem Windows batch file to run the JTS Test Builder from the Maven target directory
+
+set JAVA_OPTS=-Xms256M -Xmx1024M
+
+REM to change L&F if desired. Blank is default
+REM JAVA_LOOKANDFEEL="-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel"
+set JAVA_LOOKANDFEEL=
+
+REM Default app options can be added here
+set APP_OPTS=%*
+
+javaw %JAVA_OPTS% %JAVA_LOOKANDFEEL% -jar %~dp0\..\modules\app\target\JTSTestBuilder.jar %APP_OPTS%
diff --git a/bin/testrunner.bat b/bin/testrunner.bat
index fce19ee..835c5f3 100644
--- a/bin/testrunner.bat
+++ b/bin/testrunner.bat
@@ -1,24 +1,6 @@
- at echo off
-rem A batch file to run the JTS test runner.
-
-set CLASSPATH=
-for %%i in (..\lib\*.*) do (
- set jarfile=%%i
-
- rem If we append to a variable inside the for, only the last entry will
- rem be kept. So append to the variable outside the for.
- rem See http://www.experts-exchange.com/Operating_Systems/MSDOS/Q_20561701.html.
- rem [Jon Aquino]
-
- call :setclass
-)
-
-start javaw com.vividsolutions.jtstest.testrunner.TopologyTestApp -Properties testrunner.properties -GUI
-
-goto :eof
-
-:setclass
-set CLASSPATH=%jarfile%;%CLASSPATH%
-set jarfile=
-
-:eof
\ No newline at end of file
+ at echo off
+REM A batch file to run the JTS Test Runner.
+REM Requirements: Maven build must be run to create fat jar (mvn clean install)
+
+java -jar %~dp0\..\modules\tests\target\JTSTestRunner.jar %*
+
diff --git a/bin/testrunner.properties b/bin/testrunner.properties
index 9f4e8dc..4e93f23 100644
--- a/bin/testrunner.properties
+++ b/bin/testrunner.properties
@@ -1,3 +1,3 @@
-#Properties file for class com.vividsolutions.jtstest.testrunner.TopologyTestApp
-#Wed Dec 06 16:08:49 PST 2006
-TestFiles=\ Z\:\\proj\\jts\\robust\\tests\\unit\\cmp-5966094-2025063.xml
+#Properties file for class com.vividsolutions.jtstest.testrunner.TopologyTestApp
+#Wed Dec 06 16:08:49 PST 2006
+TestFiles=\ Z\:\\proj\\jts\\robust\\tests\\unit\\cmp-5966094-2025063.xml
diff --git a/doc/JTS_Version_History.html b/doc/JTS_Version_History.html
index f2f4538..0127274 100644
--- a/doc/JTS_Version_History.html
+++ b/doc/JTS_Version_History.html
@@ -1,1179 +1,1246 @@
-<html>
-
-<head>
-<title>JTS Version History</title>
-</head>
-
-<body bgcolor='#DFF0FF'>
-<h1 style='text-align:center; color:darkblue;'>
-JTS TOPOLOGY SUITE
-<br>
-<i>Version History</i>
-</h1>
-
-
-This document lists the change history of release versions of the
-<span style='color:darkblue;'><b>JTS Topology Suite</b></span>.
-<p>
-Further information on JTS can be found at <b>Tsusiat Software's
-<a href='http://tsusiatsoftware.net/jts/main.html'>JTS pages</a></b>.
-<p>
-The current and archived JTS distributions can be obtained at the
-<a href='http://sourceforge.net/projects/jts-topo-suite/'><b>SourceForge JTS site</b></a>.
-
-<!-- ================================================================ -->
-<hr size='4' color='darkblue'>
-<h2>Version 1.14</h2>
-
-<i>Release Date: September 23, 2015</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <code>Envelope.compareTo</code> method
-<li>Fixed <code>SegmentSetMutualIntersector</code> classes to be thread-safe</li>
-<li>Fixed <code>PreparedGeometry</code> classes to be thread-safe</li>
-<li>Added <code>LineDissolver</code> class
-<li>Added <code>edgegraph</code> package
-<li>Added <code>CoordinateSequences.isEqual</code> method
-<li>Extended <code>CoordinateSequences.copy</code> and <code>CoordinateSequences.copy</code> to handle inputs of different dimension
-<li>Added <code>CoordinateArrays.envelope()</code> function
-<li>Added <code>CoordinateArrays.intersection()</code> function
-<li>Added <code>Polygonizer.setCheckValidRings()</code> method for optimizing performance in some situations
-<li>Added <code>KMLWriter</code> to convert Geometry to KML representation
-<li>Added <code>Coordinate</code> <code>equals3D</code>, <code>equals2D(Coordinate, tolerance)</code>, and <code>equalInZ</code> methods.
-<li>Added <code>VWSimplifier</code> to perform Visvalingam-Whyatt simplification
-<li>Enhanced <code>WKBReader</code> to handle Spatialite WKB format
-<li>Added <code>DD.setValue()</code> methods
-<li>Added <code>getGeometry()</code> methods to <code>LinearComponentExtracter</code> and <code>LineStringExtracter</code>
-<li>Added <code>BufferParameters</code> </code>simplifyFactor</code> setting
-<li>Added node counting and ability to not keep intersection points to <code>InteriorIntersectionFinder</code>
-<li>Added <code>Polygonizer</code> functionality to extract only polygons forming a valid polygonal geometry
-<li>Added <code>KdTree.toCoordinates</code>
-<li>Added <code>MinimumBoundingCircle.getFarthestPoints</code> method
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Performance & memory improvement in <tt>PreparedPolygonIntersects</tt> by short-circuiting point input case
-<li>Allow for memory usage optimization in <code>CascadedPolygonUnion</code>, by avoiding retaining input collection
-<li>Fix <code>Point.isEmpty()</code> to avoid allocating a coordinate
-<li>Fix <code>Geometry.equalsExact()</code> to short-circuit when the inputs are identical objects
-<li>Add short-circuit to <code>PointExtracter</code> to improve performance for Points
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed <code>RobustLineIntersector</code> heuristic for handling invalid intersection points
-(computed as outside envelope of input segments due to numeric precision issues)
-<li>Fixed <code>CGAlgorithmsDD.intersection</code> to compute intersection correctly
-<li>Fixed <tt>Geometry.interiorPoint()</tt> to compute a true interior point in certain cases
-<li>Fixed <code>Geometry.equals</code> to handle null argument
-<li>Fixed <code>DistanceToPoint</code> to be thread-safe
-<li>Fixed <code>Geometry.interiorPoint()</code> and <code>InteriorPointArea</code> to handle zero-area geometries
-<li>Fixed <code>STRtree</code> classes to be thread-safe (by synchronizing the <code>AbstractSTRtree.build()</code> method)
-<li>Fixed <code>STRtree.remove()</code> method to avoid a NPE
-<li>Fixed <code>DouglasPeuckerSimplifier</code> and <code>TopologyPreservingSimplifier</code> to handle empty geometry components in the input
-<li>Fixed <code>ConvexHull</code> to handle input of array of identical coordinates
-<li>Fixed <code>GeometryTransformer.transformLinearRing()</code> to handle null inputs
-<li>Fixed the <code>extractPoint(distance, offset)</code> methods in
- <code>LocationIndexedLine</code> and <code>LengthIndexedLine</code> to handle offsets from endpoints correctly.
-<li>Fixed <code>GeometryCollectionIterator</code> to correctly handle atomic geometries
-<li>Fixed <code>InteriorIntersectionFinder</code> to not short-circuit when finding all nodes
-<li>Fixed <code>SubgraphDepthLocator</code> to work with Java 7+ by avoiding sorting with an inconsistent ordering
-<li>Fixed <code>FontGlyphReader</code> to use correct Java font value of "SansSerif", and added new constant to match.
-<li>Fixed <code>KdTree</code> to correctly implement distance tolerance-based coordinate matching
-<li>Fixed <code>LineString.normalize()</code> to correctly handle CoordinateSequences
-<li>Fixed <code>CommonBitsRemover</code> to correctly handle CoordinateSequences
-<li>Fixed bug in <code>CoordinateArraySequence.clone()</code>
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Changed interface of <code>SegmentSetMutualIntersector</code> to support thread-safety by removing state
-<li>Provided <code>InteriorIntersectionFinderAdder</code> to replace the poorly named <code>IntersectionFinderAdder</code>
-<li>Changed some classes in <code>com.vividsolutions.jts.operation.buffer</code> to be package-private
-</ul>
-
-<h3>Testing Improvements</h3>
-<ul>
-<li>Added <code>GeometryTestCase</code> base class to simplify unit tests
-</ul>
-
-<!------- JTS-IO -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS I/O</h3>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <code>GeoJsonReader</code> and <code>GeoJsonWriter</code> classes
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>In <code>OraWriter</code> the connection is now provided to the <code>write()</code> method, not the constructors
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed <code>OraReader</code> to handle reading <code>GeometryCollection</code> with <code>Point</code> as second element
-<li>Many improvements to Oracle API code and performance
-<li>Added <code>OraWriter.setOptimizePoint</code> and <code>OraWriter.setOptimizeRectangle</code> methods
-</ul>
-
-<!------- TestBuilder -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added ability to read multiple WKBHex geometries from a text file
-<li>Added AutoZoom to input
-<li>Added Oracle text output
-<li>Added more function sets
-<li>Removed dependency on Acme GIF encoder library
-<li>Improved zooming logic
-<li>Added mouse wheel zooming
-<li>Improved UI for editing A/B geometries
-<li>Added <b>Compute New</b> button to Geometry Functions panel
-<li>Added SpatialIndex functions
-<li>Added User Data labelling
-</ul>
-
-<h3>UI Changes</h3>
-<ul>
-<li>Moved Options menu items to View menu
-<li>Removed Tools menu items (they are available as functions)
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed to correctly handle changing Swing Look&Feel
-</ul>
-
-
-<!-- ================================================================ -->
-<hr size='4' color='darkblue'>
-<h2>Version 1.13</h2>
-
-<i>Release Date: December 13, 2012</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Changed <tt>GeometryFactory.createGeometry()</tt> to make a deep copy of the argument Geometry,
-using the CoordinateSequenceFactory of the factory
-<li>Added ability to specify a dimension in <tt>CoordinateArraySequence</tt>
-<li>Changed <tt>Geometry.getEnvelopeInternal()</tt> to return a copy of the cached envelope, to prevent modification
-<li>Added <tt>GeometryEditor.CoordinateSequenceOperation</tt> to allow easy editing of constituent CoordinateSequences
-<li>Added <tt>GeometryFactory.createPolygon</tt> convenience methods which do not require holes to be specified
-<li><tt>Geometry</tt> overlay methods now return empty results as atomic types of appropriate dimension
-<li>Added <tt>RectangleLineIntersector</tt> to provide efficient rectangle-line intersection testing
-<li>Added <tt>getOrdinate</tt> and <tt>setOrdinate</tt> to <tt>Coordinate</tt>
-<li><tt>Quadtree</tt> is <tt>Serializable</tt>
-<li><tt>STRtree</tt> is <tt>Serializable</tt>
-<li>Added <tt>max</tt>, <tt>average</tt> and <tt>wrap</tt> functions to <tt>MathUtil</tt>
-<li>Improved <tt>WKTReader</tt> parse error reporting to report input line of error
-<li>Improved <code>WKBReader</code> to repair structurally-invalid input
-<li>Made <tt>TopologyPreservingSimplifier</tt> thread-safe
-<li>Added <tt>AbstractSTRtree.isEmpty()</tt> method
-<li>Added <tt>QuadTree.isEmpty()</tt> method
-<li>Added <tt>KdTree.isEmpty()</tt> method
-<li>Added decimation and duplicate point removal to </tt>ShapeWriter<tt>.
-<li><tt>ScaledNoder</tt> now preserves Z values of input
-<li>Added instance methods for all <t>Triangle</tt> static methods
-<li>Added <tt>CGAlgorithmsDD</tt> containing high-precision versions of some basic CG algorithms
-<li>Added <tt>IntersectionMatrix.isTrue()</tt> method for testing IM pattern matches
-<li>Added <code>getRawCoordinates</code> methods to <code>PackedCoordinateSequence</code> concrete classes
-<li>Modified <code>Geometry.isSimple()</code> to explicity check for simplicity for all types,
-and support <code>GeometryCollections</code>
-<li>Improved <code>MCIndexSnapRounder</code> to add nodes only where they are necessary
-<li>Added <code>CoordinateArrays.removeNull()</code> method
-<li>Enhanced <code>GeometryEditor</code> to handle null geometries returned from operation
-<li>Added <code>WKBHExFileReader</code>
-<li>Added <code>Distance3D</code> operation
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Simplified & improved performance of <tt>RectangleIntersects</tt> by using new <tt>RectangleLineIntersector</tt>
-<li>In <tt>RandomPointsInGridBuilder</tt> eliminated redundant <tt>ArrayList</tt> usage
-<li>In <tt>PreparedPolygonIntersects</tt> and <tt>PreparedLineStringIntersects</tt> added check
-to avoid creating segment index if all test inputs are points
-<li>In <tt>AbstractSTRtree</tt> switched to using indexed list access for better performance than using iterators
-<li>In <tt>AbstractSTRtree</tt> freed inserted item array after index is built
-<li>Improved performance of <tt>Polygonizer</tt> for cases with many potential holes
-<li>Improved performance for some <tt>DD</tt> methods by making them <tt>final</tt>
-<li>Added fast filter for <tt>CGAlgorithmsDD.orientationIndex</tt>, and switched to self-operations for DD determinant
-<li>Changed <code>STRtree.createNode()</code> to use a static class for nodes
-<li>Changed <code>QuadTree Node</code> to use scalar x and y variables rather than a <code>Coordinate</code> to reduce memory allocation
-<li>Fixed <code>PreparedGeometry</code> concrete classes to be thread-safe.
-<li>Fixed <code>SortedPackedIntervalRTree</code> so that it is thread-safe.
-</ul>
-
-<h3>Robustness Improvements</h3>
-<ul>
-<li>Switched to using DD extended-precision arithmetic to compute orientation predicate
-<li><code>CGAlgorithms.distanceLineLine()</code> improved to be more robust and performant
-<li>Fixed robustness issue causing <tt>Empty Stack</tt> failure
-in <tt>ConvexHull</tt> for some nearly collinear inputs
-<li><tt>CGAlgorithms.signedArea()</tt> uses a more accurate algorithm
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed <tt>Geometry.equalsExact()</tt> to avoid NPE when comparing empty and non-empty <tt>Point</tt>s
-<li>Fixed <tt>CascadedPolygonUnion</tt> to discard non-polygonal components created during unioning,
-to avoid failures and provide more desirable behaviour
-<li>Fixed <tt>CentralEndpointIntersector</tt> to initialize result correctly
-<li>Fixed <tt>DelaunayTriangulationBuilder.extractUniqueCoordinates(Geometry)</tt>
-to avoid mutating the vertex order of the input Geometry
-<li>Fixed <tt>ConformingDelaunayTriangulationBuilder</tt> to allow
-non-disjoint site and constraint vertex sets
-<li>Fixed <tt>RandomPointsInGridBuilder</tt> point generation to use circle constraint correctly
-<li>Fixed Linear Referencing API to handle MultiLineStrings consistently,
-by always using the lowest possible index value, and by trimming zero-length components from results
-<li>Fixed bug in <tt>LocationIndexedLine</tt> and <tt>LengthIndexLine</tt> which was
-causing an assertion failure when the indexOfAfter() method was called with a constraint location
-which is at the end of the line
-<li>Fixed bug in <tt>STRtree.query(Envelope, ItemVisitor)</tt> causing an NPE when tree is empty
-<li>Fixed issue with creating zero-length edges during buffer topology building under fixed precision, by:
-adding filter to remove zero-length edges;
-using a better estimate of scale factor for reducing to fixed precision after initial failure.
-<li>Fixed <tt>TopologyPreservingSimplifier</tt> to return a valid result
-for closed <tt>LineString</tt>s with large distance tolerances
-<li>Fixed <tt>TopologyPreservingSimplifier</tt> to return an empty result for an empty input
-<li>Fixed <tt>DouglasPeuckerSimplifier</tt> to return an empty result for an empty input
-<li>Fixed <tt>MinimumBoundingCircle</tt> to correctly compute circle for obtuse triangles.
-<li>Fixd <tt>GeometryPrecisionReducer</tt> to use input GeometryFactory when polygon topology is fixed
-<li>Fixed <tt>GeometryNoder</tt> bug that was failing to snap to end vertices of lines
-<li>Fixed <tt>Geometry.getCentroid()</tt> and <tt>Geometry.getInteriorPoint()</tt> to return <tt>POINT EMPTY</tt> for empty inputs
-<li>Fixed <tt>DelaunayTriangulationBuilder</tt> to correctly extract unique points
-<li>Fixed <tt>KdTree</tt> to correctly handle inserting duplicate points into an empty tree
-<li>Fixed <tt>LineSegment.projectionFactor()</tt> to handle zero-length lines (by returning Double.POSITIVE_INFINITY)
-<li>Fixed <tt>LocationIndexedLine</tt> to handle locations on zero-length lines
-<li>Fixed <code>LengthIndexedLine</code> and <code>LocationIndexedLine</code> to handle <code>indexOfAfter()</code> correctly
-<li>Fixed <code>WKBReader</code> to handle successive geometrys with different endianness
-<li>Fixed <code>GeometricShapeFactory</code> to correctly handle setting the centre point
-<li>Fixed <code>GeometryFactory.createMultiPoint(CoordinateSequence)</code> to handle sequences of dimension > 3
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Changed visibility of <tt>TaggedLineStringSimplifier</tt> back to <tt>public</tt> due to user demand
-</ul>
-
-<h3>Testing</h3>
-<ul>
-<li>Added Performance Testing framework (<tt>PerformanceTestRunner</tt>
-and <tt>PerformanceTestCase</tt>)
-<li>Added named predicate tests to all Relate test cases
-</ul>
-
-<h3>Contributors</h3>
-<ul>
-<li>Peter Hopfgartner - improved area computation
-<li>Michael Michaud - snap-rounding improvements
-</ul>
-
-
-<!------- TestBuilder -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added segment index visualization styling
-<li>Improved <b>Geometry Inspector</b>
-<li>Added stream digitizing for Polygon and LineString tools
-<li>Added output of Test Case XML with WKB
-<li>Added Extract Component tool
-<li>Added Delete Vertices Or Components tool
-<li>Added Geometry Edit Panel pop-up menu, with operations
-<li>Added Halton sequence functions
-<li>Added sorting functions
-<li>Added function for selection of first N components
-<li>Added CGAlgorithms functions
-<li>Added ability to paste and load multiple WKBHex geometries
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Using decimation substantially improves rendering time for large geometries.
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed bug in saving XML test files
-</ul>
-
-<!-- ================================================================ -->
-<hr size='4' color='darkblue'>
-<h2>Version 1.12</h2>
-
-<i>Release Date: June 30, 2011</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added new names for methods for computing <tt>Geometry</tt> equality:
-<li><tt>equals(Object)</tt> is a synonym for <tt>equalsExact(Geometry)</tt>
-<li><tt>equalsNorm(Geometry)</tt> automatically normalizes the operands
-<li><tt>equalsTopo(Geometry)</tt> computes topological equality,
-and is a synonym for the original <tt>equals(Geometry)</tt>
-</ul>
-<li>Added <tt>Geometry.norm()</tt> to provide non-mutating normalization
-<li>Added <tt>Geometry.hashCode()</tt> to fulfill Java conventions
-<li>Added <tt>LineIntersector.getEndpoint()</tt> method
-<li>Added methods to <tt>CoordinateSequences</tt> to test for and create valid rings
-<li>Added <tt>minExtent</tt> and <tt>maxExtent</tt> to <tt>Envelope</tt>
-<li>Added ability to compute Single-Sided Buffers (invoked via <tt>BufferOp</tt> and <tt>BufferParameters</tt>)
-<li>Added <tt>GeometryPrecisionReducer</tt>
-<li>Added ExtendedWKB SRID support to <tt>WKBWriter</tt> (thanks to Justin Deoliviera)
-<li>Improved <tt>PolygonShape</tt> to support floating-point coordinates
-<li>Added <tt>GeometryShapeFactory.setRotation(double radians)</tt> method
-<li>Added <tt>GeometricShapeBuilder</tt> API to support shape builder development
-<li>Added <tt>RandomPointsBuilder</tt> to allow generating various random point sets
-<li>Added <tt>RandomPointsInGridBuilder</tt> to allow generating various random point sets constrained to a grid
-<li>Added <tt>KochSnowflakeBuilder</tt>
-<li>Added <tt>SierpinskiCarpetBuilder</tt>
-<li>Added <tt>MathUtil</tt> containing mathematics and numerical utility functions
-<li>Added <tt>Vector2D</tt> class providing vector operations
-<li>Added <tt>DirectedEdgeStar.getNextCWEdge()</tt> method to <tt>planargraph</tt> API
-<li><tt>AffineTransformation</tt> enhanced to avoid numeric precision issues in case of reflection in X=Y (coordinate flipping)
-<li>Added <tt>LineSequencer.sequence()</tt> static convenience method
-<li>Added error indicators to <tt>BufferDistanceValidator</tt> and <tt>BufferResultValidator</tt>
-<li>Added <tt>MinimumClearance</tt> class
-<li>Added <tt>nearestNeighbours</tt> methods to <tt>STRtree</tt>
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Improved memory performance of <tt>ShapeWriter</tt> conversions (by tuning coordinate and polygon conversion)
-<li>Improved performance of <tt>RectangleIntersects</tt> by refining <tt>SegmentIntersectionTester</tt>
-</ul>
-
-<h3>Robustness Improvements</h3>
-<ul>
-<li>Delaunay triangulation uses more robust formulation for the inCircle test
-<li>Voronoi computation now uses more robust formulation for the circumcentre computation
-<li>Force <code>RectangleIntersects</code> to always use segment-scanning to improve robustness
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Reduced visibility of internal classes in <tt>com.vividsolutions.jts.geom.prep</tt>
-<li>Reduced visibility of internal classes in <tt>com.vividsolutions.jts.simplify</tt>
-<li>Moved <tt>Matrix</tt> class into <tt>jts.math</tt> package
-<li>Refactored internal offset curve generation classes
-in <tt>com.vividsolutions.jts.operation.buffer</tt> package
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed <tt>CoordinateArraySequence</tt> and <tt>PackedCoordinateSequence</tt>
-to correctly handle Z ordinate in <tt>getCoordinate(int, Coordinate)</tt>
-<li>Fixed <tt>LinearRing</tt> to have <tt>isClosed()</tt> return <tt>true</tt> for empty rings
-<li>Fixed <tt>Geometry.union()</tt> to use more robust union algorithm.
- This provides behaviour consistent with <tt>union(Geometry)</tt>.
-<li>Fixed <tt>Point.isValid()</tt> to validate POINT EMPTY correctly
-<li>Fixed <tt>SnapIfNeededOverlayOp</tt> to throw the originating exception,which contains meaningful coordinates
-<li>Fixed <tt>GeometrySnapper</tt> to allow final vertices of LineStrings to snap correctly
-<li>Fixed buffer (<tt>OffsetCurveSetBuilder</tt>) to handle "flat" rings correctly
-<li>Fixed <tt>IsValidOp</tt> to handle reporting "Not Closed" errors on empty rings correctly
-<li>Fixed <tt>NestedRingTester</tt> (used by <tt>IsValidOp</tt>)
-to correctly handle the case where a hole touches all the vertices of another hole (which is invalid)
-<li>Fixed <tt>ConvexHull</tt> to handle large geometries with fewer than 3 unique points
-<li>Fixed <tt>GeometryGraph</tt> to ignore empty hole rings when building graph
-<li>Fixed <tt>LineMerger</tt> to skip lines with only a single unique coordinate
-<li>Fixed <tt>ByteArrayInStream</tt> to pad byte buffers with zeroes
-<li>Corrected spelling of <tt>SquarePointShapeFactory</tt>
-<li>Fixed tolerance check in <tt>KdTree</tt>
-<li>Updated <tt>MasterTester</tt> to include more unit tests
-</ul>
-
-<!------- TestBuilder -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <tt>[Zoom To Result]</tt> button
-<li>Improved mark display, with floating point label
-<li>Added more random geometry creation functions
-<li>Added fractal geometry creation functions
-<li>Improved threaded rendering handling to ensure only one frame drawn
-<li>Added Magnify Topology capability
-<li>Added Geometry Inspector dialog
-<li>Better startup script, with auto-home directory detection
-and JTS_LIB_DIR environment variable (thanks to strk)
-<li>Added logging Info window behaviour
-<li>Improved saving PNG to allow specifying file name
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed Stats panel to update when current test changes
-<li>Fixed deleting single test case
-</ul>
-
-<!-- ================================================================ -->
-<hr size='4' color='darkblue'>
-<h2>Version 1.11</h2>
-
-<i>Release Date: March 1, 2010</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <tt>CoordinateArrays.isRing</tt>
-<li>Added <tt>CGAlgorithms.signedArea(CoordinateSequence)</tt>
-<li>Added <tt>CoordinateArrays.copyDeep(...)</tt> method to copy sections of arrays
-<li>Added <tt>CoordinateList.add(Coordinate[], boolean, int, int)</tt> method to add sections of arrays
-<li>Added <tt>LineSegment.toGeometry()</tt>, <tt>LineSegment.lineIntersection()()</tt>
-<li>Added <tt>LineSegment.hashCode()</tt>
-<li>Added geometric similarity classes (<tt>HausdorffSimilarityMeasure</tt>, <tt>AreaSimilarityMeasure</tt>)
-<li>Added <tt>MinimumDiameter.getMinimumRectangle()</tt>
-<li>Added <tt>MinimumBoundingCircle</tt> class
-<li>Added <tt>Densifier</tt> class
-<li>Added triangulation API, including <tt>QuadEdgeSubdivision</tt>, <tt>IncrementalDelaunayTriangulator</tt>,
- <tt>ConformingDelaunayTriangulator</tt> and supporting classes
-<li>Added <tt>VoronoiDiagramBuilder</tt> to perform Voronoi diagram generation
-<li>Added <tt>scaleInstance(scaleX, scaleY, x, y)</tt> to <tt>AffineTransformation</tt>
-<li>Added <tt>AffineTransformationFactory</tt> to allow generating transformations from various kinds of control inputs
-<li>Added <tt>BinTree.remove()</tt> method
-<li>Fixed <tt>BinTree.query()</tt> to allow null interval arguments
-<li>Added <tt>ShapeReader</tt> API to convert Java2D Shapes into JTS Geometry
-<li>Added <tt>ShapeWriter</tt> API to convert JTS geometry into Java2D Shapes
-<li>Added <tt>FontGlyphReader</tt> API to render Java2D text font glyphs into geometry
-<li>Added <tt>SdeReader</tt> to <b>jtsio</b> library
-<li>Added <tt>Debug</tt> break methods
-<li>Added <tt>Memory</tt> utility for reporting memory statistics
-<li>Added <tt>ObjectCounter</tt> utility for counting objects
-<li>Added <tt>createSquircle</tt> and <tt>createSuperCircle</tt> to <tt>GeometricShapeFactory</tt>
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Improved performance of <tt>Geometry.getArea()</tt> and <tt>Geometry.getLength()</tt> when used with custom <tt>CoordinateSequence</tt>s
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Deprecated <tt>WKBWriter.bytesToHex</tt> in favour of <tt>WKBWriter.toHex</tt> to regularize and simplify method name
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed Point.isValid() to check for invalid coordinates (ie with Nan ordinates)
-<li>Fixed <tt>Geometry.distance()</tt> and <tt>DistanceOp</tt> to return 0.0 for empty inputs
-<li>Fixed <tt>Buffer</tt> to handle degenerate polygons with too few distinct points correctly
-<li>Added illegal state check in <tt>LineSegment.pointAlongOffset()</tt>
-<li>Fixed exception strategy in <tt>BufferSubgraph</tt> to handle certain robustness failures correctly
-<li>Fixed robustness problem in <tt>OffsetCurveBuilder</tt> in computing mitred joins for nearly parallel segments
-<li>Fixed minor bug in <tt>BufferInputLineSimplifier</tt> which prevented simplification of some situations
-<li>Fixed bug in <tt>BufferInputLineSimplifier</tt> which caused over-simplification for large tolerances
-<li>Fixed bug in <tt>Angle.normalizePositive</tt> to handle values > 2PI correctly
-<li>Fixed <tt>WKTWriter</tt> to emit correct syntax for MULTIPOINTs
-<li>Fixed <tt>WKTReader</tt> to accept correct syntax for MULTIPOINTs
-<li><tt>CGAlgorithms.isCCW</tt> now checks for too few points in the ring and throws an <tt>IllegalArgumentException</tt>
-<li>Fixed bug in <tt>AffineTransformation#eqals</tt> (logic bug)
-<li>Fixed bug in <tt>CoordinateList#closeRing</tt> (cloning closing Coordinate)
-</ul>
-
-<!------- TestBuilder -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>WKT input is cleaned automatically when loaded (illegal chars are removed)
-<li>Added WKT-Formatted option to Test Case View dialog
-<li>Many new geometry functions added
-<li>Geometry functions are displayed in tree
-<li>Geometry functions can be implemented as Java static class methods.
-<li>Geometry function classes can be loaded dynamically from command-line
-<li>Improved handling of very large geometry inputs and results
-<li>Threaded rendering allows display of very large geometries without limiting usability
-<li>Added Draw Rectangle tool
-<li>Added Drag-n-drop loading of .SHP files
-<li>Added Info tool to provide persistent display of geometry point/segment information
-<li>Added display of memory usage
-</ul>
-
-
-<!-- ================================================================ -->
-<hr size='4' color='darkblue'>
-<h2>Version 1.10</h2>
-
-<i>Release Date: December 31, 2008</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <tt>Geometry.reverse()</tt> method for all geometry types
-<li>Added <tt>setSrsName</tt>, <tt>setNamespace</tt>, <tt>setCustomRootElements</tt> methods to <tt>GMLWriter</tt>
-<li>Added <tt>Envelope.getArea</tt> method
-<li>Added <tt>copy</tt>, <tt>copyCoord</tt> methods to <tt>CoordinateSequences</tt>
-<li>Added <tt>area</tt> method to <tt>Envelope</tt>
-<li>Added <tt>extractPoint(pt, offset)</tt> methods to <tt>LengthIndexedLine</tt> and <tt>LocationIndexedLine</tt>
-<li>Added <tt>CoordinatePrecisionReducerFilter</tt>
-<li>Added <tt>UnaryUnionOp(Collection, GeometryFactory)</tt> constructor to handle empty inputs more automatically
-<li>Added <tt>DiscreteHausdorffDistance</tt> class
-<li>Made <tt>LineMerger</tt> able to be called incrementally
-<li>Added <tt>GeometricShapeFactory.createArcPolygon</tt> to create a polygonal arc
-<li>Enhanced <tt>Geometry.buffer()</tt> to preserve SRID
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Improved performance for <code>EdgeList</code> (by using a more efficient technique for detecting duplicate edges)
-<li>Improved performance for <code>ByteArrayInStream</code> (by avoiding use of <tt>java.io.ByteArrayInputStream</tt>)
-<li>Unrolled intersection computation in <tt>HCoordinate</tt> to avoid object allocation
-<li>Improved performance for buffering via better offset curve generation and simplification.
-<li>Improved performance for <tt>IsValidOp</tt> by switching to use <tt>STRtree</tt> for nested hole checking
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed <tt>Geometry.getClassSortIndex()</tt> to lazily initialize the sorted class list. This fixes a threading bug.
-<li>Fixed <tt>RectangleContains</tt> to return correct result for points on the boundary of the rectangle
-<li>Fixed error in <tt>com.vividsolutions.jts.simplify.LineSegmentIndex</tt> which caused polygons
-simplified using <tt>TopologyPreservingSimplifier</tt> to be invalid in certain situations
-<li>Fixed error in <tt>DouglasPeuckerSimplifier</tt> which caused empty polygons to be returned when they contained a very small hole
-<li>Fixed <tt>PackedCoordinateSequence</tt> to return <tt>NaN</tt> for null ordinate values
-<li>Fixed <tt>Geometry.centroid()</tt> (<tt>CentroidArea</tt>) so that it handles degenerate (zero-area) polygons
-<li>Fixed <tt>Geometry.buffer()</tt> (<tt>OffsetCurveBuilder</tt>) so that it handles JOIN_MITRE cases with nearly collinear lines correctly
-<li>Fixed <tt>GeometryFactory.toGeometry(Envelope)</tt> to return a CW polygon
-<li>Fixed <tt>UnaryUnionOp</tt> to correctly handle heterogeneous inputs with P/L/A components
-<li>Fixed <tt>UnaryUnionOp</tt> to accept <tt>LINEARRING</tt>s
-<li>Fixed <tt>CentroidArea</tt> to handle zero-area polygons correctly
-<li>Fixed <tt>WKBWriter</tt> to always output 3D when requested, and to handle 2D <tt>PackedCoordinateSequences</tt> correctly in this case
-<li>Fixed <tt>NodedSegmentString</tt> to handle zero-length line segments correctly (via <tt>safeOctant</tt>)
-<li>Cleaned up code to remove unneeded <tt>CGAlgorithms</tt> objects
-<li>Fixed <tt>GeometricShapeFactory.createArc</tt> to ensure arc has requested number of vertices
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Moved GML I/O classes into core JTS codebase
-<li>Changed <tt>GMLWriter</tt> to not write the <tt>srsName</tt> attribute by default
-<li>In <tt>DistanceOp</tt> switched to using <tt>nearestPoints</tt> method names
-<li>Exposed <tt>STRtree.getRoot()</tt> method
-</ul>
-
-
-<!------- TestBuilder -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
-
-<h3>UI Improvements</h3>
-<ul>
-<li>Added ability to read GML from input panel
-<li>Added GML output to View dialog
-<li>Added file drag'n'drop to Geometry Input text areas
-<li>Add display of computation time
-<li>Added Stats panel
-<li>Added Scalar functions panel, with extensible function list
-<li>Added <b>Save as PNG...</b>
-<li>Added stream digitizing to Polygon and Line Draw tools
-</ul>
-
-<!------- TestRunner -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestRunner</h3>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <tt>-testCaseIndex</tt> command-line option
-</ul>
-
-<!-- ================================================================ -->
-<hr size='4' color='darkblue'>
-<h2>Version 1.9</h2>
-
-<i>Release Date: January 2, 2008</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <tt>Polygonal</tt>, <tt>Lineal</tt>, <tt>Puntal</tt> tag interfaces to better categorize geometry classes
-<li>Added <tt>Geometry.union()</tt> method, <tt>UnaryUnionOp</tt> class for efficient unioning of geometrys
-<li>Added <tt>Triangle.area3D</tt> method
-<li>Added <tt>LineSegment.pointAlongOffset</tt> method
-<li>Added <tt>LineSegment.orientationIndex(Coordinate)</tt> method
-<li>Added <tt>PreparedGeometry</tt> classes and methods to optimize some geometry functions in batch situations
-<li>Added <tt>Envelope.covers</tt> methods, for preciseness
-<li>Added <tt>OctagonalEnvelope</tt> class
-<li>Improved <tt>CGAlgorithms.isPointInRing</tt> method to handle case where point lies on the ring
-<li>Added <tt>CGAlgorithms.locatePointInRing</tt> method
-<li>Added <tt>PointInAreaLocator</tt> interface, enhanced <tt>SimplePointInAreaLocator</tt> to extend this
-<li>Added <tt>RayCrossingCounter</tt>, <tt>IndexedPointInAreaLocator</tt> classes for more efficient Point-In-Polygon testing
-<li>Added <tt>GeometryCombiner</tt> class
-<li>Enhanced <tt>BufferOp</tt> with join styles
-<li>Enhanced <tt>WKTReader</tt> to accept any case for <tt>NaN</tt> number symbols
-<li>Added <tt>WKTFileReader</tt> class
-<li>Improved performance of <tt>CoordinateList</tt> constructors
-<li>Added <tt>CascadedPolygonUnion</tt> class
-<li>Added <tt>LinearLocation.isOnSameSegment</tt> method
-<li>Added <tt>LinearLocation.getSegment</tt> method
-<li>Added <tt>LocationIndexedLine.indexOfAfter</tt> method
-<li>Added interpolation of Z value to linear referencing methods
-<li>Added methods to rotate around a given point to <tt>AffineTransformation</tt>
-<li>Allowed <tt>GeometricShapeFactory</tt> to be subclassed to add new shapes
-<li>Added <tt>SineStarFactory</tt> (primarily to support testing)
-<li>Added <tt>SortedPackedIntervalRTree</tt> class
-<li>Added <tt>SegmentSetMutualIntersector</tt> interface and implementations
-<li>Added <tt>Node.remove(DirectedEdge)</tt> method in <tt>planargraph</tt> package
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Improved performance for <code>SimplePointInAreaLocator</code> (by checking ring envelopes as a filter)
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li><tt>Geometry.buffer</tt> operation fixed to always return polygonal geometries
-<li>Fixed bug in <code>Geometry.buffer(distance, quadrantSegs)</code>
-causing failure for some cases with <tt>quadrantSegs = 1</tt>
-<li>Fixed bug in <tt>GeometryFactory.toGeometry(Envelope)</tt>
-which was returning invalid Polygons for "linear" envelopes
-<li>Fixed bug in <tt>MonotoneChainBuilder</tt> which caused failures in situations with segments of zero length
-<li>Fixed <tt>PointLocator</tt> to handle locating in Point geometries
-<li>Fixed <tt>GeometricShapeFactory</tt> to always use provided PrecisionModel
-<li>Fixed <tt>LinearLocation.clone</tt> method
-<li>Fixed <tt>LinearLocation.isValid</tt> method
-<li>Fixed <tt>Polygonizer</tt> to accept single-point linestrings (which are ignored)
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Deprecated <code>RobustCGAlgorithms</code>
-<li>Deprecated <code>BufferOp</code> cap style constants (these are now provided in </tt>BufferParameters</tt>)
-<li>Removed <code>SIRPointInRing</code>
-</ul>
-
-<!------- TestRunner -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestRunner</h3>
-
-<h3>New Features</h3>
-<ul>
-<li>Added ability to specify GeometryOperation in XML file
-<li>Added <tt>BufferValidatedGeometryOperation</tt>
-<li>Added ability to specify custom result matching via <tt>resultMatcher</tt> parameter
-in XML files
-<li>Added <tt>BufferResultMatcher</tt>
-</ul>
-
-
-<!------- TestBuilder -------------------->
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
-
-<h3>UI Improvements</h3>
-<ul>
-<li>Improved rendering of geometries
-<li>Improved symbology for orientation
-<li>Simplified Geometry creation
-<li>Improved vertex move/add
-<li>Added tooltip for coordinate location
-<li>Added more geometry functions
-<li>Added Copy Result to Test button
-</ul>
-
-<h3>Code Improvements</h3>
-<ul>
-<li>Restructured code for more flexibility, better Swing functionality
-<li>Made it easier to add geometry functions
-</ul>
-
-
-<!-- ================================================================ -->
-<hr size='4' color='darkblue'>
-<h2>Version 1.8</h2>
-
-<i>Release Date: December 19, 2006</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Improved robustness for overlay operations, via using geometry snapping
-<li>Added <code>Angle</code> class
-<li>Added methods to <code>Triangle</code> class
-<li>Added <code>LineSegment.midPoint</code> method
-<li>Added ability to specify output of Z values to <code>WKTWriter</code>
-<li>Added <code>setFormatted</code>, <code>setTab</code>, <code>setMaxCoordinatesPerLine</code> methods to <code>WKTWriter</code>
-<li>Added <code>BoundaryNodeRule</code> classes, and ability to specify a Boundary Node Rule
-in <code>RelateOp</code>, <code>IsSimpleOp</code>, <code>BoundaryOp</code>
-<li>Added ability to get the failure location to <code>IsSimpleOp</code>
-<li>Added <code>BoundaryOp</code> with improved algorithm for lineal geometries. Changed lineal Geometry classes to use it.
-<li>Enhanced <code>Geometry</code> overlay methods to accept empty <code>GeometryCollections.</code>
-<li>Enhanced Error Handling for <tt>WKTReader</tt>
-<li>Added <code>CoordinateSequenceFilter</code>
-<li>Added <code>AffineTransformation</code> and <code>AffineTransformationBuilder</code>
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Changed API for <code>IsSimpleOp</code> (required to support returning failure location)
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed bug in <code>GeometryFactory.buildGeometry</code>
-causing failure if input contained all GeometryCollections of the same subclass
-<li>Changed AssertFailure to TopologyException in <code>PolygonBuilder</code>
-<li>Improved correctness of <tt>RobustLineIntersector</tt> in certain cases where segment endpoints intersect
-<li>Eliminated duplicate method execution in <code>TestRunner</code>
-</ul>
-
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
-
-<h3>New Features</h3>
-<ul>
-<li>Zoom tool can now draw zoom box as well as click
-<li>Cut, Copy and Paste buttons for Input WKT
-<li>added ability to specify custom Geometry Operations
-</ul>
-
-<hr size='0' color='darkblue'>
-<h3 style='font-family:sans-serif; color:darkblue'>JTS TestRunner</h3>
-
-<h3>New Features</h3>
-<ul>
-<li>added ability to specify custom Geometry Operations
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Eliminated duplicate method execution
-</ul>
-
-
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.7.2</h2>
-
-<i>Release Date: June 22, 2006</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added support for EWKB (SRIDs only) to <code>WKBReader</code>
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed bug in <code>CoordinateArrays.ptNotInList</code>.
-Changed <code>polygonize.EdgeRing</code> to used corrected code.
-<li>Fixed bug causing duplicate points in <code>ScaledNoder</code>
-<li>Fixed bug causing Null Pointer for empty geometries in <code>OraWriter</code>
-<li>Changed AssertFailure to TopologyException in <code>EdgeNode</code>
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.7.1</h2>
-
-<i>Release Date: March 20, 2006</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added Hex string conversion to <code>WKBReader</code> and <code>WKBWriter</code>
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed null point cloning bug in <code>TopologyValidationError</code> (<i>thanks to Markus Gebhard</i>)
-<li>Fixed bug in <code>PointLocator</code> fix for LinearRings
-<li>Fixed bug in <code>Geometry.isValid</code> and <code>IsValidOp</code> causing some valid polygons
-to be reported as having a Disconnected Interior (specifically, polygons containing
-holes touching at a single point, where the point is the highest point in the hole rings, and where the holes
-have a specific orientation)
-<li>Fixed bug in <code>Polygon.isRectangle</code>, which reported some valid rectangles as false
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Improved performance for <code>Geometry#withinDistance</code> (via short-circuiting)
-</ul>
-
-<h3>Contributors</h3>
-<ul>
-<li>Dave Blasby
-<li>Koen van Dijken
-</ul>
-
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.7</h2>
-
-<i>Release Date: December 7, 2005</i>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added <code>JTSVersion</code> class to provide access to the API version information
-<li>Added <code>covers</code> and <code>coveredBy</code> predicates to <code>Geometry</code>
-<li>Added <code>Geometry#buffer(distance, quadSegs, endCapStyle)</code> method to expose buffer end cap styles
-<li>Added <code>LineString#reverse</code> and <code>MultiLineString#reverse</code> methods
-<li>Added <code>centre</code>, <code>intersection</code>, <code>translate</code>,
-<code>expandBy(distance)</code>, <code>expandBy(dx, dy)</code>
-methods to <code>Envelope</code>
-<li>Added <code>CollectionUtil</code> class for performing operations over collections
-<li>Added <code>CoordinateArrays</code> comparators
-<li>Added <code>CoordinateSequence#getDimension</code>
-<li>Added convenience methods <code>toPoint</code> and <code>toLineString</code> to <code>WKTWriter</code>
-<li>Added WKB API (<code>WKBReader</code> and <code>WKBWriter</code> classes in <code>com.vividsolutions.jts.io</code>
-<li><code>WKTReader</code> has better handling of numeric parsing, including support for scientific notation
-<li>Added <code>IsValidOp#setSelfTouchingRingFormingHoleValid</code> to allow validating SDE-style polygons
-<li>Added check for non-closed rings in <code>IsValidOp</code>
-<li>Added Linear Referencing API (<code>com.vividsolutions.jts.linearref</code>
-<li>Added <code>LineSequencer</code> class to <code>com.vividsolutions.jts.operation.linemerge</code>
-<li>Added <code>Subgraph</code> class to <code>com.vividsolutions.jts.planargraph</code>
-<li>Added <code>isRemoved</code> method to <code>GraphComponent</code>
-<li>Added <code>ConnectedSubgraphFinder</code> class to <code>com.vividsolutions.jts.planargraph.algorithm</code>
-<li>Added <code>setVisited</code>, <code>getComponentWithVisitedState</code>,
-<code>setVisited</code>, <code>getComponentWithVisitedState</code>
-methods to <code>com.vividsolutions.jts.planargraph.GraphComponent</code>
-<li>Added classes to perform Snap Rounding (in <code>com.vividsolutions.jts.noding.snapround</code>>
-<li>Improved buffering speed and robustness by using Snap Rounding
-<li>Added buffer optimization for results with large numbers of polygons and/or holes
-<li>Added <code>STRtree#query(Envelope, ItemVisitor)</code> method
-<li>Added <code>Debug#toLine</code> methods
-<li>Added <code>ConvexHull(Coordinate[])</code> constructor
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed decimal formatting in <code>WKTWriter</code> to force a leading 0 in decimal numbers
-<li>Fixed bug in <code>CoordinateArraySequence#setOrdinate</code>
-<li>Fixed bug when checking validity of polygon with hole (<code>IsValidOp#checkHolesInShell</code>)
-<li>Improved correctness of computated intersections in <code>RobustLineIntersector</code>
-<li>Fixed bugs in <code>CoordinateList.clone</code> (thanks to Matthias Bobzien)
-<li>Fixed bug in <code>Envelope.equals</code> (thanks to John Cartwright)
-<li>Fixed <code>PointLocator</code> for LinearRings
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Improved performance for overlay operations (point inclusion, identical edge detection)
-<li>Improved Convex Hull performance
-</ul>
-
-<h3>API Changes</h3>
-<ul>
-<li>Added <code>SpatiaIndex#query(Envelope, ItemVisitor)</code> method signature
-<li>Added <code>CoordinateSequence#getDimension()</code> method signature
-<li>Marked <code>GeometryEditor.CoordinateOperation#edit(Geometry, GeometryFactory)</code> method
-as <code>final</code>, to prevent incorrect use
-</ul>
-
-<h3>Semantics Changes</h3>
-<ul>
-<li>CoordinateArraySequence#setOrdinate now checks that the ordinate index is in range
-</ul>
-
-
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.6</h2>
-
-Release Date: February 3, 2005
-
-<h3>API Changes</h3>
-<ul>
-<li>Changed to using <code>CoordinateArraySequence</code> instead of <code>DefaultCoordinateSequence</code>
-(to provide a more descriptive name).
-</ul>
-
-<h3>Semantics Changes</h3>
-<ul>
-<li>PrecisionModel#makePrecise changed to use Symmetric Arithmetic Rounding rather than Banker's Rounding
-</ul>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added ability to enable <code>Debug</code> methods by setting a system property
-<li>Added <code>getNumGeometries</code> and <code>getGeometryN</code> methods to Geometry class, to make API more uniform
-<li>Improved API for <code>CoordinateSequence</code> allows more options for improving memory usage and handling custom coordinate storage methods
-<li>Added <code>PackedCoordinateSequence</code> to provide reduced memory footprint for geometry objects if desired
-<li>Added optimized spatial predicates for rectangles
-<li>Added Debug#isDebugging method
-</ul>
-
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed bug in <code>Geometry#within()</code> short circuiting
-<li>Fixed bug causing <code>Geometry#isValid</code> to throw IllegalArgumentException for certain kinds of holes with invalid rings
-<li>Fixed bug causing redundant linestrings to be returned in the result of overlaying polygons containing holes touching their shell.
-<li><code>Polygon#getBoundary</code> now returns a <code>LinearRing</code> if the polygon does not have holes
-</ul>
-
-<h3>Architecture Changes</h3>
-<ul>
-<li>Removed a proliferation of references to the default <code>CoordinateSequenceFactory</code>
-</ul>
-
-<h3>Contributors</h3>
-<ul>
-<li>Andrea Aime
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.5</h2>
-Release Date: September 22, 2004
-<p>
-This version is upwards compatible with Version 1.4
-
-<h3>API Changes</h3>
-<ul>
-<li>None
-</ul>
-
-<h3>Semantics Changes</h3>
-<ul>
-<li>None
-</ul>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li><code>CGAlgorithms#isCCW</code> now handles coordinate lists with repeated points. Also throws an IllegalArgumentException if the input ring does not have 3 distinct points
-<li><code>isValid</code> now checks for invalid coordinates (e.g. ones with Nan or infinite numbers)
-<li>added copyDeep() method to <code>CoordinateArrays</code>
-<li>added geometry simplification operations <code>DouglasPeuckerSimplifier</code> and <code>TopologyPreservingSimplifier</code>
-<li>added methods to <code>Quadtree</code> and <code>STRtree</code> to remove items and query using the Visitor pattern
-</ul>
-
-<h3>Performance Improvements</h3>
-<ul>
-<li>Added short-circuit tests in geometry named predicates based on envelope tests
-</ul>
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed bugs in <code>Geometry</code> serialization
-<li>Fixed bug in <code>ValidOp</code> which reported some MultiPolygons with shells nested inside a hole as invalid
-<li>Fixed bug in buffer which caused buffers of some polygons with small & large holes to not contain any holes
-<li>Fixed bug in <code>Polygonizer</code> which caused exception if no lines were supplied
-</ul>
-<h3>Architecture Changes</h3>
-<ul>
-<li>Basic CG algorithm methods made static in the <code>CGAlgorithms</code> class
-<li>Various utility methods made public in <code>CoordinateArrays</code> class
-</ul>
-<h3>Documentation</h3>
-<ul>
-<li>More examples provided in <code>com.vividsolutions.jtsexamples package</code>
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.4</h2>
-
-Release Date: November 4, 2003
-<h3>Semantics Changes</h3>
-<ul>
-<li>none
-</ul>
-<h3>Functionality Improvements</h3>
-<ul>
-<li>Added "LINEARRING" tag to WKT syntax
-<li>Added GeometryEditor class to allow easy copy/modify of Geometrys
-<li>Added GeometricShapeFactory class to easily create standard geometric shapes
-<li>Geometries can now carry arbitrary user-defined data objects (via Geometry#get/setUserData(Object) method)
-<li>Added CoordinateSequence and CoordinateSequenceFactory interfaces, and default implementations (BasicCoordinateSequence, BasicCoordinateSequenceFactory)
-<li>Added Geometry#getFactory
-<li>Added new PrecisionModel type of FLOATING_SINGLE, for rounding to single precision floating point
-<li>Added DistanceOp#getClosestPoints method, which returns the closest points between two Geometries
-<li>Added com.vividsolutions.jts.noding package containing classes to perform fast indexed noding of linestrings
-<li>Added com.vividsolutions.jts.operation.polygonize package containing classes to perform polygonization
-<li>Added com.vividsolutions.jts.operation.linemerge package containing classes to perform line merging
-<li>Added SimpleGeometryPrecisionReducer to allow reducing precision of coordinates of a Geometry
-<li>Added LineSegment#closestPoints method to compute the closest points between two line segments
-<li>Added MinimumDiameter class to compute minimum diameters of Geometries
-<li>Added geom.Triangle class to contain algorithms for Triangles
-<li>BufferOp now allows end cap styles to be specified. Three types are supported: round, butt and square.
-</ul>
-<h3>Performance Improvements</h3>
-<ul>
-<li>EdgeList now provides a findEqualEdge method which is substantially faster than findEdgeIndex, for large lists
-<li>Buffering is now faster and much more robust
-<li>Overlap operations are now more robust
-</ul>
-<h3>Bug Fixes</h3>
-<ul>
-<li>Envelope#init(Envelope) now handles null Envelopes correctly
-<li>CoordinateList#add() now correctly ignores the z-value of Coordinates in determining equality
-<li>Geometry#isValid now correctly handles checking validity of LinearRings
-<li>Fixed infinite loop bug causing Out Of Memory errors during polygon intersection
-<li>Geometry#clone now correctly clones the Geometry's Envelope
-<li>LineIntersector#computeEdgeDistance now correctly computes a non-zero edge distance in certain situations when a fixed precision model was being used and the line segment was a single unit in length
-<li>Fixed incorrect calculation of depths in DirectedEdgeStar#computeDepths
-<li>Fixed BufferSubgraph#addReachable to use explicit stack to avoid stack overflow problems
-<li>Fixed various bugs causing some kinds of buffers to be computed incorrectly
-</ul>
-<h3>API Changes</h3>
-<ul>
-<li>WKTReader/Writer: changed protected members to private
-<li>PrecisionModel type is now an object rather than an int
-<li>ConvexHull API changed to remove requirement to pass in CGAlgorithms object
-</ul>
-<h3>Code Architecture Changes</h3>
-<ul>
-<li>geom.util package added for utility classes which parse and modify geometries
-</ul>
-<h3>Documentation</h3>
-<ul>
-<li>More examples provided in com.vividsolutions.jtsexamples package
-<li>Added JTS Developers Guide
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.3</h2>
-Release Date: April 4, 2003
-<h3>Semantics Changes</h3>
-<ul>
-<li>all Geometry methods are now reentrant (thread-safe)
-<li>Fixed-precision coordinates are now stored in a rounded but non-scaled form. This makes them compatible with non-precise (Floating) coordinates, and simplifies working with precise coordinates directly. Mixed precision models are now supported in Geometry methods; method results are in the more precise of the input precision models.
-<li>Offsets are no longer supported in the Fixed precision model. This is necessary to allow storing fixed precision coordinates in a non-scaled form. This does not reduce the total precision available, since coordinates are stored in a floating-point format.
-<li>SRID and Precision Model are no longer checked for equality during Geometry operations. This removes a limitation which provided little semantic benefit.
-</ul>
-
-<h3>Functionality Improvements</h3>
-<ul>
-<li>added Geometry.isWithinDistance(Geometry g, double distance) method, to provide optimized proximity queries
-<li>added Geometry.buffer(double distance, int quadrantSegments) method, allowing control over accuracy of buffer approximation
-<li>added Geometry.getCentroid() method
-<li>added Geometry.getInteriorPoint() method, which uses heuristic methods to return a point in the interior of a Geometry
-<li>GeometryFactory.toGeometryArray now returns null if the argument is null
-</ul>
-<h3>Performance Improvements</h3>
-<ul>
-<li>Removed unnecessary string construction in EdgeEndStar.propagateSideLabels()
-<li>Eliminated unnecessary computation of self-intersections in rings during relate and spatial functions. This provides a large increase in speed when working with large rings and polygons. (Note that IsValid still checks for these self-intersections, which are illegal in LinearRings)
-<li>Add short-circuit code to RobustLineIntersector to detect non-intersections more efficiently
-</ul>
-<h3>Bug Fixes</h3>
-<ul>
-<li>Fixed ClassCastException occurring in GeometryCollection.getLength()
-<li>Fixed bug in Edge Intersection insertion (replaced Coordinate#equals with equals2D to ensure that intersection creation is not sensitive to Z-value).
-<li>Fixed handling LineStrings with too few points in GeometryGraph.addLineString
-<li>Fixed: was not checking that MultiPolygons don't contain components with too few points.
-<li>Fixed Envelope.distance() to return correct distance for all envelopes.
-<li>Fixed a few Geometry methods to make them re-entrant.
-<li>Fixed CoordinateList.closeRing() to ensure endpoints are not duplicated
-<li>Fixed CGAlgorithms.signedArea() to use a simpler algorithm which is more robust and faster.
-<li>Fixed bug preventing validating Rings containing an initial repeated point.
-</ul>
-<h3>API Changes</h3>
-<ul>
-<li>Added default constructor to WKTReader. It uses the default GeometryFactory
-<li>Add two static intersects() methods to Envelope, to allow computing intersections with envelopes defined by points only.
-<li>Dropped BinaryPower; its functionality is provided by DoubleBits in a more robust fashion.
-<li>Removed a couple of redundant private static methods from Geometry; they have been replaced by methods in CoordinateArrays
-<li>The Geometry class is now marked as Serializable
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.2</h2>
-
-Release Date: 7 October 2002
-<h3>Semantics Changes</h3>
-<ul>
-<li>JTS now allows Geometrys to have repeated points. All operations will continue to perform as before. This removes a significant incompatibility with the OGC spatial data model.
-<li>TopologyExceptions may now be thrown by spatial overlay methods. This helps to distinguish between code bugs and known robustness problems. It also provides a machine-readable coordinate for the error location.
-</ul>
-<h3>Functionality Improvements</h3>
-<ul>
-<li>RobustLineIntersector now uses "normalized" coordinates to maximize the accuracy of intersection computation.
-<li>Upgraded Quadtree with more robust implementation
-<li>Replaced IntervalTree with a more robust implementation of BinTree
-<li>Added STRTree 2-D spatial index, which exhibits better performance than QuadTrees in many situations.
-<li>Added EnhancePrecisionOp, which uses precisioning enhancing techniques to reduce the number of failure cases due to robustness problems.
-</ul>
-<h3>Bug Fixes</h3>
-<ul>
-<li>fixed ConvexHull to use TreeSet instead of HashSet for coordinates
-<li>Fixed isValid for GeometryCollections containing Polygons, which were sometimes erroneously returning a validity failure for correct Geometrys.
-<li>Fixed bug in LineSegment.distancePointLine() which would return the incorrect distance for a LineSegment with two identical points
-<li>Improved error handling in CGAlgorithms.isCCW()
-<li>IsValid now checks for too few points in a geometry component (e.g. due to repeated points in a ring)
-</ul>
-<h3>API Changes</h3>
-<ul>
-<li>added Stopwatch class
-<li>added Geometry.getArea() and Geometry.getLength() methods
-<li>added CGAlgorithms.signedArea() method
-<li>added methods to LineSegment - closestPoint(), getLength()
-<li>added CoordinateArrrays and CoordinateLists utility classes
-<li>Added TopologyValidationError.getErrorType() method
-<li>Added Envelope#intersects; deprecated Envelope#overlaps.
-<li>Added Geometry#geometryChanged() method to allow signaling when Geometry coordinates have been mutated by a client class
-<li>Added STRTree class implementing a Sort-Tile-Recursive spatial index (a variant of a packed R-tree)
-<li>Deleted IntervalTree 1-D spatial index (replaced by BinTree)
-<li>Add BinTree 1-D spatial index
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.1.1</h2>
-
-Release Date: 9 April 2002
-<h3>Bug Fixes</h3>
-<ul>
-<li>fixed decimal-point symbol localization bug in WKTWriter
-<li>fixed bug in Envelope.int(Envelope env)
-<li>fixed filename case of SFSMultiLineString.java and IntervalTree.java
-</ul>
-<h3>API Changes</h3>
-<ul>
-<li>deleted TopologyException class
-<li>renamed CGAlgorithms.isPointInPolygon to isPointInRing (a more accurate description of what the method computes)
-</ul>
-<h3>API Additions</h3>
-<ul>
-<li>added Geometry.getCoordinate() method
-<li>added Geometry.distance() method
-<li>added GeometryComponentFilter interface and Geometry.apply(GeometryComponentFilter) method
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.1</h2>
-
-Release Date: 28 March 2002
-<h3>New Features</h3>
-<ul>
-<li>added Geometry.isSimple() and Geometry.isValid() methods
-<li>improved design of topological data structures
-<li>added Geometry.setSRID() method
-<li>improved functionality of the Envelope class
-<li>added ability to write to an arbitrary java.io.Writer object to WKTWriter
-<li>added Validate and Mark Location functionality to TestBuilder
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 1.0</h2>
-Release Date: 1 February 2002
-<ul>
-<li>Removed some non-compatibilities with Java 1.1
-<li>Fixed bug in constructing buffer outline around inside of angles
-<li>In TestBuilder vertices are now displayed with fixed size in view units
-<li>Improved code for WKTWriter.writeFormatted()
-<li>Fixed bug in constructor for LinearRing
-<li>Improved implementation of sweepline intersection algorithm to avoid use of dynamic set.
-<li>Fixed bug in ConvexHull.cleanRing()
-<li>Refactored RobustLineIntersector and NonRobustLineIntersector
-</ul>
-
-<!----------------------------------------------------------------------->
-<hr size='4' color='darkblue'>
-<h2>Version 0.0</h2>
-Release Date: 30 May 2001
-
-<p>
-<i>Baseline version</i>
-
-</body>
-</html>
+<html>
+
+<head>
+<title>JTS Version History</title>
+</head>
+
+<body bgcolor='#DFF0FF'>
+<h1 style='text-align:center; color:darkblue;'>
+JTS TOPOLOGY SUITE
+<br>
+<i>Version History</i>
+</h1>
+
+This document lists the change history of release versions of the
+<span style='color:darkblue;'><b>JTS Topology Suite</b></span>.
+<ul>
+<li>Project site: <a href='http://locationtech.org/projects/technology.jts'><b>LocationTech JTS </b></a>
+<li>Code repo: <a href='https://github.com/locationtech/jts'><b>Github JTS</b></a>
+<li>Distribution: <a href='https://github.com/locationtech/jts/releases'><b>Github JTS Releases</b></a>
+</ul>
+<p>
+The JTS distributions for older versions can be obtained at the
+<a href='http://sourceforge.net/projects/jts-topo-suite/'><b>SourceForge JTS site</b></a>.
+</p>
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.15</h2>
+
+<i>Release Date: November 30, 2017</i>
+
+<h3>Project Changes</h3>
+<ul>
+<li>Changed licensing to dual-licensed EDL or EPL
+<li>Changed source hosting to GitHub
+<li>Changed distro hosting to GitHub
+<li>Changed build chain to use Maven
+<li>Changed code module structure
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Changed Java package root to <code>org.locationtech.jts</code>
+<li>Refactored <code>CGAlgorithms</code> into function-specific classes
+ <code>Orientation</code>, <code>PointLocation</code>, <code>Distance</code>, <code>Length</code>, <code>Area</code>
+<li>Deprecated <code>NonRobustCGAlgorithms</code>; use function-specific classes refactored from <code>CGAlgorithms</code>
+<li>Deprecated <code>RobustDeterminant</code>; use <code>CGAlgorithmsDD</code>
+<li>Deprecated <code>Geometry.clone</code>; use <code>Geometry.copy</code>
+<li>Deprecated <code>GeometryFactory.createX(null)</code> methods; Use no-argument <code>GeometryFactory.createX</code> methods
+<li>Deprecated overloaded <code>GeometryFactory.createMultiPoint</code>; use <code>GeometryFactory.createMultiPointFromCoords</code>
+</ul>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Improve <code>Quadtree</code> to handle queries with null envelopes
+<li>Add <code>STRtree</code> K-Nearest Neighbours query
+<li>Add <code>Serializable</code> to </code><code>PackedCoordinateSequence</code>
+<li>Add <code>Envelope.intersects</code>
+<li>Add <code>Geometry.intersects</code> for <code>GeometryCollection</code>
+<li>Improve <code>WKBReader</code> to handle the OGC 06-103r4 specification.
+<li>Improve <code>WKTReader</code> to handle <code>Z</code>, <code>M</code>, <code>ZM</code> modifiers.
+</ul>
+
+<h3>Performance & Robustness Improvements</h3>
+<ul>
+<li>Add optimization for <code>Geometry.contains</code> and <code>Geometry.covers</code>
+<li>Improve robustness of <code>RayCrossingCounter</code> and <code>Geometry.contains</code>
+<li>Improve robustness of <code>MultiPolygon</code> centroid computation
+<li>
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Eliminated <code>LineString.normalize</code> side-effects
+</ul>
+
+<!------- TestBuilder -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added function <code>Writer.writeGeoJSON</code>
+<li>Added tree view of scalar functions
+<li>Added ability to repeat functions
+<li>Added custom fill styling
+<li>Added <code>SelectionFunctions</code> for metrics (area, length)
+<li>Added function documentation driven by annotations
+<li>Some changes to layout of GUI elements (such as toolbar)
+</ul>
+
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.14</h2>
+
+<i>Release Date: September 23, 2015</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <code>Envelope.compareTo</code> method
+<li>Fixed <code>SegmentSetMutualIntersector</code> classes to be thread-safe</li>
+<li>Fixed <code>PreparedGeometry</code> classes to be thread-safe</li>
+<li>Added <code>LineDissolver</code> class
+<li>Added <code>edgegraph</code> package
+<li>Added <code>CoordinateSequences.isEqual</code> method
+<li>Extended <code>CoordinateSequences.copy</code> and <code>CoordinateSequences.copy</code> to handle inputs of different dimension
+<li>Added <code>CoordinateArrays.envelope()</code> function
+<li>Added <code>CoordinateArrays.intersection()</code> function
+<li>Added <code>Polygonizer.setCheckValidRings()</code> method for optimizing performance in some situations
+<li>Added <code>KMLWriter</code> to convert Geometry to KML representation
+<li>Added <code>Coordinate</code> <code>equals3D</code>, <code>equals2D(Coordinate, tolerance)</code>, and <code>equalInZ</code> methods.
+<li>Added <code>VWSimplifier</code> to perform Visvalingam-Whyatt simplification
+<li>Enhanced <code>WKBReader</code> to handle Spatialite WKB format
+<li>Added <code>DD.setValue()</code> methods
+<li>Added <code>getGeometry()</code> methods to <code>LinearComponentExtracter</code> and <code>LineStringExtracter</code>
+<li>Added <code>BufferParameters</code> </code>simplifyFactor</code> setting
+<li>Added node counting and ability to not keep intersection points to <code>InteriorIntersectionFinder</code>
+<li>Added <code>Polygonizer</code> functionality to extract only polygons forming a valid polygonal geometry
+<li>Added <code>KdTree.toCoordinates</code>
+<li>Added <code>MinimumBoundingCircle.getFarthestPoints</code> method
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Performance & memory improvement in <tt>PreparedPolygonIntersects</tt> by short-circuiting point input case
+<li>Allow for memory usage optimization in <code>CascadedPolygonUnion</code>, by avoiding retaining input collection
+<li>Fix <code>Point.isEmpty()</code> to avoid allocating a coordinate
+<li>Fix <code>Geometry.equalsExact()</code> to short-circuit when the inputs are identical objects
+<li>Add short-circuit to <code>PointExtracter</code> to improve performance for Points
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed <code>RobustLineIntersector</code> heuristic for handling invalid intersection points
+(computed as outside envelope of input segments due to numeric precision issues)
+<li>Fixed <code>CGAlgorithmsDD.intersection</code> to compute intersection correctly
+<li>Fixed <tt>Geometry.interiorPoint()</tt> to compute a true interior point in certain cases
+<li>Fixed <code>Geometry.equals</code> to handle null argument
+<li>Fixed <code>DistanceToPoint</code> to be thread-safe
+<li>Fixed <code>Geometry.interiorPoint()</code> and <code>InteriorPointArea</code> to handle zero-area geometries
+<li>Fixed <code>STRtree</code> classes to be thread-safe (by synchronizing the <code>AbstractSTRtree.build()</code> method)
+<li>Fixed <code>STRtree.remove()</code> method to avoid a NPE
+<li>Fixed <code>DouglasPeuckerSimplifier</code> and <code>TopologyPreservingSimplifier</code> to handle empty geometry components in the input
+<li>Fixed <code>ConvexHull</code> to handle input of array of identical coordinates
+<li>Fixed <code>GeometryTransformer.transformLinearRing()</code> to handle null inputs
+<li>Fixed the <code>extractPoint(distance, offset)</code> methods in
+ <code>LocationIndexedLine</code> and <code>LengthIndexedLine</code> to handle offsets from endpoints correctly.
+<li>Fixed <code>GeometryCollectionIterator</code> to correctly handle atomic geometries
+<li>Fixed <code>InteriorIntersectionFinder</code> to not short-circuit when finding all nodes
+<li>Fixed <code>SubgraphDepthLocator</code> to work with Java 7+ by avoiding sorting with an inconsistent ordering
+<li>Fixed <code>FontGlyphReader</code> to use correct Java font value of "SansSerif", and added new constant to match.
+<li>Fixed <code>KdTree</code> to correctly implement distance tolerance-based coordinate matching
+<li>Fixed <code>LineString.normalize()</code> to correctly handle CoordinateSequences
+<li>Fixed <code>CommonBitsRemover</code> to correctly handle CoordinateSequences
+<li>Fixed bug in <code>CoordinateArraySequence.clone()</code>
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Changed interface of <code>SegmentSetMutualIntersector</code> to support thread-safety by removing state
+<li>Provided <code>InteriorIntersectionFinderAdder</code> to replace the poorly named <code>IntersectionFinderAdder</code>
+<li>Changed some classes in <code>com.vividsolutions.jts.operation.buffer</code> to be package-private
+</ul>
+
+<h3>Testing Improvements</h3>
+<ul>
+<li>Added <code>GeometryTestCase</code> base class to simplify unit tests
+</ul>
+
+<!------- JTS-IO -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS I/O</h3>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <code>GeoJsonReader</code> and <code>GeoJsonWriter</code> classes
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>In <code>OraWriter</code> the connection is now provided to the <code>write()</code> method, not the constructors
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed <code>OraReader</code> to handle reading <code>GeometryCollection</code> with <code>Point</code> as second element
+<li>Many improvements to Oracle API code and performance
+<li>Added <code>OraWriter.setOptimizePoint</code> and <code>OraWriter.setOptimizeRectangle</code> methods
+</ul>
+
+<!------- TestBuilder -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added ability to read multiple WKBHex geometries from a text file
+<li>Added AutoZoom to input
+<li>Added Oracle text output
+<li>Added more function sets
+<li>Removed dependency on Acme GIF encoder library
+<li>Improved zooming logic
+<li>Added mouse wheel zooming
+<li>Improved UI for editing A/B geometries
+<li>Added <b>Compute New</b> button to Geometry Functions panel
+<li>Added SpatialIndex functions
+<li>Added User Data labelling
+</ul>
+
+<h3>UI Changes</h3>
+<ul>
+<li>Moved Options menu items to View menu
+<li>Removed Tools menu items (they are available as functions)
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed to correctly handle changing Swing Look&Feel
+</ul>
+
+
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.13</h2>
+
+<i>Release Date: December 13, 2012</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Changed <tt>GeometryFactory.createGeometry()</tt> to make a deep copy of the argument Geometry,
+using the CoordinateSequenceFactory of the factory
+<li>Added ability to specify a dimension in <tt>CoordinateArraySequence</tt>
+<li>Changed <tt>Geometry.getEnvelopeInternal()</tt> to return a copy of the cached envelope, to prevent modification
+<li>Added <tt>GeometryEditor.CoordinateSequenceOperation</tt> to allow easy editing of constituent CoordinateSequences
+<li>Added <tt>GeometryFactory.createPolygon</tt> convenience methods which do not require holes to be specified
+<li><tt>Geometry</tt> overlay methods now return empty results as atomic types of appropriate dimension
+<li>Added <tt>RectangleLineIntersector</tt> to provide efficient rectangle-line intersection testing
+<li>Added <tt>getOrdinate</tt> and <tt>setOrdinate</tt> to <tt>Coordinate</tt>
+<li><tt>Quadtree</tt> is <tt>Serializable</tt>
+<li><tt>STRtree</tt> is <tt>Serializable</tt>
+<li>Added <tt>max</tt>, <tt>average</tt> and <tt>wrap</tt> functions to <tt>MathUtil</tt>
+<li>Improved <tt>WKTReader</tt> parse error reporting to report input line of error
+<li>Improved <code>WKBReader</code> to repair structurally-invalid input
+<li>Made <tt>TopologyPreservingSimplifier</tt> thread-safe
+<li>Added <tt>AbstractSTRtree.isEmpty()</tt> method
+<li>Added <tt>QuadTree.isEmpty()</tt> method
+<li>Added <tt>KdTree.isEmpty()</tt> method
+<li>Added decimation and duplicate point removal to </tt>ShapeWriter<tt>.
+<li><tt>ScaledNoder</tt> now preserves Z values of input
+<li>Added instance methods for all <t>Triangle</tt> static methods
+<li>Added <tt>CGAlgorithmsDD</tt> containing high-precision versions of some basic CG algorithms
+<li>Added <tt>IntersectionMatrix.isTrue()</tt> method for testing IM pattern matches
+<li>Added <code>getRawCoordinates</code> methods to <code>PackedCoordinateSequence</code> concrete classes
+<li>Modified <code>Geometry.isSimple()</code> to explicity check for simplicity for all types,
+and support <code>GeometryCollections</code>
+<li>Improved <code>MCIndexSnapRounder</code> to add nodes only where they are necessary
+<li>Added <code>CoordinateArrays.removeNull()</code> method
+<li>Enhanced <code>GeometryEditor</code> to handle null geometries returned from operation
+<li>Added <code>WKBHExFileReader</code>
+<li>Added <code>Distance3D</code> operation
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Simplified & improved performance of <tt>RectangleIntersects</tt> by using new <tt>RectangleLineIntersector</tt>
+<li>In <tt>RandomPointsInGridBuilder</tt> eliminated redundant <tt>ArrayList</tt> usage
+<li>In <tt>PreparedPolygonIntersects</tt> and <tt>PreparedLineStringIntersects</tt> added check
+to avoid creating segment index if all test inputs are points
+<li>In <tt>AbstractSTRtree</tt> switched to using indexed list access for better performance than using iterators
+<li>In <tt>AbstractSTRtree</tt> freed inserted item array after index is built
+<li>Improved performance of <tt>Polygonizer</tt> for cases with many potential holes
+<li>Improved performance for some <tt>DD</tt> methods by making them <tt>final</tt>
+<li>Added fast filter for <tt>CGAlgorithmsDD.orientationIndex</tt>, and switched to self-operations for DD determinant
+<li>Changed <code>STRtree.createNode()</code> to use a static class for nodes
+<li>Changed <code>QuadTree Node</code> to use scalar x and y variables rather than a <code>Coordinate</code> to reduce memory allocation
+<li>Fixed <code>PreparedGeometry</code> concrete classes to be thread-safe.
+<li>Fixed <code>SortedPackedIntervalRTree</code> so that it is thread-safe.
+</ul>
+
+<h3>Robustness Improvements</h3>
+<ul>
+<li>Switched to using DD extended-precision arithmetic to compute orientation predicate
+<li><code>CGAlgorithms.distanceLineLine()</code> improved to be more robust and performant
+<li>Fixed robustness issue causing <tt>Empty Stack</tt> failure
+in <tt>ConvexHull</tt> for some nearly collinear inputs
+<li><tt>CGAlgorithms.signedArea()</tt> uses a more accurate algorithm
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed <tt>Geometry.equalsExact()</tt> to avoid NPE when comparing empty and non-empty <tt>Point</tt>s
+<li>Fixed <tt>CascadedPolygonUnion</tt> to discard non-polygonal components created during unioning,
+to avoid failures and provide more desirable behaviour
+<li>Fixed <tt>CentralEndpointIntersector</tt> to initialize result correctly
+<li>Fixed <tt>DelaunayTriangulationBuilder.extractUniqueCoordinates(Geometry)</tt>
+to avoid mutating the vertex order of the input Geometry
+<li>Fixed <tt>ConformingDelaunayTriangulationBuilder</tt> to allow
+non-disjoint site and constraint vertex sets
+<li>Fixed <tt>RandomPointsInGridBuilder</tt> point generation to use circle constraint correctly
+<li>Fixed Linear Referencing API to handle MultiLineStrings consistently,
+by always using the lowest possible index value, and by trimming zero-length components from results
+<li>Fixed bug in <tt>LocationIndexedLine</tt> and <tt>LengthIndexLine</tt> which was
+causing an assertion failure when the indexOfAfter() method was called with a constraint location
+which is at the end of the line
+<li>Fixed bug in <tt>STRtree.query(Envelope, ItemVisitor)</tt> causing an NPE when tree is empty
+<li>Fixed issue with creating zero-length edges during buffer topology building under fixed precision, by:
+adding filter to remove zero-length edges;
+using a better estimate of scale factor for reducing to fixed precision after initial failure.
+<li>Fixed <tt>TopologyPreservingSimplifier</tt> to return a valid result
+for closed <tt>LineString</tt>s with large distance tolerances
+<li>Fixed <tt>TopologyPreservingSimplifier</tt> to return an empty result for an empty input
+<li>Fixed <tt>DouglasPeuckerSimplifier</tt> to return an empty result for an empty input
+<li>Fixed <tt>MinimumBoundingCircle</tt> to correctly compute circle for obtuse triangles.
+<li>Fixd <tt>GeometryPrecisionReducer</tt> to use input GeometryFactory when polygon topology is fixed
+<li>Fixed <tt>GeometryNoder</tt> bug that was failing to snap to end vertices of lines
+<li>Fixed <tt>Geometry.getCentroid()</tt> and <tt>Geometry.getInteriorPoint()</tt> to return <tt>POINT EMPTY</tt> for empty inputs
+<li>Fixed <tt>DelaunayTriangulationBuilder</tt> to correctly extract unique points
+<li>Fixed <tt>KdTree</tt> to correctly handle inserting duplicate points into an empty tree
+<li>Fixed <tt>LineSegment.projectionFactor()</tt> to handle zero-length lines (by returning Double.POSITIVE_INFINITY)
+<li>Fixed <tt>LocationIndexedLine</tt> to handle locations on zero-length lines
+<li>Fixed <code>LengthIndexedLine</code> and <code>LocationIndexedLine</code> to handle <code>indexOfAfter()</code> correctly
+<li>Fixed <code>WKBReader</code> to handle successive geometrys with different endianness
+<li>Fixed <code>GeometricShapeFactory</code> to correctly handle setting the centre point
+<li>Fixed <code>GeometryFactory.createMultiPoint(CoordinateSequence)</code> to handle sequences of dimension > 3
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Changed visibility of <tt>TaggedLineStringSimplifier</tt> back to <tt>public</tt> due to user demand
+</ul>
+
+<h3>Testing</h3>
+<ul>
+<li>Added Performance Testing framework (<tt>PerformanceTestRunner</tt>
+and <tt>PerformanceTestCase</tt>)
+<li>Added named predicate tests to all Relate test cases
+</ul>
+
+<h3>Contributors</h3>
+<ul>
+<li>Peter Hopfgartner - improved area computation
+<li>Michael Michaud - snap-rounding improvements
+</ul>
+
+
+<!------- TestBuilder -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added segment index visualization styling
+<li>Improved <b>Geometry Inspector</b>
+<li>Added stream digitizing for Polygon and LineString tools
+<li>Added output of Test Case XML with WKB
+<li>Added Extract Component tool
+<li>Added Delete Vertices Or Components tool
+<li>Added Geometry Edit Panel pop-up menu, with operations
+<li>Added Halton sequence functions
+<li>Added sorting functions
+<li>Added function for selection of first N components
+<li>Added CGAlgorithms functions
+<li>Added ability to paste and load multiple WKBHex geometries
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Using decimation substantially improves rendering time for large geometries.
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed bug in saving XML test files
+</ul>
+
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.12</h2>
+
+<i>Release Date: June 30, 2011</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added new names for methods for computing <tt>Geometry</tt> equality:
+<li><tt>equals(Object)</tt> is a synonym for <tt>equalsExact(Geometry)</tt>
+<li><tt>equalsNorm(Geometry)</tt> automatically normalizes the operands
+<li><tt>equalsTopo(Geometry)</tt> computes topological equality,
+and is a synonym for the original <tt>equals(Geometry)</tt>
+</ul>
+<li>Added <tt>Geometry.norm()</tt> to provide non-mutating normalization
+<li>Added <tt>Geometry.hashCode()</tt> to fulfill Java conventions
+<li>Added <tt>LineIntersector.getEndpoint()</tt> method
+<li>Added methods to <tt>CoordinateSequences</tt> to test for and create valid rings
+<li>Added <tt>minExtent</tt> and <tt>maxExtent</tt> to <tt>Envelope</tt>
+<li>Added ability to compute Single-Sided Buffers (invoked via <tt>BufferOp</tt> and <tt>BufferParameters</tt>)
+<li>Added <tt>GeometryPrecisionReducer</tt>
+<li>Added ExtendedWKB SRID support to <tt>WKBWriter</tt> (thanks to Justin Deoliviera)
+<li>Improved <tt>PolygonShape</tt> to support floating-point coordinates
+<li>Added <tt>GeometryShapeFactory.setRotation(double radians)</tt> method
+<li>Added <tt>GeometricShapeBuilder</tt> API to support shape builder development
+<li>Added <tt>RandomPointsBuilder</tt> to allow generating various random point sets
+<li>Added <tt>RandomPointsInGridBuilder</tt> to allow generating various random point sets constrained to a grid
+<li>Added <tt>KochSnowflakeBuilder</tt>
+<li>Added <tt>SierpinskiCarpetBuilder</tt>
+<li>Added <tt>MathUtil</tt> containing mathematics and numerical utility functions
+<li>Added <tt>Vector2D</tt> class providing vector operations
+<li>Added <tt>DirectedEdgeStar.getNextCWEdge()</tt> method to <tt>planargraph</tt> API
+<li><tt>AffineTransformation</tt> enhanced to avoid numeric precision issues in case of reflection in X=Y (coordinate flipping)
+<li>Added <tt>LineSequencer.sequence()</tt> static convenience method
+<li>Added error indicators to <tt>BufferDistanceValidator</tt> and <tt>BufferResultValidator</tt>
+<li>Added <tt>MinimumClearance</tt> class
+<li>Added <tt>nearestNeighbours</tt> methods to <tt>STRtree</tt>
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Improved memory performance of <tt>ShapeWriter</tt> conversions (by tuning coordinate and polygon conversion)
+<li>Improved performance of <tt>RectangleIntersects</tt> by refining <tt>SegmentIntersectionTester</tt>
+</ul>
+
+<h3>Robustness Improvements</h3>
+<ul>
+<li>Delaunay triangulation uses more robust formulation for the inCircle test
+<li>Voronoi computation now uses more robust formulation for the circumcentre computation
+<li>Force <code>RectangleIntersects</code> to always use segment-scanning to improve robustness
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Reduced visibility of internal classes in <tt>com.vividsolutions.jts.geom.prep</tt>
+<li>Reduced visibility of internal classes in <tt>com.vividsolutions.jts.simplify</tt>
+<li>Moved <tt>Matrix</tt> class into <tt>jts.math</tt> package
+<li>Refactored internal offset curve generation classes
+in <tt>com.vividsolutions.jts.operation.buffer</tt> package
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed <tt>CoordinateArraySequence</tt> and <tt>PackedCoordinateSequence</tt>
+to correctly handle Z ordinate in <tt>getCoordinate(int, Coordinate)</tt>
+<li>Fixed <tt>LinearRing</tt> to have <tt>isClosed()</tt> return <tt>true</tt> for empty rings
+<li>Fixed <tt>Geometry.union()</tt> to use more robust union algorithm.
+ This provides behaviour consistent with <tt>union(Geometry)</tt>.
+<li>Fixed <tt>Point.isValid()</tt> to validate POINT EMPTY correctly
+<li>Fixed <tt>SnapIfNeededOverlayOp</tt> to throw the originating exception,which contains meaningful coordinates
+<li>Fixed <tt>GeometrySnapper</tt> to allow final vertices of LineStrings to snap correctly
+<li>Fixed buffer (<tt>OffsetCurveSetBuilder</tt>) to handle "flat" rings correctly
+<li>Fixed <tt>IsValidOp</tt> to handle reporting "Not Closed" errors on empty rings correctly
+<li>Fixed <tt>NestedRingTester</tt> (used by <tt>IsValidOp</tt>)
+to correctly handle the case where a hole touches all the vertices of another hole (which is invalid)
+<li>Fixed <tt>ConvexHull</tt> to handle large geometries with fewer than 3 unique points
+<li>Fixed <tt>GeometryGraph</tt> to ignore empty hole rings when building graph
+<li>Fixed <tt>LineMerger</tt> to skip lines with only a single unique coordinate
+<li>Fixed <tt>ByteArrayInStream</tt> to pad byte buffers with zeroes
+<li>Corrected spelling of <tt>SquarePointShapeFactory</tt>
+<li>Fixed tolerance check in <tt>KdTree</tt>
+<li>Updated <tt>MasterTester</tt> to include more unit tests
+</ul>
+
+<!------- TestBuilder -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <tt>[Zoom To Result]</tt> button
+<li>Improved mark display, with floating point label
+<li>Added more random geometry creation functions
+<li>Added fractal geometry creation functions
+<li>Improved threaded rendering handling to ensure only one frame drawn
+<li>Added Magnify Topology capability
+<li>Added Geometry Inspector dialog
+<li>Better startup script, with auto-home directory detection
+and JTS_LIB_DIR environment variable (thanks to strk)
+<li>Added logging Info window behaviour
+<li>Improved saving PNG to allow specifying file name
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed Stats panel to update when current test changes
+<li>Fixed deleting single test case
+</ul>
+
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.11</h2>
+
+<i>Release Date: March 1, 2010</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <tt>CoordinateArrays.isRing</tt>
+<li>Added <tt>CGAlgorithms.signedArea(CoordinateSequence)</tt>
+<li>Added <tt>CoordinateArrays.copyDeep(...)</tt> method to copy sections of arrays
+<li>Added <tt>CoordinateList.add(Coordinate[], boolean, int, int)</tt> method to add sections of arrays
+<li>Added <tt>LineSegment.toGeometry()</tt>, <tt>LineSegment.lineIntersection()()</tt>
+<li>Added <tt>LineSegment.hashCode()</tt>
+<li>Added geometric similarity classes (<tt>HausdorffSimilarityMeasure</tt>, <tt>AreaSimilarityMeasure</tt>)
+<li>Added <tt>MinimumDiameter.getMinimumRectangle()</tt>
+<li>Added <tt>MinimumBoundingCircle</tt> class
+<li>Added <tt>Densifier</tt> class
+<li>Added triangulation API, including <tt>QuadEdgeSubdivision</tt>, <tt>IncrementalDelaunayTriangulator</tt>,
+ <tt>ConformingDelaunayTriangulator</tt> and supporting classes
+<li>Added <tt>VoronoiDiagramBuilder</tt> to perform Voronoi diagram generation
+<li>Added <tt>scaleInstance(scaleX, scaleY, x, y)</tt> to <tt>AffineTransformation</tt>
+<li>Added <tt>AffineTransformationFactory</tt> to allow generating transformations from various kinds of control inputs
+<li>Added <tt>BinTree.remove()</tt> method
+<li>Fixed <tt>BinTree.query()</tt> to allow null interval arguments
+<li>Added <tt>ShapeReader</tt> API to convert Java2D Shapes into JTS Geometry
+<li>Added <tt>ShapeWriter</tt> API to convert JTS geometry into Java2D Shapes
+<li>Added <tt>FontGlyphReader</tt> API to render Java2D text font glyphs into geometry
+<li>Added <tt>SdeReader</tt> to <b>jtsio</b> library
+<li>Added <tt>Debug</tt> break methods
+<li>Added <tt>Memory</tt> utility for reporting memory statistics
+<li>Added <tt>ObjectCounter</tt> utility for counting objects
+<li>Added <tt>createSquircle</tt> and <tt>createSuperCircle</tt> to <tt>GeometricShapeFactory</tt>
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Improved performance of <tt>Geometry.getArea()</tt> and <tt>Geometry.getLength()</tt> when used with custom <tt>CoordinateSequence</tt>s
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Deprecated <tt>WKBWriter.bytesToHex</tt> in favour of <tt>WKBWriter.toHex</tt> to regularize and simplify method name
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed Point.isValid() to check for invalid coordinates (ie with Nan ordinates)
+<li>Fixed <tt>Geometry.distance()</tt> and <tt>DistanceOp</tt> to return 0.0 for empty inputs
+<li>Fixed <tt>Buffer</tt> to handle degenerate polygons with too few distinct points correctly
+<li>Added illegal state check in <tt>LineSegment.pointAlongOffset()</tt>
+<li>Fixed exception strategy in <tt>BufferSubgraph</tt> to handle certain robustness failures correctly
+<li>Fixed robustness problem in <tt>OffsetCurveBuilder</tt> in computing mitred joins for nearly parallel segments
+<li>Fixed minor bug in <tt>BufferInputLineSimplifier</tt> which prevented simplification of some situations
+<li>Fixed bug in <tt>BufferInputLineSimplifier</tt> which caused over-simplification for large tolerances
+<li>Fixed bug in <tt>Angle.normalizePositive</tt> to handle values > 2PI correctly
+<li>Fixed <tt>WKTWriter</tt> to emit correct syntax for MULTIPOINTs
+<li>Fixed <tt>WKTReader</tt> to accept correct syntax for MULTIPOINTs
+<li><tt>CGAlgorithms.isCCW</tt> now checks for too few points in the ring and throws an <tt>IllegalArgumentException</tt>
+<li>Fixed bug in <tt>AffineTransformation#eqals</tt> (logic bug)
+<li>Fixed bug in <tt>CoordinateList#closeRing</tt> (cloning closing Coordinate)
+</ul>
+
+<!------- TestBuilder -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>WKT input is cleaned automatically when loaded (illegal chars are removed)
+<li>Added WKT-Formatted option to Test Case View dialog
+<li>Many new geometry functions added
+<li>Geometry functions are displayed in tree
+<li>Geometry functions can be implemented as Java static class methods.
+<li>Geometry function classes can be loaded dynamically from command-line
+<li>Improved handling of very large geometry inputs and results
+<li>Threaded rendering allows display of very large geometries without limiting usability
+<li>Added Draw Rectangle tool
+<li>Added Drag-n-drop loading of .SHP files
+<li>Added Info tool to provide persistent display of geometry point/segment information
+<li>Added display of memory usage
+</ul>
+
+
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.10</h2>
+
+<i>Release Date: December 31, 2008</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <tt>Geometry.reverse()</tt> method for all geometry types
+<li>Added <tt>setSrsName</tt>, <tt>setNamespace</tt>, <tt>setCustomRootElements</tt> methods to <tt>GMLWriter</tt>
+<li>Added <tt>Envelope.getArea</tt> method
+<li>Added <tt>copy</tt>, <tt>copyCoord</tt> methods to <tt>CoordinateSequences</tt>
+<li>Added <tt>area</tt> method to <tt>Envelope</tt>
+<li>Added <tt>extractPoint(pt, offset)</tt> methods to <tt>LengthIndexedLine</tt> and <tt>LocationIndexedLine</tt>
+<li>Added <tt>CoordinatePrecisionReducerFilter</tt>
+<li>Added <tt>UnaryUnionOp(Collection, GeometryFactory)</tt> constructor to handle empty inputs more automatically
+<li>Added <tt>DiscreteHausdorffDistance</tt> class
+<li>Made <tt>LineMerger</tt> able to be called incrementally
+<li>Added <tt>GeometricShapeFactory.createArcPolygon</tt> to create a polygonal arc
+<li>Enhanced <tt>Geometry.buffer()</tt> to preserve SRID
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Improved performance for <code>EdgeList</code> (by using a more efficient technique for detecting duplicate edges)
+<li>Improved performance for <code>ByteArrayInStream</code> (by avoiding use of <tt>java.io.ByteArrayInputStream</tt>)
+<li>Unrolled intersection computation in <tt>HCoordinate</tt> to avoid object allocation
+<li>Improved performance for buffering via better offset curve generation and simplification.
+<li>Improved performance for <tt>IsValidOp</tt> by switching to use <tt>STRtree</tt> for nested hole checking
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed <tt>Geometry.getClassSortIndex()</tt> to lazily initialize the sorted class list. This fixes a threading bug.
+<li>Fixed <tt>RectangleContains</tt> to return correct result for points on the boundary of the rectangle
+<li>Fixed error in <tt>com.vividsolutions.jts.simplify.LineSegmentIndex</tt> which caused polygons
+simplified using <tt>TopologyPreservingSimplifier</tt> to be invalid in certain situations
+<li>Fixed error in <tt>DouglasPeuckerSimplifier</tt> which caused empty polygons to be returned when they contained a very small hole
+<li>Fixed <tt>PackedCoordinateSequence</tt> to return <tt>NaN</tt> for null ordinate values
+<li>Fixed <tt>Geometry.centroid()</tt> (<tt>CentroidArea</tt>) so that it handles degenerate (zero-area) polygons
+<li>Fixed <tt>Geometry.buffer()</tt> (<tt>OffsetCurveBuilder</tt>) so that it handles JOIN_MITRE cases with nearly collinear lines correctly
+<li>Fixed <tt>GeometryFactory.toGeometry(Envelope)</tt> to return a CW polygon
+<li>Fixed <tt>UnaryUnionOp</tt> to correctly handle heterogeneous inputs with P/L/A components
+<li>Fixed <tt>UnaryUnionOp</tt> to accept <tt>LINEARRING</tt>s
+<li>Fixed <tt>CentroidArea</tt> to handle zero-area polygons correctly
+<li>Fixed <tt>WKBWriter</tt> to always output 3D when requested, and to handle 2D <tt>PackedCoordinateSequences</tt> correctly in this case
+<li>Fixed <tt>NodedSegmentString</tt> to handle zero-length line segments correctly (via <tt>safeOctant</tt>)
+<li>Cleaned up code to remove unneeded <tt>CGAlgorithms</tt> objects
+<li>Fixed <tt>GeometricShapeFactory.createArc</tt> to ensure arc has requested number of vertices
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Moved GML I/O classes into core JTS codebase
+<li>Changed <tt>GMLWriter</tt> to not write the <tt>srsName</tt> attribute by default
+<li>In <tt>DistanceOp</tt> switched to using <tt>nearestPoints</tt> method names
+<li>Exposed <tt>STRtree.getRoot()</tt> method
+</ul>
+
+
+<!------- TestBuilder -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>UI Improvements</h3>
+<ul>
+<li>Added ability to read GML from input panel
+<li>Added GML output to View dialog
+<li>Added file drag'n'drop to Geometry Input text areas
+<li>Add display of computation time
+<li>Added Stats panel
+<li>Added Scalar functions panel, with extensible function list
+<li>Added <b>Save as PNG...</b>
+<li>Added stream digitizing to Polygon and Line Draw tools
+</ul>
+
+<!------- TestRunner -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestRunner</h3>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <tt>-testCaseIndex</tt> command-line option
+</ul>
+
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.9</h2>
+
+<i>Release Date: January 2, 2008</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <tt>Polygonal</tt>, <tt>Lineal</tt>, <tt>Puntal</tt> tag interfaces to better categorize geometry classes
+<li>Added <tt>Geometry.union()</tt> method, <tt>UnaryUnionOp</tt> class for efficient unioning of geometrys
+<li>Added <tt>Triangle.area3D</tt> method
+<li>Added <tt>LineSegment.pointAlongOffset</tt> method
+<li>Added <tt>LineSegment.orientationIndex(Coordinate)</tt> method
+<li>Added <tt>PreparedGeometry</tt> classes and methods to optimize some geometry functions in batch situations
+<li>Added <tt>Envelope.covers</tt> methods, for preciseness
+<li>Added <tt>OctagonalEnvelope</tt> class
+<li>Improved <tt>CGAlgorithms.isPointInRing</tt> method to handle case where point lies on the ring
+<li>Added <tt>CGAlgorithms.locatePointInRing</tt> method
+<li>Added <tt>PointInAreaLocator</tt> interface, enhanced <tt>SimplePointInAreaLocator</tt> to extend this
+<li>Added <tt>RayCrossingCounter</tt>, <tt>IndexedPointInAreaLocator</tt> classes for more efficient Point-In-Polygon testing
+<li>Added <tt>GeometryCombiner</tt> class
+<li>Enhanced <tt>BufferOp</tt> with join styles
+<li>Enhanced <tt>WKTReader</tt> to accept any case for <tt>NaN</tt> number symbols
+<li>Added <tt>WKTFileReader</tt> class
+<li>Improved performance of <tt>CoordinateList</tt> constructors
+<li>Added <tt>CascadedPolygonUnion</tt> class
+<li>Added <tt>LinearLocation.isOnSameSegment</tt> method
+<li>Added <tt>LinearLocation.getSegment</tt> method
+<li>Added <tt>LocationIndexedLine.indexOfAfter</tt> method
+<li>Added interpolation of Z value to linear referencing methods
+<li>Added methods to rotate around a given point to <tt>AffineTransformation</tt>
+<li>Allowed <tt>GeometricShapeFactory</tt> to be subclassed to add new shapes
+<li>Added <tt>SineStarFactory</tt> (primarily to support testing)
+<li>Added <tt>SortedPackedIntervalRTree</tt> class
+<li>Added <tt>SegmentSetMutualIntersector</tt> interface and implementations
+<li>Added <tt>Node.remove(DirectedEdge)</tt> method in <tt>planargraph</tt> package
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Improved performance for <code>SimplePointInAreaLocator</code> (by checking ring envelopes as a filter)
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li><tt>Geometry.buffer</tt> operation fixed to always return polygonal geometries
+<li>Fixed bug in <code>Geometry.buffer(distance, quadrantSegs)</code>
+causing failure for some cases with <tt>quadrantSegs = 1</tt>
+<li>Fixed bug in <tt>GeometryFactory.toGeometry(Envelope)</tt>
+which was returning invalid Polygons for "linear" envelopes
+<li>Fixed bug in <tt>MonotoneChainBuilder</tt> which caused failures in situations with segments of zero length
+<li>Fixed <tt>PointLocator</tt> to handle locating in Point geometries
+<li>Fixed <tt>GeometricShapeFactory</tt> to always use provided PrecisionModel
+<li>Fixed <tt>LinearLocation.clone</tt> method
+<li>Fixed <tt>LinearLocation.isValid</tt> method
+<li>Fixed <tt>Polygonizer</tt> to accept single-point linestrings (which are ignored)
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Deprecated <code>RobustCGAlgorithms</code>
+<li>Deprecated <code>BufferOp</code> cap style constants (these are now provided in </tt>BufferParameters</tt>)
+<li>Removed <code>SIRPointInRing</code>
+</ul>
+
+<!------- TestRunner -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestRunner</h3>
+
+<h3>New Features</h3>
+<ul>
+<li>Added ability to specify GeometryOperation in XML file
+<li>Added <tt>BufferValidatedGeometryOperation</tt>
+<li>Added ability to specify custom result matching via <tt>resultMatcher</tt> parameter
+in XML files
+<li>Added <tt>BufferResultMatcher</tt>
+</ul>
+
+
+<!------- TestBuilder -------------------->
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>UI Improvements</h3>
+<ul>
+<li>Improved rendering of geometries
+<li>Improved symbology for orientation
+<li>Simplified Geometry creation
+<li>Improved vertex move/add
+<li>Added tooltip for coordinate location
+<li>Added more geometry functions
+<li>Added Copy Result to Test button
+</ul>
+
+<h3>Code Improvements</h3>
+<ul>
+<li>Restructured code for more flexibility, better Swing functionality
+<li>Made it easier to add geometry functions
+</ul>
+
+
+<!-- ================================================================ -->
+<hr size='4' color='darkblue'>
+<h2>Version 1.8</h2>
+
+<i>Release Date: December 19, 2006</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Improved robustness for overlay operations, via using geometry snapping
+<li>Added <code>Angle</code> class
+<li>Added methods to <code>Triangle</code> class
+<li>Added <code>LineSegment.midPoint</code> method
+<li>Added ability to specify output of Z values to <code>WKTWriter</code>
+<li>Added <code>setFormatted</code>, <code>setTab</code>, <code>setMaxCoordinatesPerLine</code> methods to <code>WKTWriter</code>
+<li>Added <code>BoundaryNodeRule</code> classes, and ability to specify a Boundary Node Rule
+in <code>RelateOp</code>, <code>IsSimpleOp</code>, <code>BoundaryOp</code>
+<li>Added ability to get the failure location to <code>IsSimpleOp</code>
+<li>Added <code>BoundaryOp</code> with improved algorithm for lineal geometries. Changed lineal Geometry classes to use it.
+<li>Enhanced <code>Geometry</code> overlay methods to accept empty <code>GeometryCollections.</code>
+<li>Enhanced Error Handling for <tt>WKTReader</tt>
+<li>Added <code>CoordinateSequenceFilter</code>
+<li>Added <code>AffineTransformation</code> and <code>AffineTransformationBuilder</code>
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Changed API for <code>IsSimpleOp</code> (required to support returning failure location)
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed bug in <code>GeometryFactory.buildGeometry</code>
+causing failure if input contained all GeometryCollections of the same subclass
+<li>Changed AssertFailure to TopologyException in <code>PolygonBuilder</code>
+<li>Improved correctness of <tt>RobustLineIntersector</tt> in certain cases where segment endpoints intersect
+<li>Eliminated duplicate method execution in <code>TestRunner</code>
+</ul>
+
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestBuilder</h3>
+
+<h3>New Features</h3>
+<ul>
+<li>Zoom tool can now draw zoom box as well as click
+<li>Cut, Copy and Paste buttons for Input WKT
+<li>added ability to specify custom Geometry Operations
+</ul>
+
+<hr size='0' color='darkblue'>
+<h3 style='font-family:sans-serif; color:darkblue'>JTS TestRunner</h3>
+
+<h3>New Features</h3>
+<ul>
+<li>added ability to specify custom Geometry Operations
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Eliminated duplicate method execution
+</ul>
+
+
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.7.2</h2>
+
+<i>Release Date: June 22, 2006</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added support for EWKB (SRIDs only) to <code>WKBReader</code>
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed bug in <code>CoordinateArrays.ptNotInList</code>.
+Changed <code>polygonize.EdgeRing</code> to used corrected code.
+<li>Fixed bug causing duplicate points in <code>ScaledNoder</code>
+<li>Fixed bug causing Null Pointer for empty geometries in <code>OraWriter</code>
+<li>Changed AssertFailure to TopologyException in <code>EdgeNode</code>
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.7.1</h2>
+
+<i>Release Date: March 20, 2006</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added Hex string conversion to <code>WKBReader</code> and <code>WKBWriter</code>
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed null point cloning bug in <code>TopologyValidationError</code> (<i>thanks to Markus Gebhard</i>)
+<li>Fixed bug in <code>PointLocator</code> fix for LinearRings
+<li>Fixed bug in <code>Geometry.isValid</code> and <code>IsValidOp</code> causing some valid polygons
+to be reported as having a Disconnected Interior (specifically, polygons containing
+holes touching at a single point, where the point is the highest point in the hole rings, and where the holes
+have a specific orientation)
+<li>Fixed bug in <code>Polygon.isRectangle</code>, which reported some valid rectangles as false
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Improved performance for <code>Geometry#withinDistance</code> (via short-circuiting)
+</ul>
+
+<h3>Contributors</h3>
+<ul>
+<li>Dave Blasby
+<li>Koen van Dijken
+</ul>
+
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.7</h2>
+
+<i>Release Date: December 7, 2005</i>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added <code>JTSVersion</code> class to provide access to the API version information
+<li>Added <code>covers</code> and <code>coveredBy</code> predicates to <code>Geometry</code>
+<li>Added <code>Geometry#buffer(distance, quadSegs, endCapStyle)</code> method to expose buffer end cap styles
+<li>Added <code>LineString#reverse</code> and <code>MultiLineString#reverse</code> methods
+<li>Added <code>centre</code>, <code>intersection</code>, <code>translate</code>,
+<code>expandBy(distance)</code>, <code>expandBy(dx, dy)</code>
+methods to <code>Envelope</code>
+<li>Added <code>CollectionUtil</code> class for performing operations over collections
+<li>Added <code>CoordinateArrays</code> comparators
+<li>Added <code>CoordinateSequence#getDimension</code>
+<li>Added convenience methods <code>toPoint</code> and <code>toLineString</code> to <code>WKTWriter</code>
+<li>Added WKB API (<code>WKBReader</code> and <code>WKBWriter</code> classes in <code>com.vividsolutions.jts.io</code>
+<li><code>WKTReader</code> has better handling of numeric parsing, including support for scientific notation
+<li>Added <code>IsValidOp#setSelfTouchingRingFormingHoleValid</code> to allow validating SDE-style polygons
+<li>Added check for non-closed rings in <code>IsValidOp</code>
+<li>Added Linear Referencing API (<code>com.vividsolutions.jts.linearref</code>
+<li>Added <code>LineSequencer</code> class to <code>com.vividsolutions.jts.operation.linemerge</code>
+<li>Added <code>Subgraph</code> class to <code>com.vividsolutions.jts.planargraph</code>
+<li>Added <code>isRemoved</code> method to <code>GraphComponent</code>
+<li>Added <code>ConnectedSubgraphFinder</code> class to <code>com.vividsolutions.jts.planargraph.algorithm</code>
+<li>Added <code>setVisited</code>, <code>getComponentWithVisitedState</code>,
+<code>setVisited</code>, <code>getComponentWithVisitedState</code>
+methods to <code>com.vividsolutions.jts.planargraph.GraphComponent</code>
+<li>Added classes to perform Snap Rounding (in <code>com.vividsolutions.jts.noding.snapround</code>>
+<li>Improved buffering speed and robustness by using Snap Rounding
+<li>Added buffer optimization for results with large numbers of polygons and/or holes
+<li>Added <code>STRtree#query(Envelope, ItemVisitor)</code> method
+<li>Added <code>Debug#toLine</code> methods
+<li>Added <code>ConvexHull(Coordinate[])</code> constructor
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed decimal formatting in <code>WKTWriter</code> to force a leading 0 in decimal numbers
+<li>Fixed bug in <code>CoordinateArraySequence#setOrdinate</code>
+<li>Fixed bug when checking validity of polygon with hole (<code>IsValidOp#checkHolesInShell</code>)
+<li>Improved correctness of computated intersections in <code>RobustLineIntersector</code>
+<li>Fixed bugs in <code>CoordinateList.clone</code> (thanks to Matthias Bobzien)
+<li>Fixed bug in <code>Envelope.equals</code> (thanks to John Cartwright)
+<li>Fixed <code>PointLocator</code> for LinearRings
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Improved performance for overlay operations (point inclusion, identical edge detection)
+<li>Improved Convex Hull performance
+</ul>
+
+<h3>API Changes</h3>
+<ul>
+<li>Added <code>SpatiaIndex#query(Envelope, ItemVisitor)</code> method signature
+<li>Added <code>CoordinateSequence#getDimension()</code> method signature
+<li>Marked <code>GeometryEditor.CoordinateOperation#edit(Geometry, GeometryFactory)</code> method
+as <code>final</code>, to prevent incorrect use
+</ul>
+
+<h3>Semantics Changes</h3>
+<ul>
+<li>CoordinateArraySequence#setOrdinate now checks that the ordinate index is in range
+</ul>
+
+
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.6</h2>
+
+Release Date: February 3, 2005
+
+<h3>API Changes</h3>
+<ul>
+<li>Changed to using <code>CoordinateArraySequence</code> instead of <code>DefaultCoordinateSequence</code>
+(to provide a more descriptive name).
+</ul>
+
+<h3>Semantics Changes</h3>
+<ul>
+<li>PrecisionModel#makePrecise changed to use Symmetric Arithmetic Rounding rather than Banker's Rounding
+</ul>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added ability to enable <code>Debug</code> methods by setting a system property
+<li>Added <code>getNumGeometries</code> and <code>getGeometryN</code> methods to Geometry class, to make API more uniform
+<li>Improved API for <code>CoordinateSequence</code> allows more options for improving memory usage and handling custom coordinate storage methods
+<li>Added <code>PackedCoordinateSequence</code> to provide reduced memory footprint for geometry objects if desired
+<li>Added optimized spatial predicates for rectangles
+<li>Added Debug#isDebugging method
+</ul>
+
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed bug in <code>Geometry#within()</code> short circuiting
+<li>Fixed bug causing <code>Geometry#isValid</code> to throw IllegalArgumentException for certain kinds of holes with invalid rings
+<li>Fixed bug causing redundant linestrings to be returned in the result of overlaying polygons containing holes touching their shell.
+<li><code>Polygon#getBoundary</code> now returns a <code>LinearRing</code> if the polygon does not have holes
+</ul>
+
+<h3>Architecture Changes</h3>
+<ul>
+<li>Removed a proliferation of references to the default <code>CoordinateSequenceFactory</code>
+</ul>
+
+<h3>Contributors</h3>
+<ul>
+<li>Andrea Aime
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.5</h2>
+Release Date: September 22, 2004
+<p>
+This version is upwards compatible with Version 1.4
+
+<h3>API Changes</h3>
+<ul>
+<li>None
+</ul>
+
+<h3>Semantics Changes</h3>
+<ul>
+<li>None
+</ul>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li><code>CGAlgorithms#isCCW</code> now handles coordinate lists with repeated points. Also throws an IllegalArgumentException if the input ring does not have 3 distinct points
+<li><code>isValid</code> now checks for invalid coordinates (e.g. ones with Nan or infinite numbers)
+<li>added copyDeep() method to <code>CoordinateArrays</code>
+<li>added geometry simplification operations <code>DouglasPeuckerSimplifier</code> and <code>TopologyPreservingSimplifier</code>
+<li>added methods to <code>Quadtree</code> and <code>STRtree</code> to remove items and query using the Visitor pattern
+</ul>
+
+<h3>Performance Improvements</h3>
+<ul>
+<li>Added short-circuit tests in geometry named predicates based on envelope tests
+</ul>
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed bugs in <code>Geometry</code> serialization
+<li>Fixed bug in <code>ValidOp</code> which reported some MultiPolygons with shells nested inside a hole as invalid
+<li>Fixed bug in buffer which caused buffers of some polygons with small & large holes to not contain any holes
+<li>Fixed bug in <code>Polygonizer</code> which caused exception if no lines were supplied
+</ul>
+<h3>Architecture Changes</h3>
+<ul>
+<li>Basic CG algorithm methods made static in the <code>CGAlgorithms</code> class
+<li>Various utility methods made public in <code>CoordinateArrays</code> class
+</ul>
+<h3>Documentation</h3>
+<ul>
+<li>More examples provided in <code>com.vividsolutions.jtsexamples package</code>
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.4</h2>
+
+Release Date: November 4, 2003
+<h3>Semantics Changes</h3>
+<ul>
+<li>none
+</ul>
+<h3>Functionality Improvements</h3>
+<ul>
+<li>Added "LINEARRING" tag to WKT syntax
+<li>Added GeometryEditor class to allow easy copy/modify of Geometrys
+<li>Added GeometricShapeFactory class to easily create standard geometric shapes
+<li>Geometries can now carry arbitrary user-defined data objects (via Geometry#get/setUserData(Object) method)
+<li>Added CoordinateSequence and CoordinateSequenceFactory interfaces, and default implementations (BasicCoordinateSequence, BasicCoordinateSequenceFactory)
+<li>Added Geometry#getFactory
+<li>Added new PrecisionModel type of FLOATING_SINGLE, for rounding to single precision floating point
+<li>Added DistanceOp#getClosestPoints method, which returns the closest points between two Geometries
+<li>Added com.vividsolutions.jts.noding package containing classes to perform fast indexed noding of linestrings
+<li>Added com.vividsolutions.jts.operation.polygonize package containing classes to perform polygonization
+<li>Added com.vividsolutions.jts.operation.linemerge package containing classes to perform line merging
+<li>Added SimpleGeometryPrecisionReducer to allow reducing precision of coordinates of a Geometry
+<li>Added LineSegment#closestPoints method to compute the closest points between two line segments
+<li>Added MinimumDiameter class to compute minimum diameters of Geometries
+<li>Added geom.Triangle class to contain algorithms for Triangles
+<li>BufferOp now allows end cap styles to be specified. Three types are supported: round, butt and square.
+</ul>
+<h3>Performance Improvements</h3>
+<ul>
+<li>EdgeList now provides a findEqualEdge method which is substantially faster than findEdgeIndex, for large lists
+<li>Buffering is now faster and much more robust
+<li>Overlap operations are now more robust
+</ul>
+<h3>Bug Fixes</h3>
+<ul>
+<li>Envelope#init(Envelope) now handles null Envelopes correctly
+<li>CoordinateList#add() now correctly ignores the z-value of Coordinates in determining equality
+<li>Geometry#isValid now correctly handles checking validity of LinearRings
+<li>Fixed infinite loop bug causing Out Of Memory errors during polygon intersection
+<li>Geometry#clone now correctly clones the Geometry's Envelope
+<li>LineIntersector#computeEdgeDistance now correctly computes a non-zero edge distance in certain situations when a fixed precision model was being used and the line segment was a single unit in length
+<li>Fixed incorrect calculation of depths in DirectedEdgeStar#computeDepths
+<li>Fixed BufferSubgraph#addReachable to use explicit stack to avoid stack overflow problems
+<li>Fixed various bugs causing some kinds of buffers to be computed incorrectly
+</ul>
+<h3>API Changes</h3>
+<ul>
+<li>WKTReader/Writer: changed protected members to private
+<li>PrecisionModel type is now an object rather than an int
+<li>ConvexHull API changed to remove requirement to pass in CGAlgorithms object
+</ul>
+<h3>Code Architecture Changes</h3>
+<ul>
+<li>geom.util package added for utility classes which parse and modify geometries
+</ul>
+<h3>Documentation</h3>
+<ul>
+<li>More examples provided in com.vividsolutions.jtsexamples package
+<li>Added JTS Developers Guide
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.3</h2>
+Release Date: April 4, 2003
+<h3>Semantics Changes</h3>
+<ul>
+<li>all Geometry methods are now reentrant (thread-safe)
+<li>Fixed-precision coordinates are now stored in a rounded but non-scaled form. This makes them compatible with non-precise (Floating) coordinates, and simplifies working with precise coordinates directly. Mixed precision models are now supported in Geometry methods; method results are in the more precise of the input precision models.
+<li>Offsets are no longer supported in the Fixed precision model. This is necessary to allow storing fixed precision coordinates in a non-scaled form. This does not reduce the total precision available, since coordinates are stored in a floating-point format.
+<li>SRID and Precision Model are no longer checked for equality during Geometry operations. This removes a limitation which provided little semantic benefit.
+</ul>
+
+<h3>Functionality Improvements</h3>
+<ul>
+<li>added Geometry.isWithinDistance(Geometry g, double distance) method, to provide optimized proximity queries
+<li>added Geometry.buffer(double distance, int quadrantSegments) method, allowing control over accuracy of buffer approximation
+<li>added Geometry.getCentroid() method
+<li>added Geometry.getInteriorPoint() method, which uses heuristic methods to return a point in the interior of a Geometry
+<li>GeometryFactory.toGeometryArray now returns null if the argument is null
+</ul>
+<h3>Performance Improvements</h3>
+<ul>
+<li>Removed unnecessary string construction in EdgeEndStar.propagateSideLabels()
+<li>Eliminated unnecessary computation of self-intersections in rings during relate and spatial functions. This provides a large increase in speed when working with large rings and polygons. (Note that IsValid still checks for these self-intersections, which are illegal in LinearRings)
+<li>Add short-circuit code to RobustLineIntersector to detect non-intersections more efficiently
+</ul>
+<h3>Bug Fixes</h3>
+<ul>
+<li>Fixed ClassCastException occurring in GeometryCollection.getLength()
+<li>Fixed bug in Edge Intersection insertion (replaced Coordinate#equals with equals2D to ensure that intersection creation is not sensitive to Z-value).
+<li>Fixed handling LineStrings with too few points in GeometryGraph.addLineString
+<li>Fixed: was not checking that MultiPolygons don't contain components with too few points.
+<li>Fixed Envelope.distance() to return correct distance for all envelopes.
+<li>Fixed a few Geometry methods to make them re-entrant.
+<li>Fixed CoordinateList.closeRing() to ensure endpoints are not duplicated
+<li>Fixed CGAlgorithms.signedArea() to use a simpler algorithm which is more robust and faster.
+<li>Fixed bug preventing validating Rings containing an initial repeated point.
+</ul>
+<h3>API Changes</h3>
+<ul>
+<li>Added default constructor to WKTReader. It uses the default GeometryFactory
+<li>Add two static intersects() methods to Envelope, to allow computing intersections with envelopes defined by points only.
+<li>Dropped BinaryPower; its functionality is provided by DoubleBits in a more robust fashion.
+<li>Removed a couple of redundant private static methods from Geometry; they have been replaced by methods in CoordinateArrays
+<li>The Geometry class is now marked as Serializable
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.2</h2>
+
+Release Date: 7 October 2002
+<h3>Semantics Changes</h3>
+<ul>
+<li>JTS now allows Geometrys to have repeated points. All operations will continue to perform as before. This removes a significant incompatibility with the OGC spatial data model.
+<li>TopologyExceptions may now be thrown by spatial overlay methods. This helps to distinguish between code bugs and known robustness problems. It also provides a machine-readable coordinate for the error location.
+</ul>
+<h3>Functionality Improvements</h3>
+<ul>
+<li>RobustLineIntersector now uses "normalized" coordinates to maximize the accuracy of intersection computation.
+<li>Upgraded Quadtree with more robust implementation
+<li>Replaced IntervalTree with a more robust implementation of BinTree
+<li>Added STRTree 2-D spatial index, which exhibits better performance than QuadTrees in many situations.
+<li>Added EnhancePrecisionOp, which uses precisioning enhancing techniques to reduce the number of failure cases due to robustness problems.
+</ul>
+<h3>Bug Fixes</h3>
+<ul>
+<li>fixed ConvexHull to use TreeSet instead of HashSet for coordinates
+<li>Fixed isValid for GeometryCollections containing Polygons, which were sometimes erroneously returning a validity failure for correct Geometrys.
+<li>Fixed bug in LineSegment.distancePointLine() which would return the incorrect distance for a LineSegment with two identical points
+<li>Improved error handling in CGAlgorithms.isCCW()
+<li>IsValid now checks for too few points in a geometry component (e.g. due to repeated points in a ring)
+</ul>
+<h3>API Changes</h3>
+<ul>
+<li>added Stopwatch class
+<li>added Geometry.getArea() and Geometry.getLength() methods
+<li>added CGAlgorithms.signedArea() method
+<li>added methods to LineSegment - closestPoint(), getLength()
+<li>added CoordinateArrrays and CoordinateLists utility classes
+<li>Added TopologyValidationError.getErrorType() method
+<li>Added Envelope#intersects; deprecated Envelope#overlaps.
+<li>Added Geometry#geometryChanged() method to allow signaling when Geometry coordinates have been mutated by a client class
+<li>Added STRTree class implementing a Sort-Tile-Recursive spatial index (a variant of a packed R-tree)
+<li>Deleted IntervalTree 1-D spatial index (replaced by BinTree)
+<li>Add BinTree 1-D spatial index
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.1.1</h2>
+
+Release Date: 9 April 2002
+<h3>Bug Fixes</h3>
+<ul>
+<li>fixed decimal-point symbol localization bug in WKTWriter
+<li>fixed bug in Envelope.int(Envelope env)
+<li>fixed filename case of SFSMultiLineString.java and IntervalTree.java
+</ul>
+<h3>API Changes</h3>
+<ul>
+<li>deleted TopologyException class
+<li>renamed CGAlgorithms.isPointInPolygon to isPointInRing (a more accurate description of what the method computes)
+</ul>
+<h3>API Additions</h3>
+<ul>
+<li>added Geometry.getCoordinate() method
+<li>added Geometry.distance() method
+<li>added GeometryComponentFilter interface and Geometry.apply(GeometryComponentFilter) method
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.1</h2>
+
+Release Date: 28 March 2002
+<h3>New Features</h3>
+<ul>
+<li>added Geometry.isSimple() and Geometry.isValid() methods
+<li>improved design of topological data structures
+<li>added Geometry.setSRID() method
+<li>improved functionality of the Envelope class
+<li>added ability to write to an arbitrary java.io.Writer object to WKTWriter
+<li>added Validate and Mark Location functionality to TestBuilder
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 1.0</h2>
+Release Date: 1 February 2002
+<ul>
+<li>Removed some non-compatibilities with Java 1.1
+<li>Fixed bug in constructing buffer outline around inside of angles
+<li>In TestBuilder vertices are now displayed with fixed size in view units
+<li>Improved code for WKTWriter.writeFormatted()
+<li>Fixed bug in constructor for LinearRing
+<li>Improved implementation of sweepline intersection algorithm to avoid use of dynamic set.
+<li>Fixed bug in ConvexHull.cleanRing()
+<li>Refactored RobustLineIntersector and NonRobustLineIntersector
+</ul>
+
+<!----------------------------------------------------------------------->
+<hr size='4' color='darkblue'>
+<h2>Version 0.0</h2>
+Release Date: 30 May 2001
+
+<p>
+<i>Baseline version</i>
+
+</body>
+</html>
diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt
deleted file mode 100644
index cbee875..0000000
--- a/doc/LICENSE.txt
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/doc/sample_java_header.txt b/doc/sample_java_header.txt
new file mode 100644
index 0000000..c7d3774
--- /dev/null
+++ b/doc/sample_java_header.txt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
diff --git a/jts_logo.png b/jts_logo.png
new file mode 100644
index 0000000..d3f19bc
Binary files /dev/null and b/jts_logo.png differ
diff --git a/jtsio/src/META-INF/MANIFEST.MF b/jtsio/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 5045494..0000000
--- a/jtsio/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.9.4
-Created-By: 1.7.0_75-b13 (Oracle Corporation)
-
diff --git a/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java b/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java
deleted file mode 100644
index d92bdd5..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * The JTS Topology Suite is a collection of Java classes that
- * implement the fundamental operations required to validate a given
- * geo-spatial data set to a known topological specification.
- *
- * Copyright (C) 2001 Vivid Solutions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-package com.vividsolutions.jts.io.geojson;
-
-
-/**
- * Constants for GeoJSON objects
- *
- * @author Martin Davis
- */
-public class GeoJsonConstants {
-
- public static final String NAME_GEOMETRIES = "geometries";
- public static final String NAME_CRS = "crs";
- public static final String NAME_PROPERTIES = "properties";
- public static final String NAME_NAME = "name";
- public static final String NAME_TYPE = "type";
- public static final String NAME_POINT = "Point";
- public static final String NAME_LINESTRING = "LineString";
- public static final String NAME_POLYGON = "Polygon";
- public static final String NAME_COORDINATES = "coordinates";
- public static final String NAME_GEOMETRYCOLLECTION = "GeometryCollection";
- public static final String NAME_MULTIPOLYGON = "MultiPolygon";
- public static final String NAME_MULTILINESTRING = "MultiLineString";
- public static final String NAME_MULTIPOINT = "MultiPoint";
-
-}
diff --git a/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonReader.java b/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonReader.java
deleted file mode 100644
index ba99620..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonReader.java
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- * The JTS Topology Suite is a collection of Java classes that
- * implement the fundamental operations required to validate a given
- * geo-spatial data set to a known topological specification.
- *
- * Copyright (C) 2001 Vivid Solutions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-package com.vividsolutions.jts.io.geojson;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.parser.JSONParser;
-
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.PrecisionModel;
-import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
-import com.vividsolutions.jts.io.ParseException;
-
-/**
- * Reads a GeoJson Geometry from a JSON fragment into a {@link Geometry}.
- * <p>
- * A specification of the GeoJson format can be found at the GeoJson web site:
- * <a href='http://geojson.org/geojson-spec.html'>http://geojson.org/geojson-spec.html</a>.
- * <p>
- * It is the caller's responsibility to ensure that the supplied
- * {@link PrecisionModel} matches the precision of the incoming data. If a lower
- * precision for the data is required, a subsequent process must be run on the
- * data to reduce its precision.
- *
- * @author Martin Davis
- * @author Paul Howells, Vivid Solutions.
- *
- */
-public class GeoJsonReader {
-
- private GeometryFactory gf;
-
- /**
- * The default constructor uses the SRID from the Geojson CRS and the
- * default <code>PrecisionModel</code> to create a
- * <code>GeometryFactory</code>. If there is no CRS specified then the default
- * CRS is a geographic coordinate reference system, using the WGS84 datum, and
- * with longitude and latitude units of decimal degrees (SRID = 4326)
- */
- public GeoJsonReader() {
- // do nothing
- }
-
- /**
- * This constructor accepts a <code>GeometryFactory</code> that is used
- * to create the output geometries and to override the GeoJson CRS.
- *
- * @param geometryFactory
- * a GeometryFactory
- */
- public GeoJsonReader(GeometryFactory geometryFactory) {
- this.gf = geometryFactory;
- }
-
- /**
- * Reads a GeoJson Geometry from a <tt>String</tt> into a single
- * {@link Geometry}.
- *
- *
- * @param json
- * The GeoJson String to parse
- * @return the resulting JTS Geometry
- *
- * @throws ParseException
- * throws a ParseException if the JSON string cannot be parsed
- */
- public Geometry read(String json) throws ParseException {
- Geometry result = read(new StringReader(json));
- return result;
- }
-
- /**
- * Reads a GeoJson Geometry from a {@link Reader} into a single
- * {@link Geometry}.
- *
- *
- * @param reader
- * The input source
- * @return The resulting JTS Geometry
- *
- * @throws ParseException
- * throws a ParseException if the JSON string cannot be parsed
- */
- public Geometry read(Reader reader) throws ParseException {
-
- Geometry result = null;
-
- JSONParser parser = new JSONParser();
- try {
- @SuppressWarnings("unchecked")
- Map<String, Object> geometryMap = (Map<String, Object>) parser
- .parse(reader);
-
- GeometryFactory geometryFactory = null;
- if (this.gf == null) {
- geometryFactory = this.getGeometryFactory(geometryMap);
- } else {
- geometryFactory = this.gf;
- }
-
- result = create(geometryMap, geometryFactory);
-
- } catch (org.json.simple.parser.ParseException e) {
- throw new ParseException(e);
- } catch (IOException e) {
- throw new ParseException(e);
- }
-
- return result;
- }
-
- private Geometry create(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- String type = (String) geometryMap.get(GeoJsonConstants.NAME_TYPE);
-
- if (type == null) {
- throw new ParseException(
- "Could not parse Geometry from Json string. No 'type' property found.");
- } else {
-
- if (GeoJsonConstants.NAME_POINT.equals(type)) {
- result = createPoint(geometryMap, geometryFactory);
-
- } else if (GeoJsonConstants.NAME_LINESTRING.equals(type)) {
- result = createLineString(geometryMap, geometryFactory);
-
- } else if (GeoJsonConstants.NAME_POLYGON.equals(type)) {
- result = createPolygon(geometryMap, geometryFactory);
-
- } else if (GeoJsonConstants.NAME_MULTIPOINT.equals(type)) {
- result = createMultiPoint(geometryMap, geometryFactory);
-
- } else if (GeoJsonConstants.NAME_MULTILINESTRING.equals(type)) {
- result = createMultiLineString(geometryMap, geometryFactory);
-
- } else if (GeoJsonConstants.NAME_MULTIPOLYGON.equals(type)) {
- result = createMultiPolygon(geometryMap, geometryFactory);
-
- } else if (GeoJsonConstants.NAME_GEOMETRYCOLLECTION.equals(type)) {
- result = createGeometryCollection(geometryMap, geometryFactory);
-
- } else {
- throw new ParseException(
- "Could not parse Geometry from GeoJson string. Unsupported 'type':"
- + type);
- }
- }
-
- return result;
- }
-
- private Geometry createGeometryCollection(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- try {
-
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> geometriesList = (List<Map<String, Object>>) geometryMap
- .get(GeoJsonConstants.NAME_GEOMETRIES);
-
- Geometry[] geometries = new Geometry[geometriesList.size()];
-
- int i = 0;
- for (Map<String, Object> map : geometriesList) {
-
- geometries[i] = this.create(map, geometryFactory);
-
- ++i;
- }
-
- result = geometryFactory.createGeometryCollection(geometries);
-
- } catch (RuntimeException e) {
- throw new ParseException(
- "Could not parse GeometryCollection from GeoJson string.", e);
- }
-
- return result;
- }
-
- private Geometry createMultiPolygon(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- try {
-
- @SuppressWarnings("unchecked")
- List<List<List<List<Number>>>> polygonsList = (List<List<List<List<Number>>>>) geometryMap
- .get(GeoJsonConstants.NAME_COORDINATES);
-
- Polygon[] polygons = new Polygon[polygonsList.size()];
-
- int p = 0;
- for (List<List<List<Number>>> ringsList : polygonsList) {
-
- List<CoordinateSequence> rings = new ArrayList<CoordinateSequence>();
-
- for (List<List<Number>> coordinates : ringsList) {
-
- rings.add(createCoordinateSequence(coordinates));
- }
-
- if (rings.isEmpty()) {
- continue;
- }
-
- LinearRing outer = geometryFactory.createLinearRing(rings.get(0));
- LinearRing[] inner = null;
- if (rings.size() > 1) {
- inner = new LinearRing[rings.size() - 1];
- for (int i = 1; i < rings.size(); i++) {
- inner[i - 1] = geometryFactory.createLinearRing(rings.get(i));
- }
- }
-
- polygons[p] = geometryFactory.createPolygon(outer, inner);
-
- ++p;
- }
-
- result = geometryFactory.createMultiPolygon(polygons);
-
- } catch (RuntimeException e) {
- throw new ParseException(
- "Could not parse MultiPolygon from GeoJson string.", e);
- }
-
- return result;
- }
-
- private Geometry createMultiLineString(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- try {
-
- @SuppressWarnings("unchecked")
- List<List<List<Number>>> linesList = (List<List<List<Number>>>) geometryMap
- .get(GeoJsonConstants.NAME_COORDINATES);
-
- LineString[] lineStrings = new LineString[linesList.size()];
-
- int i = 0;
- for (List<List<Number>> coordinates : linesList) {
-
- lineStrings[i] = geometryFactory
- .createLineString(createCoordinateSequence(coordinates));
-
- ++i;
- }
-
- result = geometryFactory.createMultiLineString(lineStrings);
-
- } catch (RuntimeException e) {
- throw new ParseException(
- "Could not parse MultiLineString from GeoJson string.", e);
- }
-
- return result;
- }
-
- private Geometry createMultiPoint(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- try {
-
- @SuppressWarnings("unchecked")
- List<List<Number>> coordinatesList = (List<List<Number>>) geometryMap
- .get(GeoJsonConstants.NAME_COORDINATES);
-
- CoordinateSequence coordinates = this
- .createCoordinateSequence(coordinatesList);
-
- result = geometryFactory.createMultiPoint(coordinates);
-
- } catch (RuntimeException e) {
- throw new ParseException(
- "Could not parse MultiPoint from GeoJson string.", e);
- }
-
- return result;
- }
-
- private Geometry createPolygon(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- try {
-
- @SuppressWarnings("unchecked")
- List<List<List<Number>>> ringsList = (List<List<List<Number>>>) geometryMap
- .get(GeoJsonConstants.NAME_COORDINATES);
-
- List<CoordinateSequence> rings = new ArrayList<CoordinateSequence>();
-
- for (List<List<Number>> coordinates : ringsList) {
-
- rings.add(createCoordinateSequence(coordinates));
- }
-
- if (rings.isEmpty()) {
- throw new IllegalArgumentException("Polygon specified with no rings.");
- }
-
- LinearRing outer = geometryFactory.createLinearRing(rings.get(0));
- LinearRing[] inner = null;
- if (rings.size() > 1) {
- inner = new LinearRing[rings.size() - 1];
- for (int i = 1; i < rings.size(); i++) {
- inner[i - 1] = geometryFactory.createLinearRing(rings.get(i));
- }
- }
-
- result = geometryFactory.createPolygon(outer, inner);
-
- } catch (RuntimeException e) {
- throw new ParseException("Could not parse Polygon from GeoJson string.",
- e);
- }
-
- return result;
- }
-
- private Geometry createLineString(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- try {
-
- @SuppressWarnings("unchecked")
- List<List<Number>> coordinatesList = (List<List<Number>>) geometryMap
- .get(GeoJsonConstants.NAME_COORDINATES);
-
- CoordinateSequence coordinates = createCoordinateSequence(coordinatesList);
-
- result = geometryFactory.createLineString(coordinates);
-
- } catch (RuntimeException e) {
- throw new ParseException(
- "Could not parse LineString from GeoJson string.", e);
- }
-
- return result;
- }
-
- private Geometry createPoint(Map<String, Object> geometryMap,
- GeometryFactory geometryFactory) throws ParseException {
-
- Geometry result = null;
-
- try {
-
- @SuppressWarnings("unchecked")
- List<Number> coordinateList = (List<Number>) geometryMap
- .get(GeoJsonConstants.NAME_COORDINATES);
-
- CoordinateSequence coordinate = this.createCoordinate(coordinateList);
-
- result = geometryFactory.createPoint(coordinate);
-
- } catch (RuntimeException e) {
- throw new ParseException("Could not parse Point from GeoJson string.", e);
- }
-
- return result;
- }
-
- private GeometryFactory getGeometryFactory(Map<String, Object> geometryMap)
- throws ParseException {
-
- GeometryFactory result = null;
- @SuppressWarnings("unchecked")
- Map<String, Object> crsMap = (Map<String, Object>) geometryMap.get(GeoJsonConstants.NAME_CRS);
- Integer srid = null;
-
- if (crsMap != null) {
-
- try {
-
- @SuppressWarnings("unchecked")
- Map<String, Object> propertiesMap = (Map<String, Object>) crsMap
- .get(GeoJsonConstants.NAME_PROPERTIES);
- String name = (String) propertiesMap.get(GeoJsonConstants.NAME_NAME);
- String[] split = name.split(":");
- String epsg = split[1];
- srid = Integer.valueOf(epsg);
- } catch (RuntimeException e) {
- throw new ParseException(
- "Could not parse SRID from Geojson 'crs' object.", e);
- }
- }
-
- if (srid == null) {
- // The default CRS is a geographic coordinate reference
- // system, using the WGS84 datum, and with longitude and
- // latitude units of decimal degrees. SRID 4326
- srid = Integer.valueOf(4326);
- }
-
- result = new GeometryFactory(new PrecisionModel(), srid.intValue());
- return result;
- }
-
- private CoordinateSequence createCoordinateSequence(
- List<List<Number>> coordinates) {
- CoordinateSequence result = null;
-
- result = new CoordinateArraySequence(coordinates.size());
-
- for (int i = 0; i < coordinates.size(); ++i) {
- List<Number> ordinates = coordinates.get(i);
-
- if (ordinates.size() > 0) {
- result.setOrdinate(i, 0, ordinates.get(0).doubleValue());
- }
- if (ordinates.size() > 1) {
- result.setOrdinate(i, 1, ordinates.get(1).doubleValue());
- }
- if (ordinates.size() > 2) {
- result.setOrdinate(i, 2, ordinates.get(2).doubleValue());
- }
-
- }
-
- return result;
- }
-
- private CoordinateSequence createCoordinate(List<Number> ordinates) {
- CoordinateSequence result = new CoordinateArraySequence(1);
-
- if (ordinates.size() > 0) {
- result.setOrdinate(0, 0, ordinates.get(0).doubleValue());
- }
- if (ordinates.size() > 1) {
- result.setOrdinate(0, 1, ordinates.get(1).doubleValue());
- }
- if (ordinates.size() > 2) {
- result.setOrdinate(0, 2, ordinates.get(2).doubleValue());
- }
-
- return result;
- }
-}
diff --git a/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java b/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java
deleted file mode 100644
index 54abf33..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * The JTS Topology Suite is a collection of Java classes that
- * implement the fundamental operations required to validate a given
- * geo-spatial data set to a known topological specification.
- *
- * Copyright (C) 2001 Vivid Solutions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-package com.vividsolutions.jts.io.geojson;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.JSONAware;
-import org.json.simple.JSONObject;
-
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPoint;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.util.Assert;
-
-/**
- * Writes {@link Geometry}s as JSON fragments in GeoJson format.
- *
- * @author Martin Davis
- * @author Paul Howells, Vivid Solutions
- */
-public class GeoJsonWriter {
-
- public static final String EPSG_PREFIX = "EPSG:";
-
- private double scale;
- private boolean isEncodeCRS = true;
-
- /**
- * Constructs a GeoJsonWriter instance.
- */
- public GeoJsonWriter() {
- this(8);
- }
-
- /**
- * Constructs a GeoJsonWriter instance specifying the number of decimals to
- * use when encoding floating point numbers.
- */
- public GeoJsonWriter(int decimals) {
- this.scale = Math.pow(10, decimals);
- }
-
- public void setEncodeCRS(boolean isEncodeCRS) {
- this.isEncodeCRS = isEncodeCRS;
- }
-
- /**
- * Writes a {@link Geometry} in GeoJson format to a String.
- *
- * @param geometry
- * @return String GeoJson Encoded Geometry
- */
- public String write(Geometry geometry) {
-
- StringWriter writer = new StringWriter();
- try {
- write(geometry, writer);
- } catch (IOException ex) {
- Assert.shouldNeverReachHere();
- }
-
- return writer.toString();
- }
-
- /**
- * Writes a {@link Geometry} in GeoJson format into a {@link Writer}.
- *
- * @param geometry
- * Geometry to encode
- * @param writer
- * Stream to encode to.
- * @throws IOException
- * throws an IOException when unable to write the JSON string
- */
- public void write(Geometry geometry, Writer writer) throws IOException {
- Map<String, Object> map = create(geometry, isEncodeCRS);
- JSONObject.writeJSONString(map, writer);
- writer.flush();
- }
-
- private Map<String, Object> create(Geometry geometry, boolean encodeCRS) {
-
- Map<String, Object> result = new LinkedHashMap<String, Object>();
- result.put(GeoJsonConstants.NAME_TYPE, geometry.getGeometryType());
-
- if (geometry instanceof Point) {
- Point point = (Point) geometry;
-
- final String jsonString = getJsonString(point.getCoordinateSequence());
-
- result.put(GeoJsonConstants.NAME_COORDINATES, new JSONAware() {
-
- public String toJSONString() {
- return jsonString;
- }
- });
-
- } else if (geometry instanceof LineString) {
- LineString lineString = (LineString) geometry;
-
- final String jsonString = getJsonString(lineString
- .getCoordinateSequence());
-
- result.put(GeoJsonConstants.NAME_COORDINATES, new JSONAware() {
-
- public String toJSONString() {
- return jsonString;
- }
- });
-
- } else if (geometry instanceof Polygon) {
- Polygon polygon = (Polygon) geometry;
-
- result.put(GeoJsonConstants.NAME_COORDINATES, makeJsonAware(polygon));
-
- } else if (geometry instanceof MultiPoint) {
- MultiPoint multiPoint = (MultiPoint) geometry;
-
- result.put(GeoJsonConstants.NAME_COORDINATES, makeJsonAware(multiPoint));
-
- } else if (geometry instanceof MultiLineString) {
- MultiLineString multiLineString = (MultiLineString) geometry;
-
- result.put(GeoJsonConstants.NAME_COORDINATES, makeJsonAware(multiLineString));
-
- } else if (geometry instanceof MultiPolygon) {
- MultiPolygon multiPolygon = (MultiPolygon) geometry;
-
- result.put(GeoJsonConstants.NAME_COORDINATES, makeJsonAware(multiPolygon));
-
- } else if (geometry instanceof GeometryCollection) {
- GeometryCollection geometryCollection = (GeometryCollection) geometry;
-
- ArrayList<Map<String, Object>> geometries = new ArrayList<Map<String, Object>>(
- geometryCollection.getNumGeometries());
-
- for (int i = 0; i < geometryCollection.getNumGeometries(); i++) {
- geometries.add(create(geometryCollection.getGeometryN(i), false));
- }
-
- result.put(GeoJsonConstants.NAME_GEOMETRIES, geometries);
-
- } else {
- throw new IllegalArgumentException("Unable to encode geometry " + geometry.getGeometryType() );
- }
-
- if (encodeCRS) {
- result.put(GeoJsonConstants.NAME_CRS, createCRS(geometry.getSRID()));
- }
-
- return result;
- }
-
- private Map<String, Object> createCRS(int srid) {
-
- Map<String, Object> result = new LinkedHashMap<String, Object>();
- result.put(GeoJsonConstants.NAME_TYPE, GeoJsonConstants.NAME_NAME);
-
- Map<String, Object> props = new LinkedHashMap<String, Object>();
- props.put(GeoJsonConstants.NAME_NAME, EPSG_PREFIX + srid);
-
- result.put(GeoJsonConstants.NAME_PROPERTIES, props);
-
- return result;
- }
-
- private List<JSONAware> makeJsonAware(Polygon poly) {
- ArrayList<JSONAware> result = new ArrayList<JSONAware>();
-
- {
- final String jsonString = getJsonString(poly.getExteriorRing()
- .getCoordinateSequence());
- result.add(new JSONAware() {
-
- public String toJSONString() {
- return jsonString;
- }
- });
- }
- for (int i = 0; i < poly.getNumInteriorRing(); i++) {
- final String jsonString = getJsonString(poly.getInteriorRingN(i)
- .getCoordinateSequence());
- result.add(new JSONAware() {
-
- public String toJSONString() {
- return jsonString;
- }
- });
- }
-
- return result;
- }
-
- private List<Object> makeJsonAware(GeometryCollection geometryCollection) {
-
- ArrayList<Object> list = new ArrayList<Object>(
- geometryCollection.getNumGeometries());
- for (int i = 0; i < geometryCollection.getNumGeometries(); i++) {
- Geometry geometry = geometryCollection.getGeometryN(i);
-
- if (geometry instanceof Polygon) {
- Polygon polygon = (Polygon) geometry;
- list.add(makeJsonAware(polygon));
- }
- else if (geometry instanceof LineString) {
- LineString lineString = (LineString) geometry;
- final String jsonString = getJsonString(lineString
- .getCoordinateSequence());
- list.add(new JSONAware() {
-
- public String toJSONString() {
- return jsonString;
- }
- });
- }
- else if (geometry instanceof Point) {
- Point point = (Point) geometry;
- final String jsonString = getJsonString(point.getCoordinateSequence());
- list.add(new JSONAware() {
-
- public String toJSONString() {
- return jsonString;
- }
- });
- }
- }
-
- return list;
- }
-
- private String getJsonString(CoordinateSequence coordinateSequence) {
- StringBuffer result = new StringBuffer();
-
- if (coordinateSequence.size() > 1) {
- result.append("[");
- }
- for (int i = 0; i < coordinateSequence.size(); i++) {
- if (i > 0) {
- result.append(",");
- }
- result.append("[");
- result.append(formatOrdinate(coordinateSequence.getOrdinate(i, CoordinateSequence.X)));
- result.append(",");
- result.append(formatOrdinate(coordinateSequence.getOrdinate(i, CoordinateSequence.Y)));
-
- if (coordinateSequence.getDimension() > 2 ) {
- double z = coordinateSequence.getOrdinate(i, CoordinateSequence.Z);
- if (! Double.isNaN(z)) {
- result.append(",");
- result.append(formatOrdinate(z));
- }
- }
-
- result.append("]");
-
- }
-
- if (coordinateSequence.size() > 1) {
- result.append("]");
- }
-
- return result.toString();
- }
-
- private String formatOrdinate(double x) {
- String result = null;
-
- if (Math.abs(x) >= Math.pow(10, -3) && x < Math.pow(10, 7)) {
- x = Math.floor(x * scale + 0.5) / scale;
- long lx = (long) x;
- if (lx == x) {
- result = Long.toString(lx);
- } else {
- result = Double.toString(x);
- }
- } else {
- result = Double.toString(x);
- }
-
- return result;
- }
-
-}
diff --git a/jtsio/src/com/vividsolutions/jts/io/oracle/OraGeom.java b/jtsio/src/com/vividsolutions/jts/io/oracle/OraGeom.java
deleted file mode 100644
index 8a79d3c..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/oracle/OraGeom.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * The JTS Topology Suite is a collection of Java classes that
- * implement the fundamental operations required to validate a given
- * geo-spatial data set to a known topological specification.
- *
- * Copyright (C) 2001 Vivid Solutions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-package com.vividsolutions.jts.io.oracle;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPoint;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-
-/**
- * Represents the contents of an Oracle SDO_GEOMETRY structure.
- * Also provides code values and convenience methods for working
- * with SDO_GEOMETRY values.
- *
- * @author Martin Davis
- *
- */
-class OraGeom
-{
- public static final int NULL_DIMENSION = -1;
-
- private static NumberFormat fmt = new DecimalFormat("0.################");
-
- public static final String SQL_NULL = "NULL";
-
- int gType;
- int srid;
- double[] point = null;
- int[] elemInfo = null;
- double[] ordinates = null;
- private int geomType;
- private int ordDim;
- private int lrsDim;
-
- public OraGeom(int gType, int srid, double[] ptType, int[] elemInfo, double[] ordinates)
- {
- this.gType = gType;
- this.srid = srid;
- this.point = ptType;
- this.elemInfo = elemInfo;
- this.ordinates = ordinates;
- geomType = gTypeGeomType(gType);
- ordDim = gTypeDim(gType);
- lrsDim = gTypeMeasureDim(gType);
- }
-
- public OraGeom(int gType, int srid, int[] elemInfo, double[] ordinates)
- {
- this(gType, srid, null, elemInfo, ordinates);
- }
-
- public OraGeom(int gType, int srid, double[] ptType)
- {
- this(gType, srid, ptType, null, null);
- }
-
- public int geomType()
- {
- return geomType;
- }
-
- public int ordDim()
- {
- return ordDim;
- }
-
- public int lrsDim()
- {
- return lrsDim;
- }
-
- public boolean isCompactPoint()
- {
- return lrsDim == 0 && geomType == OraGeom.GEOM_TYPE.POINT && point != null && elemInfo == null;
- }
-
- public boolean isEqual(OraGeom og)
- {
- if (gType != og.gType) return false;
-// if (srid != og.srid) return false;
- if (! isEqual(point, og.point))
- return false;
- // assume is defined by elemInfo and ordinates
- if (! isEqual(elemInfo, og.elemInfo))
- return false;
- if (! isEqual(ordinates, og.ordinates))
- return false;
- return true;
- }
-
- private boolean isEqual(double[] a1, double[] a2)
- {
- if (a2 == null || a1 == null) {
- return a2 == a1;
- }
- if (a1.length != a2.length) return false;
- for (int i = 0; i < a1.length; i++) {
- // check NaN == NaN
- if (Double.isNaN(a1[i]) && Double.isNaN(a2[i]))
- continue;
- if (a1[i] != a2[i])
- return false;
- }
- return true;
- }
- private boolean isEqual(int[] a1, int[] a2)
- {
- if (a2 == null || a1 == null) {
- return a2 == a1;
- }
- if (a1.length != a2.length) return false;
- for (int i = 0; i < a1.length; i++) {
- if (a1[i] != a2[i]) return false;
- }
- return true;
- }
-
- public String toString()
- {
- return toSQLString();
- /*
- return "GTYPE=" + gType
- + " SRID=" + srid
- + " ELEM_INFO=" + toStringElemInfo(elemInfo)
- + " ORDS=" + toString(ordinates);
- */
- }
-
- public String toSQLString()
- {
- StringBuffer buf = new StringBuffer();
- buf.append("SDO_GEOMETRY(");
-
- buf.append(gType);
- buf.append(",");
-
- buf.append(srid >= 0 ? String.valueOf(srid) : SQL_NULL);
- buf.append(",");
-
- buf.append(toStringPointType());
- buf.append(",");
-
- buf.append(toStringElemInfo());
- buf.append(",");
-
- buf.append(toStringOrdinates());
- buf.append(")");
-
- return buf.toString();
- }
-
- private String toString(double[] ordinates)
- {
- if (ordinates == null) return SQL_NULL;
-
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < ordinates.length; i++) {
- if (i > 0) {
- buf.append(",");
- // spacer between triplets
- if (i % ordDim == 0)
- buf.append(" ");
- }
- buf.append(number(ordinates[i]));
- }
- return buf.toString();
- }
-
- private static String number(double d)
- {
- if (Double.isNaN(d)) return SQL_NULL;
- return fmt.format(d);
- }
-
- public static String toStringElemInfo(int[] elemInfo)
- {
- if (elemInfo == null) return "null";
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < elemInfo.length; i++) {
- if (i > 0) {
- buf.append(",");
- // spacer between triplets
- if (i % 3 == 0)
- buf.append(" ");
- }
- buf.append(elemInfo[i]);
- }
- return buf.toString();
- }
-
- private Object toStringOrdinates() {
- if (ordinates == null) {
- return SQL_NULL;
- }
- return "SDO_ORDINATE_ARRAY(" + toString(ordinates) + ")";
- }
-
- private Object toStringElemInfo() {
- if (elemInfo == null) {
- return SQL_NULL;
- }
- return "SDO_ELEM_INFO_ARRAY(" + toStringElemInfo(elemInfo) + ")";
- }
-
- private Object toStringPointType() {
- if (point == null) {
- return SQL_NULL;
- }
- return "SDO_POINT_TYPE("
- + number(point[0]) + ","
- + number(point[1]) + ","
- + number(point[2])
- + ")";
- }
-
-public int startingOffset(int elemIndex)
- {
- // if beyond actual elements, return "virtual" startingOffset
- if (((elemIndex * 3)) >= elemInfo.length) {
- return ordinates.length + 1;
- }
- return elemInfo[elemIndex * 3];
- }
-
- /**
- * Extracts the SDO_ELEM_INFO ETYPE value for a given triplet.
- *
- * @param elemIndex index of the triplet to read
- * @return ETYPE for indicated triplet, or -1 if the triplet index is out of range
- *
- * @see ETYPE
- */
- public int eType(int elemIndex)
- {
- if (((elemIndex * 3) + 1) >= elemInfo.length) {
- return -1;
- }
- return elemInfo[(elemIndex * 3) + 1];
- }
-
- /**
- * Extracts the SDO_ELEM_INFO interpretation value (SDO_INTERPRETATION) for a given triplet.
- * <p>
- * JTS valid interpretation values are: 1 for straight edges, 3 for rectangle
- * Other interpretation value include: 2 for arcs, 4 for circles
- *
- * @param elemIndex index of the triplet to read
- * @return interpretation value, or -1 if the triplet index is out of range
- */
- public int interpretation(int elemIndex)
- {
- if (((elemIndex * 3) + 2) >= elemInfo.length) {
- return -1;
- }
- return elemInfo[(elemIndex * 3) + 2];
- }
-
- public int ordinateLen()
- {
- if (ordinates != null)
- return ordinates.length;
- return 0;
- }
-
- public int numElements()
- {
- if (elemInfo == null) return 0;
- return elemInfo.length / 3;
- }
- /**
- * Computes the SDO_GTYPE code for the given D, L, and TT components.
- *
- * @param dim the coordinate dimension
- * @param lrsDim the measure dimension
- * @param geomType the geometry type code
- * @return the SDO_GTYPE code
- */
- public static int gType(int dim, int lrsDim, int geomType)
- {
- return dim * 1000 + lrsDim * 100 + geomType;
- }
-
- /**
- * Returns the GTYPE GEOM_TYPE code
- * corresponding to the geometry type.
- *
- * @see OraGeom.GEOM_TYPE
- *
- * @param geom the geometry to compute the GEOM_TYPE for
- * @return geom type code, if known, or UNKNOWN
- */
- static int geomType(Geometry geom) {
- if (geom == null) {
- return OraGeom.GEOM_TYPE.UNKNOWN_GEOMETRY;
- } else if (geom instanceof Point) {
- return OraGeom.GEOM_TYPE.POINT;
- } else if (geom instanceof LineString) {
- return OraGeom.GEOM_TYPE.LINE;
- } else if (geom instanceof Polygon) {
- return OraGeom.GEOM_TYPE.POLYGON;
- } else if (geom instanceof MultiPoint) {
- return OraGeom.GEOM_TYPE.MULTIPOINT;
- } else if (geom instanceof MultiLineString) {
- return OraGeom.GEOM_TYPE.MULTILINE;
- } else if (geom instanceof MultiPolygon) {
- return OraGeom.GEOM_TYPE.MULTIPOLYGON;
- } else if (geom instanceof GeometryCollection) {
- return OraGeom.GEOM_TYPE.COLLECTION;
- }
- return OraGeom.GEOM_TYPE.UNKNOWN_GEOMETRY;
- }
-
- /**
- * Extracts the coordinate dimension containing the Measure value from
- * an SDO_GTYPE code.
- * For a measured geometry this is 0, 3 or 4. 0 indicates that the last dimension is the measure dimension
- * For an non-measured geometry this is 0.
- *
- * @param gType an SDO_GTYPE code
- * @return the Measure dimension
- */
- static int gTypeMeasureDim(int gType) {
- return (gType % 1000) / 100;
- }
-
- /**
- * Extracts the coordinate dimension from an SDO_GTYPE code.
- *
- * @param gType an SDO_GTYPE code
- * @return the coordinate dimension
- */
- static int gTypeDim(int gType) {
- return gType / 1000;
- }
-
- /**
- * Extracts the GEOM_TYPE code from an SDO_GTYPE code.
- *
- * @param gType an SDO_GTYPE code
- * @return the GEOM_TYPE code
- */
- static int gTypeGeomType(int gType) {
- return gType % 100;
- }
-
- /**
- * Extracts the SDO_ELEM_INFO start index (SDO_STARTING_OFFSET) in the ordinate array for a given triplet.
- * Starting offsets are 1-based indexes.
- *
- * @param elemInfo the SDO_ELEM_INFO array
- * @param tripletIndex index of the triplet to read
- * @return Starting Offset, or -1 if the triplet index is too large
- */
- static int startingOffset(int[] elemInfo, int tripletIndex) {
- if (((tripletIndex * 3) + 0) >= elemInfo.length) {
- return -1;
- }
- return elemInfo[(tripletIndex * 3) + 0];
- }
-
- /**
- * Extracts the SDO_ELEM_INFO interpretation value (SDO_INTERPRETATION) for a given triplet.
- * <p>
- * JTS valid interpretation values are: 1 for straight edges, 3 for rectangle
- * Other interpretation value include: 2 for arcs, 4 for circles
- *
- * @param elemInfo the SDO_ELEM_INFO array
- * @param tripletIndex index of the triplet to read
- * @return interpretation value, or -1 if the triplet index is too large
- */
- static int interpretation(int[] elemInfo, int tripletIndex) {
- if (((tripletIndex * 3) + 2) >= elemInfo.length) {
- return -1;
- }
- return elemInfo[(tripletIndex * 3) + 2];
- }
-
- /**
- * Extracts the SDO_ELEM_INFO ETYPE value for a given triplet.
- * <p>
- * @see OraGeom.ETYPE for an indication of possible values
- *
- * @param elemInfo the SDO_ELEM_INFO array
- * @param tripletIndex index of the triplet to read
- * @return ETYPE for indicated triplet, or -1 if the triplet index is too large
- */
- static int eType(int[] elemInfo, int tripletIndex) {
- if (((tripletIndex * 3) + 1) >= elemInfo.length) {
- return -1;
- }
- return elemInfo[(tripletIndex * 3) + 1];
- }
-
- /**
- * Codes used in SDO_INTERPRETATION attribute.
- *
- * @author Martin Davis
- *
- */
- static final class INTERP {
-
- public static final int POINT = 1;
-
- public static final int LINESTRING = 1;
-
- public static final int POLYGON = 1;
-
- public static final int RECTANGLE = 3;
-
- }
-
- /**
- * Codes used to specify geometry type
- * These are used in the last two digits in a GTYPE value.
- */
- static final class GEOM_TYPE {
-
- /** <code>TT</code> code representing Unknown type */
- public static final int UNKNOWN_GEOMETRY = 00;
-
- /** <code>TT</code> code representing Point */
- public static final int POINT = 01;
-
- /** <code>TT</code> code representing Line (or Curve) */
- public static final int LINE = 02;
-
- /** <code>TT</code> code representing Polygon */
- public static final int POLYGON = 03;
-
- /** <code>TT</code> code representing Collection */
- public static final int COLLECTION = 04;
-
- /** <code>TT</code> code representing MultiPoint */
- public static final int MULTIPOINT = 05;
-
- /** <code>TT</code> code representing MultiLine (or MultiCurve) */
- public static final int MULTILINE = 06;
-
- /** <code>TT</code> code representing MULTIPOLYGON */
- public static final int MULTIPOLYGON = 07;
- }
-
- /**
- * Codes used in the SDO_ETYPE attribute.
- * The code indicates the type of element denoted by an SDO_ELEM_INFO triplet.
- */
- static final class ETYPE
- {
- /** <code>ETYPE</code> code representing Point */
- public static final int POINT = 1;
-
- /** <code>ETYPE</code> code representing Line */
- public static final int LINE = 2;
-
- /** <code>ETYPE</code> code representing Polygon ring
- * Shell or hole is determined by orientation (CCW or CW).
- * Now deprecated.
- */
- public static final int POLYGON = 3;
-
- /**
- * <code>ETYPE</code> code representing exterior counterclockwise polygon ring
- */
- public static final int POLYGON_EXTERIOR = 1003;
-
- /** <code>ETYPE</code> code representing interior clockwise polygon ring */
- public static final int POLYGON_INTERIOR = 2003;
- }
-
- /**
- * Oracle types used by SDO_GEOMETRY
- */
- public static final String TYPE_GEOMETRY = "MDSYS.SDO_GEOMETRY";
- public static final String TYPE_ELEM_INFO_ARRAY = "MDSYS.SDO_ELEM_INFO_ARRAY";
- public static final String TYPE_ORDINATE_ARRAY = "MDSYS.SDO_ORDINATE_ARRAY";
- public static final String TYPE_POINT_TYPE = "MDSYS.SDO_POINT_TYPE";
-
- /**
- * Value indicating a Null SRID.
- */
- public static final int SRID_NULL = -1;
-
-
-}
diff --git a/jtsio/src/com/vividsolutions/jts/io/oracle/OraReader.java b/jtsio/src/com/vividsolutions/jts/io/oracle/OraReader.java
deleted file mode 100644
index 70bc1c3..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/oracle/OraReader.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * The JTS Topology Suite is a collection of Java classes that
- * implement the fundamental operations required to validate a given
- * geo-spatial data set to a known topological specification.
- *
- * Copyright (C) 2001 Vivid Solutions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-/*
- * Geotools2 - OpenSource mapping toolkit
- * http://geotools.org
- * (C) 2003, Geotools Project Managment Committee (PMC)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- */
-package com.vividsolutions.jts.io.oracle;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import oracle.sql.ARRAY;
-import oracle.sql.Datum;
-import oracle.sql.STRUCT;
-
-import com.vividsolutions.jts.algorithm.CGAlgorithms;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPoint;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.PrecisionModel;
-
-/**
- * Reads a {@link Geometry} from an Oracle <code>MDSYS.GEOMETRY</code> <code>STRUCT</code> object.
- * <p>
- * The following Oracle geometry types are supported:
- * <ul>
- * <li>POINT, MULTIPOINT
- * <li>LINE, MULTILINE
- * <li>POLYGON, MULTIPOLYGON
- * </ul>
- * The optimized representations of <code>SDO_POINT</code>
- * and <code>RECTANGLE</code> are supported in the following way:
- * <ul>
- * <li>If the <code>SDO_POINT</code> attribute is present
- * and <code>SDO_ELEM_INFO</code> and <code>SDO_ORDINATES</code> are not,
- * a {@link Point} geometry is read.
- * Otherwise, the geometry specified by the latter two attributes is read.
- * <li><code>RECTANGLE</code>s are converted to equivalent {@link Polygon}s
- * </ul>
- * <p>
- * A {@link GeometryFactory} may be provided, otherwise a default one will be used.
- * If a {@link PrecisionModel} other than {@link PrecisionModel#FLOATING}
- * is supplied it is the client's responsibility
- * to ensure that it matches the precision of the incoming data.
- * If a lower precision for the data is required, a subsequent
- * process must be run on the data to reduce its precision.
- * <p>
- * The coordinate dimension of the output is determined as follows:
- * <ul>
- * <li>by default, the coordinate dimension matches that of the input
- * <li>the coordinate dimension can be set explicitly by the {@link #setDimension(int)} method
- * <li>finally, the coordinate dimension is limited by the maximum dimension supported
- * by the provided {@link CoordinateSequenceFactory}.
- * </ul>
- * The Geometry SRID field is populated from the input Geometry.
- * <p>
- * To use this class a suitable Oracle JDBC JAR must be present in the classpath.
- *
- * <h3>LIMITATIONS</h3>
- * <ul>
- * <li>Geometries with Measures (XYM or XYZM) can be read, but the Measure values are not preserved
- * <li>Oracle geometries with a GTYPE of <code>43xx</code> (XYMZ) are not supported.
- * <li>Geometries containing arcs are not supported
- * <li>Surface and solid geometries are not supported
- * <li>There is currently no way to read ancillary SDO_POINT information
- * </ul>
- *
- * @author Martin Davis
- */
-public class OraReader
-{
- //TODO: add a strict mode, that checks for ordinate length & other errors?
-
- private GeometryFactory geometryFactory;
-
- private int outputDimension = OraGeom.NULL_DIMENSION;
-
- /**
- * Creates a new reader, with a default {@link GeometryFactory}.
- *
- * @see #OraReader(GeometryFactory)
- */
- public OraReader() {
- this(new GeometryFactory());
- }
-
- /**
- * Creates a new reader, with the supplied {@link GeometryFactory}.
- * It is assumed that the supplied {@link PrecisionModel}
- * matches the precision of the incoming data -
- * coordinates are <b>not</b> made precise when read.
- *
- * @param gf A non-null geometry factory for later use.
- *
- * @throws NullPointerException when the geometry factory is null.
- */
- public OraReader(GeometryFactory gf) {
- if (gf == null)
- throw new NullPointerException("Geometry Factory may not be Null");
- this.geometryFactory = gf;
- }
-
- /**
- * Gets the coordinate dimension which will be created.
- *
- * @return the coordinate dimension which will be created
- */
- public int getDimension() {
- return outputDimension;
- }
-
- /**
- * Sets the coordinate dimension to use for created geometries.
- *
- * @param outputDimension
- * the coordinate dimension to create
- */
- public void setDimension(int outputDimension) {
- if (outputDimension < 2)
- throw new IllegalArgumentException("Output dimension must be >= 2");
- this.outputDimension = outputDimension;
- }
-
- /**
- * Reads a {@link Geometry} representing the MDSYS.GEOMETRY
- * provided in the STRUCT. The type of geometry created
- * depends on the Geometry type specified within the STRUCT.
- * The SRID of the created geometry is set to be the same as the input SRID.
- *
- * @param struct The MDSYS.GEOMETRY Object to decode
- * @return the Geometry if one could be created, null otherwise
- *
- * @throws SQLException if a read error occurs while accessing the struct
- * @throws IllegalArgumentException if an unsupported geometry type or encoding error is found
- */
- public Geometry read(STRUCT struct) throws SQLException
- {
- // Return null for null input
- if (struct == null)
- return null;
-
- Datum data[] = struct.getOracleAttributes();
-
- int gType = OraUtil.toInteger(data[0], 0);
- int SRID = OraUtil.toInteger(data[1], OraGeom.SRID_NULL);
- double point[] = OraUtil.toDoubleArray((STRUCT) data[2], Double.NaN);
- int elemInfo[] = OraUtil.toIntArray((ARRAY) data[3], 0);
- double ordinates[] = OraUtil.toDoubleArray((ARRAY) data[4], Double.NaN);
- OraGeom oraGeom = new OraGeom(gType, SRID, point, elemInfo, ordinates);
- Geometry geom = read(oraGeom);
-
- // Set SRID of created Geometry to be the same as input (regardless of geomFactory SRID)
- if (geom != null)
- geom.setSRID(SRID);
- return geom;
- }
-
- /**
- * Reads a {@link Geometry} from SDO_GEOMETRY attributes.
- *
- * @param oraGeom the Oracle geometry to read
- * @return the Geometry read
- * @throws IllegalArgumentException when an encoding error or unsupported geometry type is found
- */
- Geometry read(OraGeom oraGeom) {
- int ordDim = oraGeom.ordDim();
- if (ordDim < 2) {
- throw new IllegalArgumentException("Dimension D = " + ordDim + " is not supported by JTS. " +
- "Either specify a valid dimension or use Oracle Locator Version 9i or later");
- }
- // read from SDO_POINT_TYPE, if that carries the primary geometry data
- if (oraGeom.isCompactPoint()) {
- CoordinateSequence ptCoord = extractCoords(oraGeom, oraGeom.point);
- return createPoint(ptCoord);
- }
-
- CoordinateSequence coords = null;
-
- switch (oraGeom.geomType()) {
- case OraGeom.GEOM_TYPE.POINT:
- return readPoint(oraGeom, 0);
- case OraGeom.GEOM_TYPE.LINE:
- return readLine(oraGeom, 0);
- case OraGeom.GEOM_TYPE.POLYGON:
- return readPolygon(oraGeom, 0);
- case OraGeom.GEOM_TYPE.MULTIPOINT:
- return readMultiPoint(oraGeom, 0);
- case OraGeom.GEOM_TYPE.MULTILINE:
- return readMultiLine(oraGeom);
- case OraGeom.GEOM_TYPE.MULTIPOLYGON:
- return readMultiPolygon(oraGeom);
- case OraGeom.GEOM_TYPE.COLLECTION:
- return readCollection(oraGeom);
- default:
- throw new IllegalArgumentException("GTYPE " + oraGeom.gType + " is not supported");
- }
- }
-
- /**
- * Create a {@link GeometryCollection} as specified by elemInfo. Note that in
- * Oracle, unlike the SFS and JTS, collections contain only atomic types or
- * (possibly) MultiPoints. This makes them simpler to parse.
- *
- * @param oraGeom
- * SDO_GEOMETRY attributes being read
- * @param coords
- * the coordinates of the entire geometry
- * @return GeometryCollection
- *
- * @throws IllegalArgumentException
- * when an encoding error or unsupported geometry type is found
- */
- private GeometryCollection readCollection(OraGeom oraGeom)
- {
- checkOrdinates(oraGeom, 0, "GeometryCollection");
-
- int nElem = oraGeom.numElements();
- List geomList = new ArrayList();
- boolean cont = true;
- for (int i = 0; cont && i < nElem; i++) {
- int etype = oraGeom.eType(i);
- int interpretation = oraGeom.interpretation(i);
- Geometry geom;
-
- switch (etype) {
- case -1:
- cont = false; // We are at the end of the list - get out of here
- continue;
-
- case OraGeom.ETYPE.POINT:
- if (interpretation == OraGeom.INTERP.POINT) {
- geom = readPoint(oraGeom, i);
- } else if (interpretation > 1) {
- geom = readMultiPoint(oraGeom, i);
- } else {
- throw new IllegalArgumentException("ETYPE.POINT requires INTERPRETATION >= 1");
- }
- break;
-
- case OraGeom.ETYPE.LINE:
- geom = readLine(oraGeom, i);
- break;
-
- case OraGeom.ETYPE.POLYGON:
- case OraGeom.ETYPE.POLYGON_EXTERIOR:
- geom = readPolygon(oraGeom, i);
- i += ((Polygon) geom).getNumInteriorRing();
- break;
-
- case OraGeom.ETYPE.POLYGON_INTERIOR:
- throw new IllegalArgumentException(
- "ETYPE 2003 (Polygon Interior) not expected in a Collection");
-
- default:
- throw new IllegalArgumentException("ETYPE " + etype
- + " not representable as a JTS Geometry."
- + "(Custom and Compound Straight and Curved Geometries not supported)");
- }
- geomList.add(geom);
- }
- GeometryCollection geoms = geometryFactory.createGeometryCollection(GeometryFactory.toGeometryArray(geomList));
- return geoms;
- }
-
- /**
- * Create MultiPolygon as encoded by elemInfo.
- *
- * @param oraGeom SDO_GEOMETRY attributes being read
- * @param coords the coordinates of the entire geometry
- * @return MultiPolygon
- */
- private MultiPolygon readMultiPolygon(OraGeom oraGeom)
- {
- int nElem = oraGeom.numElements();
- List geoms = new ArrayList();
- for (int i = 0; i < nElem; i++) {
- int etype = oraGeom.eType(i);
- if ((etype == OraGeom.ETYPE.POLYGON) || (etype == OraGeom.ETYPE.POLYGON_EXTERIOR)) {
- Polygon poly = readPolygon(oraGeom, i);
- i += poly.getNumInteriorRing(); // skip interior rings
- geoms.add(poly);
- }
- else { // not a Polygon - stop reading
- break;
- }
- }
- MultiPolygon polys = geometryFactory.createMultiPolygon(GeometryFactory.toPolygonArray(geoms));
- return polys;
- }
-
- /**
- * Create MultiLineString as encoded by elemInfo.
- *
- * @param oraGeom SDO_GEOMETRY attributes being read
- * @param coords the coordinates of the entire geometry
- * @return MultiLineString
- */
- private MultiLineString readMultiLine(OraGeom oraGeom)
- {
- int nElem = oraGeom.numElements();
- List geoms = new ArrayList();
- for (int i = 0; i < nElem; i++) {
- int etype = oraGeom.eType(i);
- // stop reading if not a line
- if (etype != OraGeom.ETYPE.LINE)
- break;
- geoms.add(readLine(oraGeom, i));
- }
- MultiLineString lines = geometryFactory.createMultiLineString(GeometryFactory.toLineStringArray(geoms));
- return lines;
- }
-
- /**
- * Create MultiPoint as encoded by elemInfo.
- *
- * @param oraGeom SDO_GEOMETRY attributes being read
- * @param elemIndex the element being read
- * @param coords the coordinates of the entire geometry
- * @return MultiPoint
- */
- private MultiPoint readMultiPoint(OraGeom oraGeom, int elemIndex)
- {
- CoordinateSequence seq;
- /**
- * Special handling when GTYPE is MULTIPOINT.
- * In this case all ordinates are read as a single MultiPoint, regardless of elemInfo contents.
- * This is because MultiPoints can be encoded as either a single MULTI elemInfo,
- * or as multiple POINT elemInfos
- */
- if (oraGeom.geomType() == OraGeom.GEOM_TYPE.MULTIPOINT) {
- seq = extractCoords(oraGeom, oraGeom.ordinates);
- }
- else {
- int etype = oraGeom.eType(elemIndex);
- int interpretation = oraGeom.interpretation(elemIndex);
-
- checkOrdinates(oraGeom, elemIndex, "MultiPoint");
- checkETYPE(etype, OraGeom.ETYPE.POINT, "MultiPoint");
- // MultiPoints have a unique interpretation code
- if (! (interpretation >= 1)){
- errorInterpretation(interpretation, "MultiPoint");
- }
- seq = extractCoords(oraGeom, elemIndex);
- }
- MultiPoint points = geometryFactory.createMultiPoint(seq);
- return points;
- }
-
- /**
- * Read {@link Polygon) from encoded geometry.
- *
- * @param oraGeom SDO_GEOMETRY attributes being read
- * @param elemIndex the element being read
- * @param coords the coordinates of the entire geometry
- * @return Polygon as encoded by elemInfo, or null when faced with and
- * encoding that can not be captured by JTS
- * @throws IllegalArgumentException When faced with an invalid SDO encoding
- */
- private Polygon readPolygon(OraGeom oraGeom, int elemIndex)
- {
- int etype = oraGeom.eType(elemIndex);
- int interpretation = oraGeom.interpretation(elemIndex);
-
- checkOrdinates(oraGeom, elemIndex, "Polygon");
- checkETYPE(etype,OraGeom.ETYPE.POLYGON, OraGeom.ETYPE.POLYGON_EXTERIOR, "Polygon");
- checkInterpretation(interpretation, OraGeom.INTERP.POLYGON, OraGeom.INTERP.RECTANGLE, "Polygon");
-
- int nElem = oraGeom.numElements();
- // ETYPE is either POLYGON or POLYGON_EXTERIOR
- LinearRing exteriorRing = readLinearRing(oraGeom, elemIndex);
-
- /**
- * Holes are read as long as ETYPE = POLYGON_INTERIOR
- * or ETYPE = POLYGON && orient = CW (Hole)
- */
- List holeRings = new ArrayList();
- for (int i = elemIndex + 1; i < nElem; i++) {
- etype = oraGeom.eType(i);
- if (etype == OraGeom.ETYPE.POLYGON_INTERIOR) {
- holeRings.add(readLinearRing(oraGeom, i));
- }
- else if (etype == OraGeom.ETYPE.POLYGON) {
- // test orientation of Ring to see if it is
- // an interior (hole) ring
- LinearRing ring = readLinearRing(oraGeom, i);
- // TODO: use the coordSeq directly (requires new CGAlgorithms method)
- boolean isHole = ! CGAlgorithms.isCCW(ring.getCoordinates());
- // if not a hole, exit
- if (! isHole)
- break;
- // it is an Interior Hole
- holeRings.add(ring);
- }
- else { // not a LinearRing - get out of here
- break;
- }
- }
- Polygon poly = geometryFactory.createPolygon(exteriorRing,
- GeometryFactory.toLinearRingArray(holeRings));
- return poly;
- }
-
- /**
- * Create LinearRing for exterior/interior polygon ELEM_INFO triplets.
- *
- * @param oraGeom SDO_GEOMETRY attributes being read
- * @param elemIndex the element being read
- * @param coords the coordinates of the entire geometry
- * @return LinearRing
- *
- * @throws IllegalArgumentException If circle, or curve is requested
- */
- private LinearRing readLinearRing(OraGeom oraGeom, int elemIndex)
- {
- int etype = oraGeom.eType(elemIndex);
- int interpretation = oraGeom.interpretation(elemIndex);
-
- checkOrdinates(oraGeom, elemIndex, "Polygon");
- checkETYPE(etype,OraGeom.ETYPE.POLYGON, OraGeom.ETYPE.POLYGON_EXTERIOR, OraGeom.ETYPE.POLYGON_INTERIOR, "Polygon");
- checkInterpretation(interpretation, OraGeom.INTERP.POLYGON, OraGeom.INTERP.RECTANGLE, "Polygon");
-
- CoordinateSequence seq = extractCoords(oraGeom, elemIndex);
- LinearRing ring;
- if (interpretation == OraGeom.INTERP.POLYGON) {
- ring = geometryFactory.createLinearRing(seq);
- }
- else {
- // interpretation == OraSDO.INTERP.RECTANGLE
- // rectangle does not maintain measures
- Coordinate min = seq.getCoordinate(0);
- Coordinate max = seq.getCoordinate(1);
- ring = geometryFactory.createLinearRing(new Coordinate[] {
- min, new Coordinate(max.x, min.y),
- max, new Coordinate(min.x, max.y),
- min
- });
- }
- return ring;
- }
-
- /**
- * Create LineString as encoded.
- *
- * @param oraGeom SDO_GEOMETRY attributes being read
- * @param elemIndex the element being read
- * @param coords the coordinates of the entire geometry
- * @return LineString
- *
- * @throws IllegalArgumentException If asked to create a curve
- */
- private LineString readLine(OraGeom oraGeom, int elemIndex)
- {
- int etype = oraGeom.eType(elemIndex);
- int interpretation = oraGeom.interpretation(elemIndex);
-
- checkOrdinates(oraGeom, elemIndex, "LineString");
- checkETYPE(etype, OraGeom.ETYPE.LINE, "LineString");
- checkInterpretation(interpretation, OraGeom.INTERP.LINESTRING, "LineString");
-
- LineString line = geometryFactory.createLineString(
- extractCoords(oraGeom, elemIndex));
- return line;
- }
-
- /**
- * Create Point as encoded.
- *
- * @param oraGeom SDO_GEOMETRY attributes being read
- * @param elemIndex the element being read
- * @param coords the coordinates of the entire geometry
- * @return Point
- */
- private Point readPoint(OraGeom oraGeom, int elemIndex) {
- int etype = oraGeom.eType(elemIndex);
- int interpretation = oraGeom.interpretation(elemIndex);
-
- checkOrdinates(oraGeom, elemIndex, "Point");
- checkETYPE(etype,OraGeom.ETYPE.POINT, "Point");
- checkInterpretation(interpretation, OraGeom.INTERP.POINT, "Point");
-
- CoordinateSequence seq = extractCoords(oraGeom, elemIndex);
- return createPoint(seq);
- }
-
- private Point createPoint(CoordinateSequence coords)
- {
- return geometryFactory.createPoint(coords);
- }
-
- /**
- * Constructs a coordinate sequence from the ordinates
- * for a given element
- * taking into account the input and output dimensions.
- *
- * The number of ordinates read per coordinate is given by outputDim.
- * The number of ordinates for each input point is given by ordDim.
- * The ordinate array length must be a multiple of this value.
- *
- * @param oraGeom the input geometry
- * @param elemIndex the element to read
- * @return a coordinate sequence representing the ordinates for the element
- *
- * @throws IllegalArgumentException if the ordinate array has an invalid length
- */
- private CoordinateSequence extractCoords(OraGeom oraGeom, int elemIndex)
- {
- int start = oraGeom.startingOffset(elemIndex);
- int end = oraGeom.startingOffset(elemIndex + 1);
- return extractCoords(oraGeom, oraGeom.ordinates, start, end);
- }
-
- private CoordinateSequence extractCoords(OraGeom oraGeom, double[] ordinates)
- {
- return extractCoords(oraGeom, ordinates, 1, ordinates.length + 1);
- }
-
- private CoordinateSequence extractCoords(OraGeom oraGeom, double[] ordinates, int start, int end)
- {
- CoordinateSequenceFactory csFactory = geometryFactory.getCoordinateSequenceFactory();
- // handle empty case
- if ((ordinates == null) || (ordinates.length == 0)) {
- return csFactory.create(new Coordinate[0]);
- }
- int ordDim = oraGeom.ordDim();
-
- /**
- * The dimension created matches the input dim, unless it is explicitly set,
- * and unless the CoordinateSequence impl limits the dimension.
- */
- int csDim = ordDim;
- if(outputDimension != OraGeom.NULL_DIMENSION){
- csDim = outputDimension;
- }
- int nCoord = (ordDim == 0 ? 0 : (end - start) / ordDim);
-
- CoordinateSequence cs = csFactory.create(nCoord, csDim);
- int actualCSDim = cs.getDimension();
- int readDim = Math.min(actualCSDim, ordDim);
-
- for (int iCoord = 0; iCoord < nCoord; iCoord++) {
- for (int iDim = 0; iDim < readDim; iDim++) {
- int ordIndex = start + iCoord * ordDim + iDim - 1;
- // TODO: be more lenient in handling invalid ordinates length
- cs.setOrdinate(iCoord, iDim, ordinates[ordIndex]);
- }
- }
- return cs;
- }
-
- private static void checkETYPE(int eType, int val1, String geomType)
- {
- checkETYPE(eType,val1, -1, -1, geomType);
- }
-
- private static void checkETYPE(int eType, int val1, int val2, String geomType)
- {
- checkETYPE(eType,val1, val2, -1, geomType);
- }
-
- private static void checkETYPE(int eType, int val1, int val2, int val3, String geomType)
- {
- if (eType == val1) return;
- if (val2 >= 0 && eType == val2) return;
- if (val3 >= 0 && eType == val3) return;
- throw new IllegalArgumentException("SDO_ETYPE "+ eType +" is not supported when reading a " + geomType);
- }
-
- private static void checkInterpretation(int interpretation, int val1, String geomType) {
- checkInterpretation(interpretation, val1, -1, geomType);
- }
-
- private static void checkInterpretation(int interpretation, int val1, int val2, String geomType) {
- if (interpretation == val1) return;
- if (val2 >= 0 && interpretation == val2) return;
- errorInterpretation(interpretation, geomType);
- }
-
- private static void errorInterpretation(int interpretation, String geomType) {
- throw new IllegalArgumentException("SDO_INTERPRETATION "+ interpretation +" is not supported when reading a " + geomType);
- }
-
- private static void checkOrdinates(OraGeom oraGeom, int elemIndex, String geomType)
- {
- int startOffset = oraGeom.startingOffset(elemIndex);
- int ordLen = oraGeom.ordinateLen();
- checkOrdinates(oraGeom.elemInfo, elemIndex, startOffset, ordLen, geomType);
- }
-
- private static void checkOrdinates(int[] elemInfo, int elemIndex, int startOffset, int ordLen, String geomType)
- {
- if (startOffset > ordLen)
- throw new IllegalArgumentException("STARTING_OFFSET " + startOffset + " inconsistent with ORDINATES length " + ordLen
- + " (Element " + elemIndex + " in SDO_ELEM_INFO " + OraGeom.toStringElemInfo(elemInfo) + ")");
- }
-
-
-}
diff --git a/jtsio/src/com/vividsolutions/jts/io/oracle/OraUtil.java b/jtsio/src/com/vividsolutions/jts/io/oracle/OraUtil.java
deleted file mode 100644
index 4f83c78..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/oracle/OraUtil.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.vividsolutions.jts.io.oracle;
-
-import java.sql.SQLException;
-
-import oracle.jdbc.OracleConnection;
-import oracle.sql.ARRAY;
-import oracle.sql.ArrayDescriptor;
-import oracle.sql.Datum;
-import oracle.sql.NUMBER;
-import oracle.sql.STRUCT;
-import oracle.sql.StructDescriptor;
-
-/**
- * Utility methods for working with Oracle structures.
- *
- * @author Martin Davis
- *
- */
-public class OraUtil
-{
- /**
- * Converts an Oracle <code>Datum</code> into an <code>int</code> value,
- * with a default value used if the datum is NULL.
- *
- * @param datum the Oracle Datum
- * @param defaultValue the value to use for NULLs
- * @return an integer value
- * @throws SQLException if an error occurs
- */
- public static int toInteger(Datum datum, final int defaultValue)
- throws SQLException
- {
- if (datum == null)
- return defaultValue;
- return ((NUMBER) datum).intValue();
- }
-
- /**
- * Converts an Oracle <code>ARRAY</code> into a <code>int</code> array,
- * with a default value used to represent NULL values.
- *
- * @param array an Oracle ARRAY of integer values
- * @param defaultValue the value to use for NULL values
- * @return an array of ints
- * @throws SQLException if an error was encountered
- */
- public static int[] toIntArray(ARRAY array, int defaultValue) throws SQLException
- {
- if (array == null)
- return null;
- if (defaultValue == 0)
- return array.getIntArray();
-
- return toIntArray(array.getOracleArray(), defaultValue);
- }
-
- /** Presents Datum[] as a int[] */
- public static int[] toIntArray(Datum data[], final int defaultValue)
- throws SQLException
- {
- if (data == null)
- return null;
- int array[] = new int[data.length];
- for (int i = 0; i < data.length; i++) {
- array[i] = toInteger(data[i], defaultValue);
- }
- return array;
- }
-
- /** Presents Datum[] as a double[] */
- public static double[] toDoubleArray(Datum[] data, final double defaultValue)
- {
- if (data == null)
- return null;
- double array[] = new double[data.length];
- for (int i = 0; i < data.length; i++) {
- array[i] = toDouble(data[i], defaultValue);
- }
- return array;
- }
-
- /** Presents array as a double[] */
- public static double[] toDoubleArray(ARRAY array, final double defaultValue)
- throws SQLException
- {
- if (array == null)
- return null;
- if (defaultValue == 0)
- return array.getDoubleArray();
-
- return toDoubleArray(array.getOracleArray(), defaultValue);
- }
-
- /** Presents struct as a double[] */
- public static double[] toDoubleArray(STRUCT struct, final double defaultValue)
- throws SQLException
- {
- if (struct == null)
- return null;
- return toDoubleArray(struct.getOracleAttributes(), defaultValue);
- }
-
- /** Presents datum as a double */
- public static double toDouble(Datum datum, final double defaultValue)
- {
- if (datum == null)
- return defaultValue;
- return ((NUMBER) datum).doubleValue();
- }
-
- /**
- * Convenience method for NUMBER construction.
- * <p>
- * Double.NaN is represented as <code>NULL</code> to agree with JTS use.
- * </p>
- */
- public static NUMBER toNUMBER(double number) throws SQLException
- {
- if (Double.isNaN(number)) {
- return null;
- }
- return new NUMBER(number);
- }
-
- /**
- * Convience method for ARRAY construction.
- * </p>
- */
- public static ARRAY toARRAY(double[] doubles, String dataType,
- OracleConnection connection) throws SQLException
- {
- ArrayDescriptor descriptor = ArrayDescriptor.createDescriptor(dataType,
- connection);
- return new ARRAY(descriptor, connection, doubles);
- }
-
- /**
- * Convience method for ARRAY construction.
- */
- public static ARRAY toARRAY(int[] ints, String dataType,
- OracleConnection connection) throws SQLException
- {
- ArrayDescriptor descriptor = ArrayDescriptor.createDescriptor(dataType,
- connection);
- return new ARRAY(descriptor, connection, ints);
- }
-
- /** Convenience method for STRUCT construction. */
- public static STRUCT toSTRUCT(Datum[] attributes, String dataType,
- OracleConnection connection) throws SQLException
- {
- //TODO: fix this to be more generic
- if (dataType.startsWith("*.")) {
- dataType = "DRA." + dataType.substring(2);
- }
- StructDescriptor descriptor = StructDescriptor.createDescriptor(dataType,
- connection);
- return new STRUCT(descriptor, connection, attributes);
- }
-
-}
diff --git a/jtsio/src/com/vividsolutions/jts/io/oracle/OraWriter.java b/jtsio/src/com/vividsolutions/jts/io/oracle/OraWriter.java
deleted file mode 100644
index 836939f..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/oracle/OraWriter.java
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * The JTS Topology Suite is a collection of Java classes that
- * implement the fundamental operations required to validate a given
- * geo-spatial data set to a known topological specification.
- *
- * Copyright (C) 2001 Vivid Solutions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-/*
- * Geotools2 - OpenSource mapping toolkit
- * http://geotools.org
- * (C) 2003, Geotools Project Managment Committee (PMC)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- */
-package com.vividsolutions.jts.io.oracle;
-
-import java.sql.SQLException;
-import java.util.*;
-
-import com.vividsolutions.jts.algorithm.CGAlgorithms;
-import com.vividsolutions.jts.geom.*;
-import com.vividsolutions.jts.util.Assert;
-
-import oracle.jdbc.OracleConnection;
-import oracle.sql.*;
-
-/**
- * Translates a JTS Geometry into an Oracle STRUCT representing an <code>MDSYS.SDO_GEOMETRY</code> object.
- * Supports writing all JTS geometry types into an equivalent Oracle representation.
- * <p>
- * To write an Oracle <code>STRUCT</code> a connection to an Oracle instance with access to the definition of the <code>MDSYS.SDO_GEOMETRY</code>
- * type is required. Oracle <code>SDO_GEOMETRY</code> SQL strings may be written without a connection, however.
- * <p>
- * By default, a single {@link Point} is written using the optimized <code>SDO_POINT_TYPE</code> attribute.
- * This can be overridden to use the (less compact) <code>SDO_ELEM_INFO/SDOORDINATES</code> representation
- * by using {@link #setOptimizePoint(boolean)}.
- * <p>
- * By default, rectangular polygons are written as regular 5-point polygons.
- * This can be changed to use the optimized RECTANGLE points
- * by using {@link #setOptimizeRectangle(boolean)}.
- * Note that RECTANGLEs do not support LRS Measure ordinate values.
- * Also, this class only writes RECTANGLEs for polygons containing a single ring (i.e. the shell).
- * <p>
- * Oracle cannot represent {@link MultiPolygon}s or {@link MultiLineString}s directly as elements
- * of a {@link GeometryCollection}. Instead, their components are written individually.
- * {@link MultiPoint}s are represented directly, however.
- *
- * The dimension of the output <code>SDO_GEOMETRY</code> is determined as follows:
- * <ul>
- * <li>by default, the dimension matches that of the input
- * <li>currently the coordinate dimension of the input is determined by inspecting a sample coordinate.
- * If the Z value is <code>NaN</code>, the coordinate dimension is assumed to be 2.
- * (In the future this will be determined from the underlying {@link CoordinateSequence}s.
- * <li>the dimension can be set explicitly by the {@link #setDimension(int)} method.
- * This allows forcing Z output even if the Z values are <code>NaN</code>.
- * Conversely, if Z values are present this allows forcing 2D output.
- * </ul>
- *
- * <h3>LIMITATIONS</h3>
- * <ul>
- * <li>Since JTS does not support Measures, they cannot be written.
- * (A future release could allow forcing interpreting Z as M, or else providing a fixed M value).
- * </ul>
- *
- * @author Martin Davis
- * @author David Zwiers, Vivid Solutions.
- */
-public class OraWriter
-{
- /**
- * A connection providing access to the required type definitions
- */
- private OracleConnection connection;
- /**
- * The maximum output dimension to write
- */
- private int outputDimension = OraGeom.NULL_DIMENSION;
- /**
- * The default SRID to write
- */
- private int srid = OraGeom.SRID_NULL;
- private boolean isOptimizeRectangle = false;
- private boolean isOptimizePoint = true;
-
- /**
- * Creates a writer for Oracle geometry formats.
- *
- * The output dimension will be whatever the dimension of the input is.
- */
- public OraWriter()
- {
- }
-
- /**
- * Creates a writer for Oracle geometry formats,
- * specifying the maximum output dimension.
- *
- * @param outputDimension the coordinate dimension to use for the output
- */
- public OraWriter(int outputDimension)
- {
- this.outputDimension = outputDimension;
- }
-
- /**
- * Creates a writer using a valid Oracle connection.
- * <p>
- * To simplify connection resource handling, the connection should be
- * provided in the {@link #write(Geometry, OracleConnection)} method.
- * Accordingly, this constructor has been deprecated.
- * <p>
- * The connection should have sufficient privileges to view the description of the MDSYS.SDO_GEOMETRY type.
- * <p>
- * The output dimension will be whatever the dimension of the input is.
- *
- * @param con a valid Oracle connection
- * @deprecated use {@link #OraWriter()} instead
- */
- public OraWriter(OracleConnection con)
- {
- this.connection = con;
- }
-
- /**
- * Creates a writer using a valid Oracle connection,
- * and specifying the maximum output dimension.
- * <p>
- * To simplify connection resource handling, the connection should be
- * provided in the {@link #write(Geometry, OracleConnection)} method.
- * Accordingly, this constructor has been deprecated.
- * <p>
- * The connection should have sufficient privileges to view the description of the MDSYS.SDO_GEOMETRY type.
- *
- * @param con a valid Oracle connection
- * @param outputDimension the coordinate dimension to use for the output
- * @deprecated use {@link #OraWriter(int)} instead
- */
- public OraWriter(OracleConnection con, int outputDimension)
- {
- this.connection = con;
- this.outputDimension = outputDimension;
- }
-
- /**
- * Sets the coordinate dimension for the created Oracle geometries.
- *
- * @param outputDimension
- * the coordinate dimension to use for the output
- */
- public void setDimension(int outputDimension)
- {
- if (outputDimension < 2)
- throw new IllegalArgumentException("Output dimension must be >= 2");
- this.outputDimension = outputDimension;
- }
-
- /**
- * Forces geometries to be written using the specified SRID.
- * This is useful in two cases:
- * <ul>
- * <li>to avoid using the native geometry's SRID
- * <li>to ensure an entire table is written using a fixed SRID.
- * </ul>
- *
- * @param srid the srid to use
- */
- public void setSRID(int srid)
- {
- this.srid = srid;
- }
-
- /**
- * Sets whether rectangle polygons should be written using the
- * optimized 4-coordinate RECTANGLE format
- * (ETYPE=1003, INTERPRETATION=3).
- * If this option is false, rectangles are written as 5-coordinate polygons.
- * The default setting is <code>false</code>.
- *
- * @param isOptimizeRectangle whether to optimize rectangle writing
- */
- public void setOptimizeRectangle(boolean isOptimizeRectangle)
- {
- this.isOptimizeRectangle = isOptimizeRectangle;
- }
-
- /**
- * Sets whether points should be written using the
- * optimized SDO_POINT_TYPE format.
- * If this option is <code>false</code>, points are written using the SDO_ORDINATES attribute.
- * The default setting is <code>true</code>.
- *
- * @param isOptimizePoint whether to optimize point writing
- */
- public void setOptimizePoint(boolean isOptimizePoint)
- {
- this.isOptimizePoint = isOptimizePoint;
- }
-
- /**
- * Converts a {@link Geometry} into an Oracle MDSYS.SDO_GEOMETRY STRUCT.
- * <p>
- * Although invalid geometries may be encoded, and inserted into an Oracle DB,
- * this is not recommended. It is the responsibility of the user to ensure the
- * geometry is valid prior to calling this method.
- * <p>
- * The SRID of the created SDO_GEOMETRY is the SRID defined explicitly for the writer, if any;
- * otherwise it is the SRID contained in the input geometry.
- * The caller should ensure the the SRID is valid for the intended use,
- * since an incorrect SRID may cause indexing exceptions during an
- * INSERT or UPDATE.
- * <p>
- * When a null Geometry is passed in, a non-null, empty SDO_GEOMETRY STRUCT is returned.
- * Therefore, inserting the output of the writer into a
- * table will never result in NULL insertions.
- * To pass a NULL Geometry into an Oracle SDO_GEOMETRY-valued parameter using JDBC, use
- * <pre>
- * java.sql.CallableStatement.setNull(index, java.sql.Types.STRUCT, "MDSYS.SDO_GEOMETRY").
- * </pre>
- *
- * @param geom the geometry to encode
- * @return a Oracle MDSYS.SDO_GEOMETRY STRUCT representing the geometry
- * @throws SQLException if an encoding error was encountered
- * @deprecated
- */
- public STRUCT write(Geometry geom) throws SQLException
- {
- return write(geom, connection);
- }
-
- /**
- * Converts a {@link Geometry} into an Oracle MDSYS.SDO_GEOMETRY STRUCT.
- * <p>
- * Although invalid geometries may be encoded, and inserted into an Oracle DB,
- * this is not recommended. It is the responsibility of the user to ensure the
- * geometry is valid prior to calling this method.
- * <p>
- * The SRID of the created SDO_GEOMETRY is the SRID defined explicitly for the writer, if any;
- * otherwise it is the SRID contained in the input geometry.
- * The caller should ensure the the SRID is valid for the intended use,
- * since an incorrect SRID may cause indexing exceptions during an
- * INSERT or UPDATE.
- * <p>
- * When a null Geometry is passed in, a non-null, empty SDO_GEOMETRY STRUCT is returned.
- * Therefore, inserting the output of the writer into a
- * table will never result in NULL insertions.
- * To pass a NULL Geometry into an Oracle SDO_GEOMETRY-valued parameter using JDBC, use
- * <pre>
- * java.sql.CallableStatement.setNull(index, java.sql.Types.STRUCT, "MDSYS.SDO_GEOMETRY").
- * </pre>
- *
- * @param geom the geometry to encode
- * @return a Oracle MDSYS.SDO_GEOMETRY STRUCT representing the geometry
- * @throws SQLException if an encoding error was encountered
- */
- public STRUCT write(Geometry geom, OracleConnection connection) throws SQLException
- {
- // this line may be problematic ... for v9i and later need to revisit.
-
- // was this ... does not work for 9i
- // if( geom == null) return toSTRUCT( null, DATATYPE );
-
- if (geom == null || geom.isEmpty() || geom.getCoordinate() == null)
- return createEmptySDOGeometry(connection);
-
- OraGeom oraGeom = createOraGeom(geom);
-
- STRUCT SDO_POINT = null;
- ARRAY SDO_ELEM_INFO = null;
- ARRAY SDO_ORDINATES = null;
- if (oraGeom.point == null) {
- SDO_ELEM_INFO = OraUtil.toARRAY(oraGeom.elemInfo, OraGeom.TYPE_ELEM_INFO_ARRAY,
- connection);
- SDO_ORDINATES = OraUtil.toARRAY(oraGeom.ordinates, OraGeom.TYPE_ORDINATE_ARRAY,
- connection);
- }
- else { // Point Optimization
- Datum data[] = new Datum[] {
- OraUtil.toNUMBER(oraGeom.point[0]),
- OraUtil.toNUMBER(oraGeom.point[1]),
- OraUtil.toNUMBER(oraGeom.point[2]), };
- SDO_POINT = OraUtil.toSTRUCT(data, OraGeom.TYPE_POINT_TYPE, connection);
- }
-
- NUMBER SDO_GTYPE = new NUMBER(oraGeom.gType);
- NUMBER SDO_SRID = oraGeom.srid == OraGeom.SRID_NULL ? null : new NUMBER(oraGeom.srid);
-
- Datum sdoGeometryComponents[] = new Datum[] {
- SDO_GTYPE,
- SDO_SRID,
- SDO_POINT,
- SDO_ELEM_INFO,
- SDO_ORDINATES };
- return OraUtil.toSTRUCT(sdoGeometryComponents, OraGeom.TYPE_GEOMETRY, connection);
- }
-
- /**
- * Writes a Geometry in Oracle SDO_GEOMETRY SQL literal format.
- * <p>
- * Examples of output are:
- * <pre>
- * SDO_GEOMETRY(2001,NULL,NULL,SDO_ELEM_INFO_ARRAY(1,1,1),SDO_ORDINATE_ARRAY(50,50))
- * SDO_GEOMETRY(3001,NULL,SDO_POINT_TYPE(50,50,100,),NULL,NULL)
- * SDO_GEOMETRY(3006,8307,NULL,SDO_ELEM_INFO_ARRAY(1,2,1, 7,2,1),SDO_ORDINATE_ARRAY(0,0,2, 50,50,100, 10,10,12, 150,150,110))
- * </pre>
- *
- * @param geom the Geometry to write
- * @return a string representing the geometry as an SDO_GEOMETRY literal
- */
- public String writeSQL(Geometry geom)
- {
- if (geom == null) return OraGeom.SQL_NULL;
- OraGeom oraGeom = createOraGeom(geom);
- return oraGeom.toString();
- }
-
- private STRUCT createEmptySDOGeometry(OracleConnection connection) throws SQLException {
- return OraUtil.toSTRUCT(new Datum[5], OraGeom.TYPE_GEOMETRY, connection);
- }
-
- /**
- * Creates an {@link OraGeom} structure corresponding to the Oracle SDO_GEOMETRY
- * attributes representing the given Geometry.
- * This allows disconnected testing, since no Oracle types are accessed.
- *
- * @param geom the non-null, non-empty Geometry to write
- * @return an OraGeom structure
- */
- OraGeom createOraGeom(Geometry geom)
- {
- int gtype = gType(geom);
- int srid = this.srid == OraGeom.SRID_NULL ? geom.getSRID() : this.srid;
- double[] point = null;
- int elemInfo[] = null;
- double[] ordinates = null;
-
- // if geometry ordinate data should be represented by SDO_ORDINATES array
- if (isEncodeAsPointType(geom)) {
- point = pointOrdinates(geom);
- }
- else {
- int dim = dimension(geom);
- List elemTriplets = new ArrayList();
- List ordGeoms = new ArrayList();
- int lastOrdOffset = writeElement(geom, dim, 1, elemTriplets, ordGeoms);
- elemInfo = flattenTriplets(elemTriplets);
- ordinates = writeGeometryOrdinates(elemTriplets, ordGeoms, lastOrdOffset - 1, dim);
- }
-
- OraGeom oraGeom = new OraGeom(gtype, srid, point, elemInfo, ordinates);
- return oraGeom;
- }
-
- /**
- * Extracts ordinate data for SDO_POINT_TYPE for Point geometries.
- * <code>null</code> is returned
- * for all non-Point geometries, or for LRS points.
-
- * This cannot be used for LRS coordinates.
- * Subclasses may wish to repress this method and force Points to be
- * represented using SDO_ORDINATES.
- *
- * @param geom the geometry providing the ordinates
- * @return double[] the point ordinates
- */
- private double[] pointOrdinates(Geometry geom)
- {
- Point point = (Point) geom;
- Coordinate coord = point.getCoordinate();
- return new double[] { coord.x, coord.y, coord.z };
- }
-
- /**
- * Writes each geometry element which will appear in the output,
- * by recursing through the input geometry,
- * and identifying each element and how it will
- * appear in the output elemInfo array.
- * For each element the relevant geometry component
- * is recorded as well, to allow the ordinates
- * array to be written from them subsequently.
- * The total length of the ordinate array is summed
- * during this process as well (which also allows determining startingOffsets).
- *
- * @param geom
- * @param dim
- * @param offset
- * @param elemTriplets
- * @param ordGeoms
- * @return the final startingOffset
- */
- private int writeElement(Geometry geom, int dim, int offset, List elemTriplets, List ordGeoms)
- {
- int interp;
- int geomType = OraGeom.geomType(geom);
- switch (geomType) {
- case OraGeom.GEOM_TYPE.POINT:
- // full point encoding - optimized one has been done earlier if possible
- Point point = (Point) geom;
- elemTriplets.add(triplet(offset, OraGeom.ETYPE.POINT, OraGeom.INTERP.POINT));
- ordGeoms.add(point);
- return offset + dim;
-
- case OraGeom.GEOM_TYPE.MULTIPOINT:
- MultiPoint points = (MultiPoint) geom;
- int nPts = points.getNumGeometries();
- // this works for nPts >= 1 (0 has already been handled)
- elemTriplets.add(triplet(offset, OraGeom.ETYPE.POINT, nPts));
- ordGeoms.add(points);
- return offset + dim * nPts;
-
- case OraGeom.GEOM_TYPE.LINE:
- LineString line = (LineString) geom;
- elemTriplets.add(triplet(offset, OraGeom.ETYPE.LINE, OraGeom.INTERP.LINESTRING));
- ordGeoms.add(line);
- return offset + dim * line.getNumPoints();
-
- case OraGeom.GEOM_TYPE.MULTILINE:
- MultiLineString lines = (MultiLineString) geom;
- for (int i = 0; i < lines.getNumGeometries(); i++) {
- LineString lineElem = (LineString) lines.getGeometryN(i);
- offset = writeElement(lineElem, dim, offset, elemTriplets, ordGeoms);
- }
- return offset;
-
- case OraGeom.GEOM_TYPE.POLYGON:
- Polygon polygon = (Polygon) geom;
- // shell
- LineString ring = polygon.getExteriorRing();
- interp = isWriteAsRectangle(polygon) ? OraGeom.INTERP.RECTANGLE : OraGeom.INTERP.POLYGON;
- elemTriplets.add(triplet(offset, OraGeom.ETYPE.POLYGON_EXTERIOR, interp));
- ordGeoms.add(ring);
- if (interp == OraGeom.INTERP.RECTANGLE) {
- offset += 4;
- }
- else {
- offset += dim * ring.getNumPoints();
- }
-
- // holes
- int holes = polygon.getNumInteriorRing();
- for (int i = 0; i < holes; i++) {
- ring = polygon.getInteriorRingN(i);
- elemTriplets.add(triplet(offset, OraGeom.ETYPE.POLYGON_INTERIOR, OraGeom.INTERP.POLYGON));
- ordGeoms.add(ring);
- offset += dim * ring.getNumPoints();
- }
- return offset;
-
- case OraGeom.GEOM_TYPE.MULTIPOLYGON:
- MultiPolygon polys = (MultiPolygon) geom;
- Polygon poly;
- for (int i = 0; i < polys.getNumGeometries(); i++) {
- poly = (Polygon) polys.getGeometryN(i);
- offset = writeElement(poly, dim, offset, elemTriplets, ordGeoms);
- }
- return offset;
-
- case OraGeom.GEOM_TYPE.COLLECTION:
- GeometryCollection geoms = (GeometryCollection) geom;
- for (int i = 0; i < geoms.getNumGeometries(); i++) {
- geom = geoms.getGeometryN(i);
- offset = writeElement(geom, dim, offset, elemTriplets, ordGeoms);
- }
- return offset;
- }
-
- throw new IllegalArgumentException("Cannot encode JTS "
- + geom.getGeometryType() + " as SDO_ELEM_INFO "
- + "(Limited to Point, Line, Polygon, GeometryCollection, MultiPoint,"
- + " MultiLineString and MultiPolygon)");
- }
-
- private static int[] triplet(int sOffset, int etype, int interp)
- {
- return new int[] { sOffset, etype, interp };
- }
-
- private int[] flattenTriplets(List elemTriplets)
- {
- int[] elemInfo = new int[3 * elemTriplets.size()];
- int eiIndex = 0;
- for (int i = 0; i < elemTriplets.size(); i++) {
- int[] triplet = (int[]) elemTriplets.get(i);
- for (int ii = 0; ii < 3; ii++) {
- elemInfo[eiIndex++] = triplet[ii];
- }
- }
- return elemInfo;
- }
-
- /**
- * Writes the ordinate values extracted from each element Geometry
- * into a double array.
- * This optimizes memory usage by only allocating the single
- * double array required to pass the ordinates to the Oracle STRUCT.
- *
- * @param elemTriplets
- * @param ordGeoms
- * @param ordSize
- * @param dim
- * @return the final ordinate array
- */
- private double[] writeGeometryOrdinates(List elemTriplets, List ordGeoms, int ordSize, int dim)
- {
- double[] ords = new double[ordSize];
- int ordIndex = 0;
- for (int ielem = 0; ielem < elemTriplets.size(); ielem++) {
- int[] triplet = (int[]) elemTriplets.get(ielem);
-
- int startOffset = triplet[0];
- //verify startOffset is same as ordIndex
- Assert.isTrue(startOffset == ordIndex + 1,
- "ElemInfo computed startingOffset does not match actual ordinates position");
-
- int elemType = triplet[1];
- int interp = triplet[2];
- Geometry geom = (Geometry) ordGeoms.get(ielem);
- switch (elemType) {
- case OraGeom.ETYPE.POINT:
- if (interp == 1) {
- ordIndex = writeOrds(((Point) geom).getCoordinateSequence(), dim, ords, ordIndex);
- }
- else {
- // must be > 1 - write MultiPoint
- ordIndex = writeOrds((MultiPoint) geom, dim, ords, ordIndex);
- }
- break;
-
- case OraGeom.ETYPE.LINE:
- ordIndex = writeOrds(((LineString) geom).getCoordinateSequence(), dim, ords, ordIndex);
- break;
-
- case OraGeom.ETYPE.POLYGON_EXTERIOR:
- if (interp == OraGeom.INTERP.RECTANGLE) {
- ordIndex = writeRectangleOrds(geom, dim, ords, ordIndex);
- }
- else {
- ordIndex = writeOrdsOriented(((LineString) geom).getCoordinateSequence(), dim, ords, ordIndex, true);
- }
- break;
-
- case OraGeom.ETYPE.POLYGON_INTERIOR:
- ordIndex = writeOrdsOriented(((LineString) geom).getCoordinateSequence(), dim, ords, ordIndex, false);
- break;
- }
- }
- return ords;
- }
-
- /**
- * Writes ordinates in the orientation
- * specified by the isWriteCCW CCW flag.
- * Coordinates are reversed if necessary.
- *
- * @param seq the coordinates to write
- * @param dim the output dimension required
- * @param ordData the ordinates array
- * @param ordIndex the starting index in the ordinates array
- * @param isWriteCCW true if the ordinates should be written in CCW orientation, false if CW
- * @return the next index to write in the ordinates array
- */
- private int writeOrdsOriented(CoordinateSequence seq, int dim,
- double[] ordData, int ordIndex, boolean isWriteCCW)
- {
- Coordinate[] coords = seq.toCoordinateArray();
- //TODO: add method to CGAlgorithms to compute isCCW for CoordinateSequences
- boolean isCCW = CGAlgorithms.isCCW(coords);
- if (isCCW != isWriteCCW) {
- return writeOrdsReverse(seq, dim, ordData, ordIndex);
- }
- return writeOrds(seq, dim, ordData, ordIndex);
- }
-
- private int writeOrdsReverse(CoordinateSequence seq, int dim, double[] ordData, int ordIndex)
- {
- int nCoord = seq.size();
- for (int i = nCoord-1; i >= 0; i--) {
- for (int id = 0; id < dim; id++) {
- ordData[ordIndex++] = seq.getOrdinate(i, id);
- }
- }
- return ordIndex;
- }
-
- private int writeOrds(CoordinateSequence seq, int dim, double[] ordData, int ordIndex)
- {
- int nCoord = seq.size();
- for (int i = 0; i < nCoord; i++) {
- for (int id = 0; id < dim; id++) {
- ordData[ordIndex++] = seq.getOrdinate(i, id);
- }
- }
- return ordIndex;
- }
-
- private int writeOrds(MultiPoint geom, int dim, double[] ordData, int ordIndex)
- {
- int nGeom = geom.getNumGeometries();
- for (int i = 0; i < nGeom; i++) {
- CoordinateSequence seq = ((Point) geom.getGeometryN(i)).getCoordinateSequence();
- for (int id = 0; id < dim; id++) {
- ordData[ordIndex++] = seq.getOrdinate(0, id);
- }
- }
- return ordIndex;
- }
-
- private int writeRectangleOrds(Geometry ring, int dim, double[] ordData, int ordIndex)
- {
- Envelope e = ring.getEnvelopeInternal();
- ordData[ordIndex++] = e.getMinX();
- ordData[ordIndex++] = e.getMinY();
- ordData[ordIndex++] = e.getMaxX();
- ordData[ordIndex++] = e.getMaxY();
- return ordIndex;
- }
-
- /**
- * Tests if a <code>polygon</code> can be written aa a RECTANGLE.
- * Rectangles are only supported without a SRID!
- *
- * @param polygon
- * @return <code>true</code> if polygon is SRID==NULL and a rectangle
- */
- private boolean isWriteAsRectangle(Polygon polygon) {
- if (! isOptimizeRectangle) return false;
-
- if (lrsDim(polygon) != 0) {
- // cannot support LRS on a rectangle
- return false;
- }
- return polygon.isRectangle();
- }
-
- private boolean isEncodeAsPointType(Geometry geom)
- {
- if (! isOptimizePoint) return false;
- if (geom instanceof Point && (lrsDim(geom) == 0) && outputDimension <= 3)
- return true;
- // Geometry type is not appropriate for SDO_POINT_TYPE
- return false;
- }
-
- /**
- * Produce SDO_GTYPE code for input Geometry.
- *
- * @param geom
- * @return SDO_GTYPE code
- */
- private int gType(Geometry geom)
- {
- return OraGeom.gType(dimension(geom), lrsDim(geom), OraGeom.geomType(geom));
- }
-
- /**
- * Return dimension of output coordinates (either 2,3 or 4),
- * respecting the explicit output dimension (if any).
- *
- * @param geom
- * @return coordinate dimension number
- */
- private int dimension(Geometry geom) {
- if (outputDimension != OraGeom.NULL_DIMENSION)
- return outputDimension;
-
- //TODO: check dimension of a geometry CoordinateSequence to determine dimension
- int d = Double.isNaN(geom.getCoordinate().z) ? 2 : 3;
- return d;
- }
-
- /**
- * Return LRS dimension as defined by SDO_GTYPE (either 3,4 or 0).
- *
- * @param geom
- * @return LRS dimension
- */
- private int lrsDim(Geometry geom) {
- //TODO: implement measure support when available
- return 0;
- }
-
-}
diff --git a/jtsio/src/com/vividsolutions/jts/io/sde/SdeReader.java b/jtsio/src/com/vividsolutions/jts/io/sde/SdeReader.java
deleted file mode 100644
index ded8358..0000000
--- a/jtsio/src/com/vividsolutions/jts/io/sde/SdeReader.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * The JTS Topology Suite is a collection of Java classes that
- * implement the fundamental operations required to validate a given
- * geo-spatial data set to a known topological specification.
- *
- * Copyright (C) 2001 Vivid Solutions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-package com.vividsolutions.jts.io.sde;
-
-import com.vividsolutions.jts.geom.*;
-import com.esri.sde.sdk.client.*;
-
-/**
- * Reads a {@link Geometry} from an ESRI SDE Shape.
- * <p>
- * The SDE geometry model differs from the OGC model used by JTS.
- * In particular:
- * <ul>
- * <li>Simple lines are read as {@link LineString}s
- * <li>Inverted Polygons and Exverted Holes are read as is.
- * These create invalid JTS polygons, and must be
- * rectified if further operations are to be performed on them.
- * </ul>
- * <p>
- * This class allows specifying the maximum number of coordinate dimensions to read.
- * If dimensions higher than 2 are not required, it may be more efficient to not read them.
- * <p>
- * To use this class the ESRI SDE Java libraries must be present.
- * <p>
- * Currently reading measure (M) ordinates is not supported.
- *
- * @author Martin Davis
- *
- */
-public class SdeReader
-{
- private GeometryFactory geometryFactory;
- private PrecisionModel precisionModel;
- private CoordinateSequenceFactory coordSeqFact;
- private int maxDimensionToRead = 2;
-
- /**
- * Creates a reader that creates geometries using the default {@link GeometryFactory}.
- */
- public SdeReader() {
- this(new GeometryFactory());
- }
-
- /**
- * Creates a reader that creates geometries using the given {@link GeometryFactory}.
- * @param geometryFactory
- */
- public SdeReader(GeometryFactory geometryFactory) {
- this.geometryFactory = geometryFactory;
- precisionModel = geometryFactory.getPrecisionModel();
- coordSeqFact = geometryFactory.getCoordinateSequenceFactory();
- }
-
- /**
- * Gets the maximum number of coordinate dimensions which will be read.
- *
- * @return the dimension which will be read
- */
- public int getDimension() {
- return maxDimensionToRead;
- }
-
- /**
- * Sets the maximum number of coordinate dimensions to read.
- * If this is larger than the number of dimensions actually
- * present in the input geometry, the higher ordinates will not
- * be read, and NaN will be returned as their value.
- * <p>
- * The default is to read only the X and Y ordinates (dimension = 2).
- *
- * @param dimension the dimension to read
- */
- public void setDimension(int dimension) {
- this.maxDimensionToRead = dimension;
- }
-
- /**
- * Reads a {@link Geometry} from a given SDE shape.
- *
- * @param shape the shape to read
- * @return the geometry which represents the input shape
- *
- * @throws SeException
- */
- public Geometry read(SeShape shape)
- throws SeException
- {
- switch (shape.getType()) {
- case SeShape.TYPE_POINT:
- return readPoint(shape);
-
- case SeShape.TYPE_MULTI_POINT:
- return readMultiPoint(shape);
-
- case SeShape.TYPE_LINE:
- case SeShape.TYPE_SIMPLE_LINE:
- return readLine(shape);
-
- case SeShape.TYPE_MULTI_LINE:
- case SeShape.TYPE_MULTI_SIMPLE_LINE:
- return readMultiLine(shape);
-
- case SeShape.TYPE_POLYGON:
- return readPolygon(shape);
-
- case SeShape.TYPE_MULTI_POLYGON:
- return readMultiPolygon(shape);
-
- }
- throw new IllegalArgumentException("Shapes of type " + shape.getType() + " are not supported");
- }
-
- private Point readPoint(SeShape shape)
- throws SeException
- {
- java.util.List list = shape.getAllPoints(SeShape.TURN_RIGHT, false); // get points and offsets
- SDEPoint[] sePts = (SDEPoint[]) list.get(0);
- return geometryFactory.createPoint(toCoordinates(sePts, 0, 1));
- }
-
- private MultiPoint readMultiPoint(SeShape shape)
- throws SeException
- {
- java.util.List list = shape.getAllPoints(SeShape.TURN_RIGHT, false); // get points and offsets
- SDEPoint[] sePts = (SDEPoint[]) list.get(0);
- return geometryFactory.createMultiPoint(toCoordinates(sePts, 0, sePts.length));
- }
-
- private LineString readLine(SeShape shape)
- throws SeException
- {
- java.util.List list = shape.getAllPoints(SeShape.TURN_RIGHT, false); // get points and offsets
- SDEPoint[] sePts = (SDEPoint[]) list.get(0);
- return geometryFactory.createLineString(toCoordinates(sePts, 0, sePts.length));
- }
-
- private MultiLineString readMultiLine(SeShape shape)
- throws SeException
- {
- java.util.List list = shape.getAllPoints(SeShape.TURN_RIGHT, false); // get points and offsets
- SDEPoint[] sePts = (SDEPoint[]) list.get(0);
- int[] partOffset = (int[]) list.get(1);
-
- LineString[] lines = new LineString[partOffset.length];
- for (int i = 0; i < partOffset.length; i++) {
- int end = sePts.length;
- if (i < partOffset.length - 1)
- end = partOffset[i + 1];
- lines[i] = geometryFactory.createLineString(toCoordinates(sePts, partOffset[i], end));
- }
- return geometryFactory.createMultiLineString(lines);
- }
-
- private Polygon readPolygon(SeShape shape)
- throws SeException
- {
- java.util.List list = shape.getAllPoints(SeShape.TURN_RIGHT, true); // get points and offsets
- SDEPoint[] sePts = (SDEPoint[]) list.get(0);
- // a polygon has only one part
- int[] subPartOffset = (int[]) list.get(2);
-
- return readPolygon(sePts, subPartOffset, 0, subPartOffset.length);
- }
-
- private Polygon readPolygon(SDEPoint[] sePts, int[] subPartOffset, int subPartStart, int subPartEnd)
- throws SeException
- {
- int numSubParts = subPartEnd - subPartStart;
- int nHoles = numSubParts - 1;
- if (nHoles < 0)
- nHoles = 0;
- LinearRing shell = null;
- LinearRing[] holes = new LinearRing[nHoles];
- int holeIndex = 0;
-
- for (int i = subPartStart; i < subPartEnd; i++) {
- int end = sePts.length;
- if (i < subPartEnd - 1)
- end = subPartOffset[i + 1];
- LinearRing ring = geometryFactory.createLinearRing(toCoordinates(sePts, subPartOffset[i], end));
-
- if (shell == null) {
- shell = ring;
- }
- else {
- holes[holeIndex++] = ring;
- }
- }
- return geometryFactory.createPolygon(shell, holes);
- }
-
- private MultiPolygon readMultiPolygon(SeShape shape)
- throws SeException
- {
- java.util.List list = shape.getAllPoints(SeShape.TURN_RIGHT, true); // get points and offsets
- SDEPoint[] sePts = (SDEPoint[]) list.get(0);
- int[] partOffset = (int[]) list.get(1);
- int[] subPartOffset = (int[]) list.get(2);
-
- Polygon[] polys = new Polygon[partOffset.length];
- for (int i = 0; i < partOffset.length; i++) {
- int subPartEnd = subPartOffset.length;
- if (i + 1 < partOffset.length) {
- subPartEnd = partOffset[i + 1];
- }
- polys[i] = readPolygon(sePts, subPartOffset, partOffset[i], subPartEnd);
- }
- return geometryFactory.createMultiPolygon(polys);
- }
-
- private void readCoordinate(SDEPoint p, CoordinateSequence seq, int index)
- throws SeException
- {
- seq.setOrdinate(index, 0, precisionModel.makePrecise(p.getX()));
- seq.setOrdinate(index, 1, precisionModel.makePrecise(p.getY()));
- // only read the Z dim if requested and present
- if (maxDimensionToRead >= 3 && p.is3D()) {
- seq.setOrdinate(index, 2, p.getZ());
- }
- }
-
- private CoordinateSequence toCoordinates(SDEPoint[] sePts, int start, int end)
- throws SeException
- {
- int size = end - start;
- CoordinateSequence seq = coordSeqFact.create(size, maxDimensionToRead);
- int index = 0;
- for (int i = start; i < end; i++) {
- readCoordinate(sePts[i], seq, index);
- index++;
- }
- return seq;
- }
-}
diff --git a/locationtech_mark.png b/locationtech_mark.png
new file mode 100644
index 0000000..57c4f9b
Binary files /dev/null and b/locationtech_mark.png differ
diff --git a/modules/app/pom.xml b/modules/app/pom.xml
new file mode 100644
index 0000000..d1924c1
--- /dev/null
+++ b/modules/app/pom.xml
@@ -0,0 +1,66 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-modules</artifactId>
+ <version>1.15.0</version>
+ </parent>
+ <artifactId>jts-app</artifactId>
+ <name>${project.groupId}:${project.artifactId}</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-tests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.locationtech.jts.io</groupId>
+ <artifactId>jts-io-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+ <mainClass>org.locationtech.jtstest.testbuilder.JTSTestBuilder</mainClass>
+ </manifest>
+ </archive>
+ <finalName>JTSTestBuilder</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/TestCoordinateSequenceFactory.java b/modules/app/src/main/java/org/locationtech/jtstest/TestCoordinateSequenceFactory.java
new file mode 100644
index 0000000..e6c9668
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/TestCoordinateSequenceFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.impl.*;
+
+/**
+ * Create the CoordinateSequenceFactory to be used in tests
+ */
+public class TestCoordinateSequenceFactory {
+
+ public static CoordinateSequenceFactory instance()
+ {
+ return CoordinateArraySequenceFactory.instance();
+// return new PackedCoordinateSequenceFactory();
+// return new PackedCoordinateSequenceFactory(PackedCoordinateSequenceFactory.FLOAT, 2);
+ }
+
+ private TestCoordinateSequenceFactory() {
+ }
+}
\ No newline at end of file
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/clean/CleanDuplicatePoints.java b/modules/app/src/main/java/org/locationtech/jtstest/clean/CleanDuplicatePoints.java
new file mode 100644
index 0000000..6047f8a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/clean/CleanDuplicatePoints.java
@@ -0,0 +1,111 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.clean;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+
+
+/**
+ * @version 1.7
+ */
+public class CleanDuplicatePoints {
+
+ public static Coordinate[] removeDuplicatePoints(Coordinate[] coord)
+ {
+ List uniqueCoords = new ArrayList();
+ Coordinate lastPt = null;
+ for (int i = 0; i < coord.length; i++) {
+ if (lastPt == null || ! lastPt.equals(coord[i])) {
+ lastPt = coord[i];
+ uniqueCoords.add(new Coordinate(lastPt));
+ }
+ }
+ return (Coordinate[]) uniqueCoords.toArray(new Coordinate[0]);
+ }
+
+ private GeometryFactory fact;
+
+ public CleanDuplicatePoints() {
+ }
+
+ public Geometry clean(Geometry g)
+ {
+ fact = g.getFactory();
+ if (g.isEmpty()) return g;
+ if (g instanceof Point) return g;
+ else if (g instanceof MultiPoint) return g;
+ // LineString also handles LinearRings
+ else if (g instanceof LinearRing) return clean((LinearRing) g);
+ else if (g instanceof LineString) return clean((LineString) g);
+ else if (g instanceof Polygon) return clean((Polygon) g);
+ else if (g instanceof MultiLineString) return clean((MultiLineString) g);
+ else if (g instanceof MultiPolygon) return clean((MultiPolygon) g);
+ else if (g instanceof GeometryCollection) return clean((GeometryCollection) g);
+ else throw new UnsupportedOperationException(g.getClass().getName());
+ }
+
+ private LinearRing clean(LinearRing g)
+ {
+ Coordinate[] coords = removeDuplicatePoints(g.getCoordinates());
+ return fact.createLinearRing(coords);
+ }
+
+ private LineString clean(LineString g)
+ {
+ Coordinate[] coords = removeDuplicatePoints(g.getCoordinates());
+ return fact.createLineString(coords);
+ }
+
+ private Polygon clean(Polygon poly)
+ {
+ Coordinate[] shellCoords = removeDuplicatePoints(poly.getExteriorRing().getCoordinates());
+ LinearRing shell = fact.createLinearRing(shellCoords);
+ List holes = new ArrayList();
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ Coordinate[] holeCoords = removeDuplicatePoints(poly.getInteriorRingN(i).getCoordinates());
+ holes.add(fact.createLinearRing(holeCoords));
+ }
+ return fact.createPolygon(shell, GeometryFactory.toLinearRingArray(holes));
+ }
+
+ private MultiPolygon clean(MultiPolygon g)
+ {
+ List polys = new ArrayList();
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ Polygon poly = (Polygon) g.getGeometryN(i);
+ polys.add(clean(poly));
+ }
+ return fact.createMultiPolygon(GeometryFactory.toPolygonArray(polys));
+ }
+ private MultiLineString clean(MultiLineString g)
+ {
+ List lines = new ArrayList();
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ LineString line = (LineString) g.getGeometryN(i);
+ lines.add(clean(line));
+ }
+ return fact.createMultiLineString(GeometryFactory.toLineStringArray(lines));
+ }
+ private GeometryCollection clean(GeometryCollection g)
+ {
+ List geoms = new ArrayList();
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ Geometry geom = g.getGeometryN(i);
+ geoms.add(clean(geom));
+ }
+ return fact.createGeometryCollection(GeometryFactory.toGeometryArray(geoms));
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/AffineTransformationFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/AffineTransformationFunctions.java
new file mode 100644
index 0000000..bfb089c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/AffineTransformationFunctions.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+
+public class AffineTransformationFunctions
+{
+ public static Geometry transformByVectors(Geometry g, Geometry control)
+ {
+ int nControl = control.getNumGeometries();
+ Coordinate src[] = new Coordinate[nControl];
+ Coordinate dest[] = new Coordinate[nControl];
+ for (int i = 0; i < nControl; i++) {
+ Geometry contComp = control.getGeometryN(i);
+ Coordinate[] pts = contComp.getCoordinates();
+ src[i] = pts[0];
+ dest[i] = pts[1];
+ }
+ AffineTransformation trans = AffineTransformationFactory.createFromControlVectors(src, dest);
+ System.out.println(trans);
+ return trans.transform(g);
+ }
+
+ public static Geometry transformByBaseline(Geometry g, Geometry destBaseline)
+ {
+ Envelope env = g.getEnvelopeInternal();
+ Coordinate src0 = new Coordinate(env.getMinX(), env.getMinY());
+ Coordinate src1 = new Coordinate(env.getMaxX(), env.getMinY());
+
+ Coordinate[] destPts = destBaseline.getCoordinates();
+ Coordinate dest0 = destPts[0];
+ Coordinate dest1 = destPts[1];
+ AffineTransformation trans = AffineTransformationFactory.createFromBaseLines(src0, src1, dest0, dest1);
+ return trans.transform(g);
+ }
+
+ private static Coordinate envelopeCentre(Geometry g)
+ {
+ return g.getEnvelopeInternal().centre();
+ }
+
+ private static Coordinate envelopeLowerLeft(Geometry g)
+ {
+ Envelope env = g.getEnvelopeInternal();
+ return new Coordinate(env.getMinX(), env.getMinY());
+ }
+
+ public static Geometry viewport(Geometry g, Geometry gViewport)
+ {
+ Envelope viewEnv = gViewport.getEnvelopeInternal();
+ Envelope env = g.getEnvelopeInternal();
+ AffineTransformation trans = viewportTrans(env, viewEnv);
+ return trans.transform(g);
+ }
+
+ private static AffineTransformation viewportTrans(Envelope srcEnv, Envelope viewEnv) {
+ // works even if W or H are zero, thanks to Java infinity value.
+ double scaleW = viewEnv.getWidth() / srcEnv.getWidth();
+ double scaleH = viewEnv.getHeight() / srcEnv.getHeight();
+ // choose minimum scale to ensure source fits viewport
+ double scale = Math.min(scaleW, scaleH);
+
+ Coordinate centre = srcEnv.centre();
+ Coordinate viewCentre = viewEnv.centre();
+
+ // isotropic scaling
+ AffineTransformation trans = AffineTransformation.scaleInstance(scale, scale, centre.x, centre.y);
+ // translate using envelope centres
+ trans.translate(viewCentre.x - centre.x, viewCentre.y - centre.y);
+ return trans;
+ }
+
+ public static Geometry scale(Geometry g, double scale)
+ {
+ Coordinate centre = envelopeCentre(g);
+ AffineTransformation trans = AffineTransformation.scaleInstance(scale, scale, centre.x, centre.y);
+ return trans.transform(g);
+ }
+
+ public static Geometry reflectInX(Geometry g)
+ {
+ Coordinate centre = envelopeCentre(g);
+ AffineTransformation trans = AffineTransformation.scaleInstance(1, -1, centre.x, centre.y);
+ return trans.transform(g);
+ }
+
+ public static Geometry reflectInY(Geometry g)
+ {
+ Coordinate centre = envelopeCentre(g);
+ AffineTransformation trans = AffineTransformation.scaleInstance(-1, 1, centre.x, centre.y);
+ return trans.transform(g);
+ }
+
+ public static Geometry rotateByPiMultiple(Geometry g, double multipleOfPi)
+ {
+ Coordinate centre = envelopeCentre(g);
+ AffineTransformation trans = AffineTransformation.rotationInstance(multipleOfPi * Math.PI, centre.x, centre.y);
+ return trans.transform(g);
+ }
+
+ public static Geometry rotateByPiMultipleAroundPoint(Geometry g, Geometry pt, double multipleOfPi)
+ {
+ Coordinate loc;
+ if (pt == null) {
+ loc = new Coordinate(0,0);
+ }
+ else {
+ loc = pt.getCoordinates()[0];
+ }
+ AffineTransformation trans = AffineTransformation.rotationInstance(multipleOfPi * Math.PI, loc.x, loc.y);
+ return trans.transform(g);
+ }
+
+ public static Geometry rotate(Geometry g, double angle)
+ {
+ Coordinate centre = envelopeCentre(g);
+ AffineTransformation trans = AffineTransformation.rotationInstance(angle, centre.x, centre.y);
+ return trans.transform(g);
+ }
+
+ public static Geometry rotateAroundPoint(Geometry g, Geometry pt, double angle)
+ {
+ Coordinate loc;
+ if (pt == null) {
+ loc = new Coordinate(0,0);
+ }
+ else {
+ loc = pt.getCoordinates()[0];
+ }
+ AffineTransformation trans = AffineTransformation.rotationInstance(angle, loc.x, loc.y);
+ return trans.transform(g);
+ }
+
+ public static Geometry translateCentreToOrigin(Geometry g)
+ {
+ Coordinate centre = envelopeCentre(g);
+ AffineTransformation trans = AffineTransformation.translationInstance(-centre.x, -centre.y);
+ return trans.transform(g);
+ }
+ public static Geometry translateToOrigin(Geometry g)
+ {
+ Coordinate lowerLeft = envelopeLowerLeft(g);
+ AffineTransformation trans = AffineTransformation.translationInstance(-lowerLeft.x, -lowerLeft.y);
+ return trans.transform(g);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/BoundaryFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/BoundaryFunctions.java
new file mode 100644
index 0000000..58f922f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/BoundaryFunctions.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.algorithm.MinimumBoundingCircle;
+import org.locationtech.jts.algorithm.MinimumDiameter;
+import org.locationtech.jts.densify.Densifier;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.OctagonalEnvelope;
+import org.locationtech.jts.operation.BoundaryOp;
+
+public class BoundaryFunctions {
+ public static Geometry boundary(Geometry g) { return g.getBoundary(); }
+
+ public static Geometry boundaryMod2(Geometry g) {
+ return BoundaryOp.getBoundary(g, BoundaryNodeRule.MOD2_BOUNDARY_RULE);
+ }
+ public static Geometry boundaryEndpoint(Geometry g) {
+ return BoundaryOp.getBoundary(g, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE);
+ }
+ public static Geometry boundaryMonoValentEnd(Geometry g) {
+ return BoundaryOp.getBoundary(g, BoundaryNodeRule.MONOVALENT_ENDPOINT_BOUNDARY_RULE);
+ }
+ public static Geometry boundaryMultiValentEnd(Geometry g) {
+ return BoundaryOp.getBoundary(g, BoundaryNodeRule.MULTIVALENT_ENDPOINT_BOUNDARY_RULE);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/BufferByUnionFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/BufferByUnionFunctions.java
new file mode 100644
index 0000000..e3cc52f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/BufferByUnionFunctions.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryCollectionIterator;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.noding.SegmentString;
+import org.locationtech.jts.operation.buffer.BufferInputLineSimplifier;
+import org.locationtech.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.operation.buffer.OffsetCurveSetBuilder;
+import org.locationtech.jts.operation.buffer.validate.BufferResultValidator;
+import org.locationtech.jtstest.geomfunction.Metadata;
+
+
+public class BufferByUnionFunctions {
+
+ public static Geometry componentBuffers(Geometry g, double distance)
+ {
+ List bufs = new ArrayList();
+ for (Iterator it = new GeometryCollectionIterator(g); it.hasNext(); ) {
+ Geometry comp = (Geometry) it.next();
+ if (comp instanceof GeometryCollection) continue;
+ bufs.add(comp.buffer(distance));
+ }
+ return FunctionsUtil.getFactoryOrDefault(g)
+ .createGeometryCollection(GeometryFactory.toGeometryArray(bufs));
+ }
+
+ public static Geometry bufferByComponents(Geometry g, double distance)
+ {
+ return componentBuffers(g, distance).union();
+ }
+
+ /**
+ * Buffer polygons by buffering the individual boundary segments and
+ * either unioning or differencing them.
+ *
+ * @param g
+ * @param distance
+ * @return the buffer geometry
+ */
+ public static Geometry bufferBySegments(Geometry g, double distance)
+ {
+ Geometry segs = LineHandlingFunctions.extractSegments(g);
+ double posDist = Math.abs(distance);
+ Geometry segBuf = bufferByComponents(segs, posDist);
+ if (distance < 0.0)
+ return g.difference(segBuf);
+ return g.union(segBuf);
+ }
+
+ public static Geometry bufferByChains(Geometry g, double distance,
+ @Metadata(title="Max Chain Size")
+ int maxChainSize)
+ {
+ if (maxChainSize <= 0)
+ throw new IllegalArgumentException("Maximum Chain Size must be specified as an input parameter");
+ Geometry segs = LineHandlingFunctions.extractChains(g, maxChainSize);
+ double posDist = Math.abs(distance);
+ Geometry segBuf = bufferByComponents(segs, posDist);
+ if (distance < 0.0)
+ return g.difference(segBuf);
+ return g.union(segBuf);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/BufferFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/BufferFunctions.java
new file mode 100644
index 0000000..3e36d34
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/BufferFunctions.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.util.GeometryMapper;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.geom.util.GeometryMapper.MapOp;
+import org.locationtech.jts.noding.SegmentString;
+import org.locationtech.jts.operation.buffer.BufferInputLineSimplifier;
+import org.locationtech.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.operation.buffer.OffsetCurveBuilder;
+import org.locationtech.jts.operation.buffer.OffsetCurveSetBuilder;
+import org.locationtech.jts.operation.buffer.validate.BufferResultValidator;
+import org.locationtech.jtstest.geomfunction.Metadata;
+
+
+public class BufferFunctions {
+
+ public static String bufferDescription = "Buffers a geometry by a distance";
+
+ @Metadata(description="Buffer a geometry by a distance")
+ public static Geometry buffer(Geometry g, double distance) { return g.buffer(distance); }
+
+ public static Geometry bufferWithParams(Geometry g,
+ Double distance,
+ @Metadata(title="Quadrant Segs")
+ Integer quadrantSegments,
+ @Metadata(title="Cap style")
+ Integer capStyle,
+ @Metadata(title="Join style")
+ Integer joinStyle,
+ @Metadata(title="Mitre limit")
+ Double mitreLimit)
+ {
+ double dist = 0;
+ if (distance != null) dist = distance.doubleValue();
+
+ BufferParameters bufParams = new BufferParameters();
+ if (quadrantSegments != null) bufParams.setQuadrantSegments(quadrantSegments.intValue());
+ if (capStyle != null) bufParams.setEndCapStyle(capStyle.intValue());
+ if (joinStyle != null) bufParams.setJoinStyle(joinStyle.intValue());
+ if (mitreLimit != null) bufParams.setMitreLimit(mitreLimit.doubleValue());
+
+ return BufferOp.bufferOp(g, dist, bufParams);
+ }
+
+ public static Geometry bufferWithSimplify(Geometry g, Double distance,
+ @Metadata(title="Simplify factor")
+ Double simplifyFactor)
+ {
+ double dist = 0;
+ if (distance != null) dist = distance.doubleValue();
+
+ BufferParameters bufParams = new BufferParameters();
+ if (simplifyFactor != null) bufParams.setSimplifyFactor(simplifyFactor.doubleValue());
+
+ return BufferOp.bufferOp(g, dist, bufParams);
+ }
+
+ public static Geometry bufferCurve(Geometry g, double distance)
+ {
+ return buildCurveSet(g, distance, new BufferParameters());
+ }
+
+ public static Geometry bufferCurveWithParams(Geometry g,
+ Double distance,
+ @Metadata(title="Quadrant Segs")
+ Integer quadrantSegments,
+ @Metadata(title="Cap style")
+ Integer capStyle,
+ @Metadata(title="Join style")
+ Integer joinStyle,
+ @Metadata(title="Mitre limit")
+ Double mitreLimit)
+ {
+ double dist = 0;
+ if (distance != null) dist = distance.doubleValue();
+
+ BufferParameters bufParams = new BufferParameters();
+ if (quadrantSegments != null) bufParams.setQuadrantSegments(quadrantSegments.intValue());
+ if (capStyle != null) bufParams.setEndCapStyle(capStyle.intValue());
+ if (joinStyle != null) bufParams.setJoinStyle(joinStyle.intValue());
+ if (mitreLimit != null) bufParams.setMitreLimit(mitreLimit.doubleValue());
+
+ return buildCurveSet(g, dist, bufParams);
+ }
+
+ private static Geometry buildCurveSet(Geometry g, double dist, BufferParameters bufParams)
+ {
+ // --- now construct curve
+ OffsetCurveBuilder ocb = new OffsetCurveBuilder(
+ g.getFactory().getPrecisionModel(),
+ bufParams);
+ OffsetCurveSetBuilder ocsb = new OffsetCurveSetBuilder(g, dist, ocb);
+ List curves = ocsb.getCurves();
+
+ List lines = new ArrayList();
+ for (Iterator i = curves.iterator(); i.hasNext(); ) {
+ SegmentString ss = (SegmentString) i.next();
+ Coordinate[] pts = ss.getCoordinates();
+ lines.add(g.getFactory().createLineString(pts));
+ }
+ Geometry curve = g.getFactory().buildGeometry(lines);
+ return curve;
+ }
+
+ public static Geometry bufferLineSimplifier(Geometry g, double distance)
+ {
+ return buildBufferLineSimplifiedSet(g, distance);
+ }
+
+ private static Geometry buildBufferLineSimplifiedSet(Geometry g, double distance)
+ {
+ List simpLines = new ArrayList();
+
+ List lines = new ArrayList();
+ LinearComponentExtracter.getLines(g, lines);
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ Coordinate[] pts = line.getCoordinates();
+ simpLines.add(g.getFactory().createLineString(BufferInputLineSimplifier.simplify(pts, distance)));
+ }
+ Geometry simpGeom = g.getFactory().buildGeometry(simpLines);
+ return simpGeom;
+ }
+
+ public static Geometry bufferValidated(Geometry g, double distance)
+ {
+ Geometry buf = g.buffer(distance);
+ String errMsg = BufferResultValidator.isValidMsg(g, distance, buf);
+ if (errMsg != null)
+ throw new IllegalStateException("Buffer Validation error: " + errMsg);
+ return buf;
+ }
+
+ public static Geometry bufferValidatedGeom(Geometry g, double distance)
+ {
+ Geometry buf = g.buffer(distance);
+ BufferResultValidator validator = new BufferResultValidator(g, distance, buf);
+ boolean isValid = validator.isValid();
+ return validator.getErrorIndicator();
+ }
+
+ public static Geometry singleSidedBufferCurve(Geometry geom, double distance) {
+ BufferParameters bufParam = new BufferParameters();
+ bufParam.setSingleSided(true);
+ OffsetCurveBuilder ocb = new OffsetCurveBuilder(
+ geom.getFactory().getPrecisionModel(), bufParam
+ );
+ Coordinate[] pts = ocb.getLineCurve(geom.getCoordinates(), distance);
+ Geometry curve = geom.getFactory().createLineString(pts);
+ return curve;
+ }
+
+ public static Geometry singleSidedBuffer(Geometry geom, double distance) {
+ BufferParameters bufParams = new BufferParameters();
+ bufParams.setSingleSided(true);
+ return BufferOp.bufferOp(geom, distance, bufParams);
+ }
+
+ public static Geometry bufferEach(Geometry g, final double distance)
+ {
+ return GeometryMapper.map(g, new MapOp() {
+
+ public Geometry map(Geometry g)
+ {
+ return g.buffer(distance);
+ }
+
+ });
+ }
+
+ public static Geometry bufferAndInverse(Geometry g, double distance) {
+ return g.buffer(distance).buffer(-distance);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/ConstructionFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/ConstructionFunctions.java
new file mode 100644
index 0000000..4d419ba
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/ConstructionFunctions.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.algorithm.MinimumBoundingCircle;
+import org.locationtech.jts.algorithm.MinimumDiameter;
+import org.locationtech.jts.densify.Densifier;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.OctagonalEnvelope;
+
+public class ConstructionFunctions {
+ public static Geometry octagonalEnvelope(Geometry g) { return OctagonalEnvelope.octagonalEnvelope(g); }
+
+ public static Geometry minimumDiameter(Geometry g) { return (new MinimumDiameter(g)).getDiameter(); }
+ public static double minimumDiameterLength(Geometry g) { return (new MinimumDiameter(g)).getDiameter().getLength(); }
+
+ public static Geometry minimumRectangle(Geometry g) { return (new MinimumDiameter(g)).getMinimumRectangle(); }
+ public static Geometry minimumBoundingCircle(Geometry g) { return (new MinimumBoundingCircle(g)).getCircle(); }
+ public static Geometry maximumDiameter(Geometry g) { return
+ g.getFactory().createLineString((new MinimumBoundingCircle(g)).getExtremalPoints()); }
+ public static Geometry farthestPoints(Geometry g) {
+ return ((new MinimumBoundingCircle(g)).getFarthestPoints()); }
+ public static double maximumDiameterLength(Geometry g) { return 2 * (new MinimumBoundingCircle(g)).getRadius(); }
+
+ public static Geometry boundary(Geometry g) { return g.getBoundary(); }
+ public static Geometry convexHull(Geometry g) { return g.convexHull(); }
+ public static Geometry centroid(Geometry g) { return g.getCentroid(); }
+ public static Geometry interiorPoint(Geometry g) { return g.getInteriorPoint(); }
+
+ public static Geometry densify(Geometry g, double distance) { return Densifier.densify(g, distance); }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/ConversionFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/ConversionFunctions.java
new file mode 100644
index 0000000..b7e445c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/ConversionFunctions.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.geom.util.PolygonExtracter;
+
+public class ConversionFunctions
+{
+ public static Geometry toPoints(Geometry g1, Geometry g2)
+ {
+ Geometry geoms = FunctionsUtil.buildGeometry(g1, g2);
+ return FunctionsUtil.getFactoryOrDefault(g1, g2)
+ .createMultiPoint(geoms.getCoordinates());
+ }
+
+ public static Geometry toLines(Geometry g1, Geometry g2)
+ {
+ Geometry geoms = FunctionsUtil.buildGeometry(g1, g2);
+ return FunctionsUtil.getFactoryOrDefault(g1, g2)
+ .buildGeometry(LinearComponentExtracter.getLines(geoms));
+ }
+
+ public static Geometry toMultiPolygon(Geometry g1, Geometry g2)
+ {
+ Geometry geoms = FunctionsUtil.buildGeometry(g1, g2);
+ List polys = PolygonExtracter.getPolygons(g1);
+ PolygonExtracter.getPolygons(g2, polys);
+ return FunctionsUtil.getFactoryOrDefault(g1, g2)
+ .createMultiPolygon( GeometryFactory.toPolygonArray(polys));
+ }
+
+ public static Geometry toGeometryCollection(Geometry g, Geometry g2)
+ {
+ List atomicGeoms = new ArrayList();
+ if (g != null) addComponents(g, atomicGeoms);
+ if (g2 != null) addComponents(g2, atomicGeoms);
+ return g.getFactory().createGeometryCollection(
+ GeometryFactory.toGeometryArray(atomicGeoms));
+ }
+
+ private static void addComponents(Geometry g, List atomicGeoms)
+ {
+ if (! (g instanceof GeometryCollection)) {
+ atomicGeoms.add(g);
+ return;
+ }
+
+ GeometryCollectionIterator it = new GeometryCollectionIterator(g);
+ while (it.hasNext()) {
+ Geometry gi = (Geometry) it.next();
+ if (! (gi instanceof GeometryCollection))
+ atomicGeoms.add(gi);
+ }
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/CreateFractalShapeFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/CreateFractalShapeFunctions.java
new file mode 100644
index 0000000..022447a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/CreateFractalShapeFunctions.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.shape.fractal.KochSnowflakeBuilder;
+import org.locationtech.jts.shape.fractal.SierpinskiCarpetBuilder;
+
+public class CreateFractalShapeFunctions
+{
+
+ public static Geometry kochSnowflake(Geometry g, int n)
+ {
+ KochSnowflakeBuilder builder = new KochSnowflakeBuilder(FunctionsUtil.getFactoryOrDefault(g));
+ builder.setExtent(FunctionsUtil.getEnvelopeOrDefault(g));
+ builder.setNumPoints(n);
+ return builder.getGeometry();
+ }
+ public static Geometry sierpinskiCarpet(Geometry g, int n)
+ {
+ SierpinskiCarpetBuilder builder = new SierpinskiCarpetBuilder(FunctionsUtil.getFactoryOrDefault(g));
+ builder.setExtent(FunctionsUtil.getEnvelopeOrDefault(g));
+ builder.setNumPoints(n);
+ return builder.getGeometry();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/CreateRandomShapeFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/CreateRandomShapeFunctions.java
new file mode 100644
index 0000000..e19f9ab
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/CreateRandomShapeFunctions.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.shape.random.RandomPointsBuilder;
+import org.locationtech.jts.shape.random.RandomPointsInGridBuilder;
+import org.locationtech.jtstest.geomfunction.Metadata;
+
+
+public class CreateRandomShapeFunctions {
+
+ public static Geometry randomPointsInGrid(Geometry g, int nPts) {
+ RandomPointsInGridBuilder shapeBuilder = new RandomPointsInGridBuilder(FunctionsUtil.getFactoryOrDefault(g));
+ shapeBuilder.setExtent(FunctionsUtil.getEnvelopeOrDefault(g));
+ shapeBuilder.setNumPoints(nPts);
+ return shapeBuilder.getGeometry();
+ }
+
+ public static Geometry randomPointsInGridCircles(Geometry g, int nPts) {
+ RandomPointsInGridBuilder shapeBuilder = new RandomPointsInGridBuilder(FunctionsUtil.getFactoryOrDefault(g));
+ shapeBuilder.setExtent(FunctionsUtil.getEnvelopeOrDefault(g));
+ shapeBuilder.setNumPoints(nPts);
+ shapeBuilder.setConstrainedToCircle(true);
+ return shapeBuilder.getGeometry();
+ }
+
+ public static Geometry randomPointsInGridWithGutter(Geometry g, int nPts,
+ @Metadata(title="Gutter fraction")
+ double gutterFraction) {
+ RandomPointsInGridBuilder shapeBuilder = new RandomPointsInGridBuilder(FunctionsUtil.getFactoryOrDefault(g));
+ shapeBuilder.setExtent(FunctionsUtil.getEnvelopeOrDefault(g));
+ shapeBuilder.setNumPoints(nPts);
+ shapeBuilder.setGutterFraction(gutterFraction);
+ return shapeBuilder.getGeometry();
+ }
+
+ public static Geometry randomPoints(Geometry g, int nPts) {
+ RandomPointsBuilder shapeBuilder = new RandomPointsBuilder(FunctionsUtil.getFactoryOrDefault(g));
+ shapeBuilder.setExtent(FunctionsUtil.getEnvelopeOrDefault(g));
+ shapeBuilder.setNumPoints(nPts);
+ return shapeBuilder.getGeometry();
+ }
+
+ public static Geometry randomPointsInPolygon(Geometry g, int nPts) {
+ RandomPointsBuilder shapeBuilder = new RandomPointsBuilder(FunctionsUtil.getFactoryOrDefault(g));
+ shapeBuilder.setExtent(g);
+ shapeBuilder.setNumPoints(nPts);
+ return shapeBuilder.getGeometry();
+ }
+
+ public static Geometry randomPointsInTriangle(Geometry g, int nPts) {
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ Coordinate[] gpts = g.getCoordinates();
+ Coordinate tri0 = gpts[0];
+ Coordinate tri1 = gpts[1];
+ Coordinate tri2 = gpts[2];
+
+ List pts = new ArrayList();
+
+ for (int i = 0; i < nPts; i++) {
+ pts.add(geomFact.createPoint(randomPointInTriangle(tri0, tri1, tri2)));
+ }
+ return geomFact.buildGeometry(pts);
+ }
+
+ private static Coordinate randomPointInTriangle(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ double s = Math.random();
+ double t = Math.random();
+ if (s + t > 1) {
+ s = 1.0 - s;
+ t = 1.0 - t;
+ }
+ double a = 1 - (s + t);
+ double b = s;
+ double c = t;
+
+ double rpx = a * p0.x + b * p1.x + c * p2.x;
+ double rpy = a * p0.y + b * p1.y + c * p2.y;
+
+ return new Coordinate(rpx, rpy);
+ }
+
+ public static Geometry randomRadialPoints(Geometry g, int nPts) {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ double xLen = env.getWidth();
+ double yLen = env.getHeight();
+ double rMax = Math.min(xLen, yLen) / 2.0;
+
+ double centreX = env.getMinX() + xLen/2;
+ double centreY = env.getMinY() + yLen/2;
+
+ List pts = new ArrayList();
+
+ for (int i = 0; i < nPts; i++) {
+ double rand = Math.random();
+ // use rand^2 to accentuate radial distribution
+ double r = rMax * rand * rand;
+ // produces even distribution
+ //double r = rMax * Math.sqrt(rand);
+ double ang = 2 * Math.PI * Math.random();
+ double x = centreX + r * Math.cos(ang);
+ double y = centreY + r * Math.sin(ang);
+ pts.add(geomFact.createPoint(new Coordinate(x, y)));
+ }
+ return geomFact.buildGeometry(pts);
+ }
+
+ public static Geometry haltonPoints(Geometry g, int nPts)
+ {
+ return haltonPointsWithBases(g, nPts, 2, 3);
+ }
+
+ public static Geometry haltonPoints57(Geometry g, int nPts)
+ {
+ return haltonPointsWithBases(g, nPts, 5, 7);
+ }
+
+ public static Geometry haltonPointsWithBases(Geometry g, int nPts,
+ @Metadata(title="Base 1")
+ int basei,
+ @Metadata(title="Base 2")
+ int basej)
+ {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ Coordinate[] pts = new Coordinate[nPts];
+ double baseX = env.getMinX();
+ double baseY = env.getMinY();
+
+ int i = 0;
+ while (i < nPts) {
+ double x = baseX + env.getWidth() * haltonOrdinate(i + 1, basei);
+ double y = baseY + env.getHeight() * haltonOrdinate(i + 1, basej);
+ Coordinate p = new Coordinate(x, y);
+ if (! env.contains(p))
+ continue;
+ pts[i++] = p;
+ }
+ return FunctionsUtil.getFactoryOrDefault(g).createMultiPoint(pts);
+ }
+
+ private static double haltonOrdinate(int index, int base)
+ {
+ double result = 0;
+ double f = 1.0 / base;
+ int i = index;
+ while (i > 0) {
+ result = result + f * (i % base);
+ i = (int) Math.floor(i / (double) base);
+ f = f / base;
+ }
+ return result;
+ }
+
+ public static Geometry randomSegments(Geometry g, int nPts) {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ double xLen = env.getWidth();
+ double yLen = env.getHeight();
+
+ List lines = new ArrayList();
+
+ for (int i = 0; i < nPts; i++) {
+ double x0 = env.getMinX() + xLen * Math.random();
+ double y0 = env.getMinY() + yLen * Math.random();
+ double x1 = env.getMinX() + xLen * Math.random();
+ double y1 = env.getMinY() + yLen * Math.random();
+ lines.add(geomFact.createLineString(new Coordinate[] {
+ new Coordinate(x0, y0), new Coordinate(x1, y1) }));
+ }
+ return geomFact.buildGeometry(lines);
+ }
+
+ public static Geometry randomSegmentsInGrid(Geometry g, int nPts) {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+
+ int nCell = (int) Math.sqrt(nPts) + 1;
+
+ double xLen = env.getWidth() / nCell;
+ double yLen = env.getHeight() / nCell;
+
+ List lines = new ArrayList();
+
+ for (int i = 0; i < nCell; i++) {
+ for (int j = 0; j < nCell; j++) {
+ double x0 = env.getMinX() + i * xLen + xLen * Math.random();
+ double y0 = env.getMinY() + j * yLen + yLen * Math.random();
+ double x1 = env.getMinX() + i * xLen + xLen * Math.random();
+ double y1 = env.getMinY() + j * yLen + yLen * Math.random();
+ lines.add(geomFact.createLineString(new Coordinate[] {
+ new Coordinate(x0, y0), new Coordinate(x1, y1) }));
+ }
+ }
+ return geomFact.buildGeometry(lines);
+ }
+
+ public static Geometry randomLineString(Geometry g, int nPts) {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ double width = env.getWidth();
+ double hgt = env.getHeight();
+
+ Coordinate[] pts = new Coordinate[nPts];
+
+ for (int i = 0; i < nPts; i++) {
+ double xLen = width * Math.random();
+ double yLen = hgt * Math.random();
+ pts[i] = randomPtInRectangleAround(env.centre(), xLen, yLen);
+ }
+ return geomFact.createLineString(pts);
+ }
+
+ public static Geometry randomRectilinearWalk(Geometry g, int nPts) {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ double xLen = env.getWidth();
+ double yLen = env.getHeight();
+
+ Coordinate[] pts = new Coordinate[nPts];
+
+ boolean xory = true;
+ for (int i = 0; i < nPts; i++) {
+ Coordinate pt = null;
+ if (i == 0) {
+ pt = randomPtInRectangleAround(env.centre(), xLen, yLen);
+ }
+ else {
+ double dist = xLen * (Math.random() - 0.5);
+ double x = pts[i-1].x;
+ double y = pts[i-1].y;
+ if (xory) {
+ x += dist;
+ }
+ else {
+ y += dist;
+ }
+ // switch orientation
+ xory = ! xory;
+ pt = new Coordinate(x, y);
+ }
+ pts[i] = pt;
+ }
+ return geomFact.createLineString(pts);
+ }
+
+ private static int randomQuadrant(int exclude)
+ {
+ while (true) {
+ int quad = (int) (Math.random() * 4);
+ if (quad > 3) quad = 3;
+ if (quad != exclude) return quad;
+ }
+ }
+
+ private static Coordinate randomPtInRectangleAround(Coordinate centre, double width, double height)
+ {
+ double x0 = centre.x + width * (Math.random() - 0.5);
+ double y0 = centre.y + height * (Math.random() - 0.5);
+ return new Coordinate(x0, y0);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/CreateShapeFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/CreateShapeFunctions.java
new file mode 100644
index 0000000..151f471
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/CreateShapeFunctions.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.awt.Font;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.awt.*;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+import org.locationtech.jts.util.GeometricShapeFactory;
+import org.locationtech.jtstest.geomfunction.Metadata;
+
+public class CreateShapeFunctions {
+
+
+ private static final int DEFAULT_POINTSIZE = 100;
+
+ public static Geometry fontGlyphSerif(Geometry g, String text)
+ {
+ return fontGlyph(g, text, new Font(FontGlyphReader.FONT_SERIF, Font.PLAIN, DEFAULT_POINTSIZE));
+ }
+
+ public static Geometry fontGlyphSerifPointSize(Geometry g, String text,
+ @Metadata(title="Point size")
+ int pointSize)
+ {
+ return fontGlyph(g, text, new Font(FontGlyphReader.FONT_SERIF, Font.PLAIN, pointSize));
+ }
+
+ public static Geometry fontGlyph(Geometry g, String text,
+ @Metadata(title="Font name")
+ String fontName)
+ {
+ return fontGlyph(g, text, new Font(fontName, Font.PLAIN, DEFAULT_POINTSIZE));
+ }
+
+ public static Geometry fontGlyphSansSerif(Geometry g, String text)
+ {
+ return fontGlyph(g, text, new Font(FontGlyphReader.FONT_SANSSERIF, Font.PLAIN, DEFAULT_POINTSIZE));
+ }
+
+ public static Geometry fontGlyphMonospaced(Geometry g, String text)
+ {
+ return fontGlyph(g, text, new Font(FontGlyphReader.FONT_MONOSPACED, Font.PLAIN, DEFAULT_POINTSIZE));
+ }
+
+ private static Geometry fontGlyph(Geometry g, String text, Font font) {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+
+ Geometry textGeom = FontGlyphReader.read(text, font, geomFact);
+ Envelope envText = textGeom.getEnvelopeInternal();
+
+ if (g != null) {
+ // transform to baseline
+ Coordinate baseText0 = new Coordinate(envText.getMinX(), envText.getMinY());
+ Coordinate baseText1 = new Coordinate(envText.getMaxX(), envText.getMinY());
+ Coordinate baseGeom0 = new Coordinate(env.getMinX(), env.getMinY());
+ Coordinate baseGeom1 = new Coordinate(env.getMaxX(), env.getMinY());
+ AffineTransformation trans = AffineTransformationFactory.createFromBaseLines(baseText0, baseText1, baseGeom0, baseGeom1);
+ return trans.transform(textGeom);
+ }
+ return textGeom;
+ }
+
+ public static Geometry grid(Geometry g, int nCells)
+ {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+
+ int nCellsOnSideY = (int) Math.sqrt(nCells);
+ int nCellsOnSideX = nCells / nCellsOnSideY;
+
+ // alternate: make square cells, with varying grid width/height
+ //double extent = env.minExtent();
+ //double nCellsOnSide = Math.max(nCellsOnSideY, nCellsOnSideX);
+
+ double cellSizeX = env.getWidth() / nCellsOnSideX;
+ double cellSizeY = env.getHeight() / nCellsOnSideY;
+
+ List geoms = new ArrayList();
+
+ for (int i = 0; i < nCellsOnSideX; i++) {
+ for (int j = 0; j < nCellsOnSideY; j++) {
+ double x = env.getMinX() + i * cellSizeX;
+ double y = env.getMinY() + j * cellSizeY;
+ double x2 = env.getMinX() + (i + 1) * cellSizeX;
+ double y2 = env.getMinY() + (j + 1) * cellSizeY;
+
+ Envelope cellEnv = new Envelope(x, x2, y, y2);
+ geoms.add(geomFact.toGeometry(cellEnv));
+ }
+ }
+ return geomFact.buildGeometry(geoms);
+ }
+
+ public static Geometry supercircle3(Geometry g, int nPts)
+ {
+ return supercircle(g, nPts, 3);
+ }
+
+ public static Geometry squircle(Geometry g, int nPts)
+ {
+ return supercircle(g, nPts, 4);
+ }
+
+ public static Geometry supercircle5(Geometry g, int nPts)
+ {
+ return supercircle(g, nPts, 5);
+ }
+
+ public static Geometry supercirclePoint5(Geometry g, int nPts)
+ {
+ return supercircle(g, nPts, 0.5);
+ }
+
+
+ public static Geometry supercircle(Geometry g,
+ @Metadata(title="Point count")
+ int nPts,
+ @Metadata(title="Power")
+ double pow)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setNumPoints(nPts);
+ if (g != null)
+ gsf.setEnvelope(g.getEnvelopeInternal());
+ else
+ gsf.setEnvelope(new Envelope(0, 1, 0, 1));
+ return gsf.createSupercircle(pow);
+ }
+
+ public static Geometry ellipse(Geometry g, int nPts)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setNumPoints(nPts);
+ if (g != null)
+ gsf.setEnvelope(g.getEnvelopeInternal());
+ else
+ gsf.setEnvelope(new Envelope(0, 1, 0, 1));
+ return gsf.createCircle();
+ }
+ public static Geometry ellipseRotate(Geometry g, int nPts,
+ @Metadata(title="Angle")
+ double ang)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setNumPoints(nPts);
+ gsf.setRotation(ang);
+ if (g != null)
+ gsf.setEnvelope(g.getEnvelopeInternal());
+ else
+ gsf.setEnvelope(new Envelope(0, 1, 0, 1));
+ return gsf.createCircle();
+ }
+
+ public static Geometry sineStar(Geometry g,
+ @Metadata(title="Arm count")
+ int nArms,
+ @Metadata(title="Point count")
+ int nPts)
+ {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+
+ double size = Math.min(env.getHeight(), env.getWidth());
+ SineStarFactory shape = new SineStarFactory(geomFact);
+ shape.setCentre(env.centre());
+ shape.setSize(size);
+ shape.setNumPoints(nPts);
+ shape.setNumArms(nArms);
+ shape.setArmLengthRatio(0.5);
+ return shape.createSineStar();
+ }
+
+ public static Geometry comb(Geometry g, int nArms)
+ {
+ Envelope env = FunctionsUtil.getEnvelopeOrDefault(g);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+
+ int npts = 4 * (nArms - 1) + 2 + 2 + 1;
+ Coordinate[] pts = new Coordinate[npts];
+ double armWidth = env.getWidth() / (2 * nArms - 1);
+ double armLen = env.getHeight() - armWidth;
+
+ double xBase = env.getMinX();
+ double yBase = env.getMinY();
+
+ int ipts = 0;
+ for (int i = 0; i < nArms; i++) {
+ double x1 = xBase + i * 2 * armWidth;
+ double y1 = yBase + armLen + armWidth;
+ pts[ipts++] = new Coordinate(x1, y1);
+ pts[ipts++] = new Coordinate(x1 + armWidth, y1);
+ if (i < nArms - 1) {
+ pts[ipts++] = new Coordinate(x1 + armWidth, yBase + armWidth);
+ pts[ipts++] = new Coordinate(x1 + 2 * armWidth, yBase + armWidth);
+ }
+ }
+ pts[ipts++] = new Coordinate(env.getMaxX(), yBase);
+ pts[ipts++] = new Coordinate(xBase, yBase);
+ pts[ipts++] = new Coordinate(pts[0]);
+
+ return geomFact.createPolygon(pts);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/DissolveFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/DissolveFunctions.java
new file mode 100644
index 0000000..9f2e00f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/DissolveFunctions.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+
+import org.locationtech.jts.dissolve.LineDissolver;
+import org.locationtech.jts.geom.Geometry;
+
+public class DissolveFunctions {
+
+ public static Geometry dissolve(Geometry geom)
+ {
+ return LineDissolver.dissolve(geom);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/DistanceFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/DistanceFunctions.java
new file mode 100644
index 0000000..d5a4a18
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/DistanceFunctions.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.algorithm.distance.*;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.operation.distance.*;
+
+public class DistanceFunctions {
+ public static double distance(Geometry a, Geometry b) {
+ return a.distance(b);
+ }
+
+ public static boolean isWithinDistance(Geometry a, Geometry b, double dist) {
+ return a.isWithinDistance(b, dist);
+ }
+
+ public static Geometry nearestPoints(Geometry a, Geometry b) {
+ Coordinate[] pts = DistanceOp.nearestPoints(a, b);
+ return a.getFactory().createLineString(pts);
+ }
+
+ public static Geometry discreteHausdorffDistanceLine(Geometry a, Geometry b)
+ {
+ DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
+ dist.distance();
+ return a.getFactory().createLineString(dist.getCoordinates());
+ }
+
+ public static Geometry densifiedDiscreteHausdorffDistanceLine(Geometry a, Geometry b, double frac)
+ {
+ DiscreteHausdorffDistance hausDist = new DiscreteHausdorffDistance(a, b);
+ hausDist.setDensifyFraction(frac);
+ hausDist.distance();
+ return a.getFactory().createLineString(hausDist.getCoordinates());
+ }
+
+ public static Geometry discreteOrientedHausdorffDistanceLine(Geometry a, Geometry b)
+ {
+ DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
+ dist.orientedDistance();
+ return a.getFactory().createLineString(dist.getCoordinates());
+ }
+
+ public static double discreteHausdorffDistance(Geometry a, Geometry b)
+ {
+ DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
+ return dist.distance();
+ }
+
+ public static double discreteOrientedHausdorffDistance(Geometry a, Geometry b)
+ {
+ DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
+ return dist.orientedDistance();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/DoubleKeyMap.java b/modules/app/src/main/java/org/locationtech/jtstest/function/DoubleKeyMap.java
new file mode 100644
index 0000000..ec90c91
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/DoubleKeyMap.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import java.util.*;
+
+public class DoubleKeyMap
+{
+ private Map topMap = new TreeMap();
+
+ public void put(Object key1, Object key2, Object value)
+ {
+ Map keyMap = (Map) topMap.get(key1);
+ if (keyMap == null)
+ keyMap = createKeyMap(key1);
+ keyMap.put(key2, value);
+ }
+
+ private Map createKeyMap(Object key1)
+ {
+ Map map = new TreeMap();
+ topMap.put(key1, map);
+ return map;
+ }
+
+ public Object get(Object key1, Object key2)
+ {
+ Map keyMap = (Map) topMap.get(key1);
+ if (keyMap == null) return null;
+ return keyMap.get(key2);
+ }
+
+ public Set keySet()
+ {
+ return topMap.keySet();
+ }
+ public Set keySet(Object key)
+ {
+ Map keyMap = (Map) topMap.get(key);
+ if (keyMap == null) return new TreeSet();
+ return keyMap.keySet();
+ }
+
+ public Collection values(Object key1)
+ {
+ Map keyMap = (Map) topMap.get(key1);
+ if (keyMap == null) return new ArrayList();
+ return keyMap.values();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/FunctionsUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/function/FunctionsUtil.java
new file mode 100644
index 0000000..a4cf5df
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/FunctionsUtil.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.awt.Graphics2D;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+import org.locationtech.jtstest.testbuilder.ui.render.GeometryPainter;
+
+
+public class FunctionsUtil {
+
+ public static final Envelope DEFAULT_ENVELOPE = new Envelope(0, 100, 0, 100);
+
+ public static Envelope getEnvelopeOrDefault(Geometry g)
+ {
+ if (g == null) return DEFAULT_ENVELOPE;
+ return g.getEnvelopeInternal();
+ }
+
+ public static GeometryFactory getFactoryOrDefault(Geometry g)
+ {
+ if (g == null) return JTSTestBuilder.getGeometryFactory();
+ return g.getFactory();
+ }
+
+ public static GeometryFactory getFactoryOrDefault(Geometry g1, Geometry g2)
+ {
+ if (g1 != null) return g1.getFactory();
+ if (g2 != null) return g2.getFactory();
+ return JTSTestBuilder.getGeometryFactory();
+ }
+
+ public static void showIndicator(Geometry geom)
+ {
+ GeometryEditPanel panel = JTSTestBuilderFrame
+ .instance().getTestCasePanel()
+ .getGeometryEditPanel();
+ Graphics2D gr = (Graphics2D) panel.getGraphics();
+ GeometryPainter.paint(geom, panel.getViewport(), gr,
+ AppConstants.INDICATOR_LINE_CLR,
+ AppConstants.INDICATOR_FILL_CLR);
+ }
+
+ public static Geometry buildGeometry(List geoms, Geometry parentGeom)
+ {
+ if (geoms.size() <= 0)
+ return null;
+ if (geoms.size() == 1)
+ return (Geometry) geoms.get(0);
+ // if parent was a GC, ensure returning a GC
+ if (parentGeom != null && parentGeom.getGeometryType().equals("GeometryCollection"))
+ return parentGeom.getFactory().createGeometryCollection(GeometryFactory.toGeometryArray(geoms));
+ // otherwise return MultiGeom
+ return getFactoryOrDefault(parentGeom).buildGeometry(geoms);
+ }
+
+ public static Geometry buildGeometry(Geometry[] geoms)
+ {
+ GeometryFactory gf = JTSTestBuilder.getGeometryFactory();
+ if (geoms.length > 0) {
+ gf = getFactoryOrDefault(geoms[0]);
+ }
+ return gf.createGeometryCollection(geoms);
+ }
+
+ public static Geometry buildGeometry(Geometry a, Geometry b) {
+ Geometry[] geoms = toGeometryArray(a, b);
+ return getFactoryOrDefault(a, b).createGeometryCollection(geoms); }
+
+ public static Geometry[] toGeometryArray(Geometry a, Geometry b) {
+ int size = 0;
+ if (a != null) size++;
+ if (b != null) size++;
+ Geometry[] geoms = new Geometry[size];
+ size = 0;
+ if (a != null) geoms[size++] = a;
+ if (b != null) geoms[size] = b;
+ return geoms;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/GeometryFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/GeometryFunctions.java
new file mode 100644
index 0000000..e63ff80
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/GeometryFunctions.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.CGAlgorithms;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.operation.overlay.snap.*;
+
+
+/**
+ * Implementations for various geometry functions.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryFunctions
+{
+ public static String lengthDescription = "Computes the length of perimeter of a Geometry";
+ public static double length(Geometry g) { return g.getLength(); }
+ public static double area(Geometry g) { return g.getArea(); }
+
+ public static boolean isSimple(Geometry g) { return g.isSimple(); }
+ public static boolean isValid(Geometry g) { return g.isValid(); }
+ public static boolean isRectangle(Geometry g) { return g.isRectangle(); }
+ public static boolean isClosed(Geometry g) {
+ if (g instanceof LineString) return ((LineString) g).isClosed();
+ if (g instanceof MultiLineString) return ((MultiLineString) g).isClosed();
+ // other geometry types are defined to be closed
+ return true;
+ }
+
+ public static Geometry envelope(Geometry g) { return g.getEnvelope(); }
+ public static Geometry reverse(Geometry g) { return g.reverse(); }
+ public static Geometry normalize(Geometry g)
+ {
+ Geometry gNorm = (Geometry) g.clone();
+ gNorm.normalize();
+ return gNorm;
+ }
+
+ public static Geometry getGeometryN(Geometry g, int i)
+ {
+ return g.getGeometryN(i);
+ }
+
+ public static Geometry getPolygonShell(Geometry g)
+ {
+ if (g instanceof Polygon) {
+ LinearRing shell = (LinearRing) ((Polygon) g).getExteriorRing();
+ return g.getFactory().createPolygon(shell, null);
+ }
+ if (g instanceof MultiPolygon) {
+ Polygon[] poly = new Polygon[g.getNumGeometries()];
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ LinearRing shell = (LinearRing) ((Polygon) g.getGeometryN(i)).getExteriorRing();
+ poly[i] = g.getFactory().createPolygon(shell, null);
+ }
+ return g.getFactory().createMultiPolygon(poly);
+ }
+ return null;
+ }
+
+ public static Geometry getPolygonHoles(Geometry geom)
+ {
+ final List holePolys = new ArrayList();
+ geom.apply(new GeometryFilter() {
+
+ public void filter(Geometry geom) {
+ if (geom instanceof Polygon) {
+ Polygon poly = (Polygon) geom;
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ Polygon hole = geom.getFactory().createPolygon((LinearRing) poly.getInteriorRingN(i), null);
+ holePolys.add(hole);
+ }
+ }
+ }
+ });
+ return geom.getFactory().buildGeometry(holePolys);
+ }
+
+ public static Geometry getPolygonHoleN(Geometry g, int i)
+ {
+ if (g instanceof Polygon) {
+ LinearRing ring = (LinearRing) ((Polygon) g).getInteriorRingN(i);
+ return ring;
+ }
+ return null;
+ }
+
+ public static Geometry convertToPolygon(Geometry g)
+ {
+ if (g instanceof Polygonal) return g;
+ // TODO: ensure ring is valid
+ LinearRing ring = g.getFactory().createLinearRing(g.getCoordinates());
+ return g.getFactory().createPolygon(ring, null);
+ }
+
+ public static Geometry getCoordinates(Geometry g)
+ {
+ Coordinate[] pts = g.getCoordinates();
+ return g.getFactory().createMultiPoint(pts);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/JTSFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/JTSFunctions.java
new file mode 100644
index 0000000..a33ef8b
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/JTSFunctions.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.*;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.util.*;
+
+public class JTSFunctions
+{
+ public static String jtsVersion(Geometry g)
+ {
+ return JTSVersion.CURRENT_VERSION.toString();
+ }
+
+ private static final double HEIGHT = 70;
+ private static final double WIDTH = 150; //125;
+ private static final double J_WIDTH = 30;
+ private static final double J_RADIUS = J_WIDTH - 5;
+
+ private static final double S_RADIUS = HEIGHT / 4;
+
+ private static final double T_WIDTH = WIDTH - 2 * S_RADIUS - J_WIDTH;
+
+
+ public static Geometry logoLines(Geometry g)
+ {
+ return create_J(g)
+ .union(create_T(g))
+ .union(create_S(g));
+ }
+
+ public static Geometry logoBuffer(Geometry g, double distance)
+ {
+ Geometry lines = logoLines(g);
+ BufferParameters bufParams = new BufferParameters();
+ bufParams.setEndCapStyle(BufferParameters.CAP_SQUARE);
+ return BufferOp.bufferOp(lines, distance, bufParams);
+ }
+
+ private static Geometry create_J(Geometry g)
+ {
+ GeometryFactory gf = FunctionsUtil.getFactoryOrDefault(g);
+
+ Coordinate[] jTop = new Coordinate[] {
+ new Coordinate(0,HEIGHT),
+ new Coordinate(J_WIDTH,HEIGHT),
+ new Coordinate(J_WIDTH,J_RADIUS)
+ };
+ Coordinate[] jBottom = new Coordinate[] {
+ new Coordinate(J_WIDTH - J_RADIUS,0),
+ new Coordinate(0,0)
+ };
+
+ GeometricShapeFactory gsf = new GeometricShapeFactory(gf);
+ gsf.setBase(new Coordinate(J_WIDTH - 2 * J_RADIUS, 0));
+ gsf.setSize(2 * J_RADIUS);
+ gsf.setNumPoints(10);
+ LineString jArc = gsf.createArc(1.5 * Math.PI, 0.5 * Math.PI);
+
+ CoordinateList coordList = new CoordinateList();
+ coordList.add(jTop, false);
+ coordList.add(jArc.reverse().getCoordinates(), false, 1, jArc.getNumPoints() - 1);
+ coordList.add(jBottom, false);
+
+ return gf.createLineString(coordList.toCoordinateArray());
+ }
+
+ private static Geometry create_T(Geometry g)
+ {
+ GeometryFactory gf = FunctionsUtil.getFactoryOrDefault(g);
+
+ Coordinate[] tTop = new Coordinate[] {
+ new Coordinate(J_WIDTH,HEIGHT),
+ new Coordinate(WIDTH - S_RADIUS - 5, HEIGHT)
+ };
+ Coordinate[] tBottom = new Coordinate[] {
+ new Coordinate(J_WIDTH + 0.5 * T_WIDTH,HEIGHT),
+ new Coordinate(J_WIDTH + 0.5 * T_WIDTH,0)
+ };
+ LineString[] lines = new LineString[] {
+ gf.createLineString(tTop),
+ gf.createLineString(tBottom)
+ };
+ return gf.createMultiLineString(lines);
+ }
+
+ private static Geometry create_S(Geometry g)
+ {
+ GeometryFactory gf = FunctionsUtil.getFactoryOrDefault(g);
+
+ double centreX = WIDTH - S_RADIUS;
+
+ Coordinate[] top = new Coordinate[] {
+ new Coordinate(WIDTH, HEIGHT),
+ new Coordinate(centreX, HEIGHT)
+ };
+ Coordinate[] bottom = new Coordinate[] {
+ new Coordinate(centreX, 0),
+ new Coordinate(WIDTH - 2 * S_RADIUS, 0)
+ };
+
+ GeometricShapeFactory gsf = new GeometricShapeFactory(gf);
+ gsf.setCentre(new Coordinate(centreX, HEIGHT - S_RADIUS));
+ gsf.setSize(2 * S_RADIUS);
+ gsf.setNumPoints(10);
+ LineString arcTop = gsf.createArc(0.5 * Math.PI, Math.PI);
+
+ GeometricShapeFactory gsf2 = new GeometricShapeFactory(gf);
+ gsf2.setCentre(new Coordinate(centreX, S_RADIUS));
+ gsf2.setSize(2 * S_RADIUS);
+ gsf2.setNumPoints(10);
+ LineString arcBottom = (LineString) gsf2.createArc(1.5 * Math.PI, Math.PI).reverse();
+
+ CoordinateList coordList = new CoordinateList();
+ coordList.add(top, false);
+ coordList.add(arcTop.getCoordinates(), false, 1, arcTop.getNumPoints() - 1);
+ coordList.add(new Coordinate(centreX, HEIGHT/2));
+ coordList.add(arcBottom.getCoordinates(), false, 1, arcBottom.getNumPoints() - 1);
+ coordList.add(bottom, false);
+
+
+
+ return gf.createLineString(coordList.toCoordinateArray());
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/LineHandlingFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/LineHandlingFunctions.java
new file mode 100644
index 0000000..5ec4187
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/LineHandlingFunctions.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import java.util.*;
+
+import org.locationtech.jts.algorithm.*;
+import org.locationtech.jts.densify.*;
+import org.locationtech.jts.dissolve.LineDissolver;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+import org.locationtech.jts.operation.linemerge.*;
+import org.locationtech.jts.operation.polygonize.*;
+
+public class LineHandlingFunctions {
+
+ public static Geometry mergeLines(Geometry g)
+ {
+ LineMerger merger = new LineMerger();
+ merger.add(g);
+ Collection lines = merger.getMergedLineStrings();
+ return g.getFactory().buildGeometry(lines);
+ }
+
+ public static Geometry sequenceLines(Geometry g)
+ {
+ return LineSequencer.sequence(g);
+ }
+
+ public static Geometry extractLines(Geometry g)
+ {
+ List lines = LinearComponentExtracter.getLines(g);
+ return g.getFactory().buildGeometry(lines);
+ }
+ public static Geometry extractSegments(Geometry g)
+ {
+ List lines = LinearComponentExtracter.getLines(g);
+ List segments = new ArrayList();
+ for (Iterator it = lines.iterator(); it.hasNext(); ) {
+ LineString line = (LineString) it.next();
+ for (int i = 1; i < line.getNumPoints(); i++) {
+ LineString seg = g.getFactory().createLineString(
+ new Coordinate[] { line.getCoordinateN(i-1), line.getCoordinateN(i) }
+ );
+ segments.add(seg);
+ }
+ }
+ return g.getFactory().buildGeometry(segments);
+ }
+ public static Geometry extractChains(Geometry g, int maxChainSize)
+ {
+ List lines = LinearComponentExtracter.getLines(g);
+ List chains = new ArrayList();
+ for (Iterator it = lines.iterator(); it.hasNext(); ) {
+ LineString line = (LineString) it.next();
+ for (int i = 0; i < line.getNumPoints() - 1; i += maxChainSize) {
+ LineString chain = extractChain(line, i, maxChainSize);
+ chains.add(chain);
+ }
+ }
+ return g.getFactory().buildGeometry(chains);
+ }
+
+ private static LineString extractChain(LineString line, int index, int maxChainSize)
+ {
+ int size = maxChainSize + 1;
+ if (index + size > line.getNumPoints())
+ size = line.getNumPoints() - index;
+ Coordinate[] pts = new Coordinate[size];
+ for (int i = 0; i < size; i++) {
+ pts[i] = line.getCoordinateN(index + i);
+ }
+ return line.getFactory().createLineString(pts);
+ }
+
+ public static Geometry dissolve(Geometry geom)
+ {
+ return LineDissolver.dissolve(geom);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/LineSegmentFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/LineSegmentFunctions.java
new file mode 100644
index 0000000..59e390e
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/LineSegmentFunctions.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.algorithm.CGAlgorithmsDD;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+public class LineSegmentFunctions
+{
+ public static boolean segmentIntersects(Geometry g1, Geometry g2)
+ {
+ Coordinate[] pt1 = g1.getCoordinates();
+ Coordinate[] pt2 = g2.getCoordinates();
+ RobustLineIntersector ri = new RobustLineIntersector();
+ ri.computeIntersection(pt1[0], pt1[1], pt2[0], pt2[1]);
+ return ri.hasIntersection();
+ }
+
+ public static Geometry segmentIntersection(Geometry g1, Geometry g2)
+ {
+ Coordinate[] pt1 = g1.getCoordinates();
+ Coordinate[] pt2 = g2.getCoordinates();
+ RobustLineIntersector ri = new RobustLineIntersector();
+ ri.computeIntersection(pt1[0], pt1[1], pt2[0], pt2[1]);
+ switch (ri.getIntersectionNum()) {
+ case 0:
+ // no intersection => return empty point
+ return g1.getFactory().createPoint((Coordinate) null);
+ case 1:
+ // return point
+ return g1.getFactory().createPoint(ri.getIntersection(0));
+ case 2:
+ // return line
+ return g1.getFactory().createLineString(
+ new Coordinate[] {
+ ri.getIntersection(0),
+ ri.getIntersection(1)
+ });
+ }
+ return null;
+ }
+
+ public static Geometry segmentIntersectionDD(Geometry g1, Geometry g2)
+ {
+ Coordinate[] pt1 = g1.getCoordinates();
+ Coordinate[] pt2 = g2.getCoordinates();
+
+ // first check if there actually is an intersection
+ RobustLineIntersector ri = new RobustLineIntersector();
+ ri.computeIntersection(pt1[0], pt1[1], pt2[0], pt2[1]);
+ if (! ri.hasIntersection()) {
+ // no intersection => return empty point
+ return g1.getFactory().createPoint((Coordinate) null);
+ }
+
+ Coordinate intPt = CGAlgorithmsDD.intersection(pt1[0], pt1[1], pt2[0], pt2[1]);
+ return g1.getFactory().createPoint(intPt);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/LinearReferencingFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/LinearReferencingFunctions.java
new file mode 100644
index 0000000..07cbd1a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/LinearReferencingFunctions.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.linearref.LengthIndexedLine;
+import org.locationtech.jtstest.geomfunction.Metadata;
+
+public class LinearReferencingFunctions
+{
+ public static Geometry extractPoint(Geometry g, double index)
+ {
+ LengthIndexedLine ll = new LengthIndexedLine(g);
+ Coordinate p = ll.extractPoint(index);
+ return g.getFactory().createPoint(p);
+ }
+ public static Geometry extractLine(Geometry g,
+ @Metadata(title="Start length")
+ double start,
+ @Metadata(title="End length")
+ double end)
+ {
+ LengthIndexedLine ll = new LengthIndexedLine(g);
+ return ll.extractLine(start, end);
+ }
+ public static Geometry project(Geometry g, Geometry g2)
+ {
+ LengthIndexedLine ll = new LengthIndexedLine(g);
+ double index = ll.project(g2.getCoordinate());
+ Coordinate p = ll.extractPoint(index);
+ return g.getFactory().createPoint(p);
+ }
+ public static double projectIndex(Geometry g, Geometry g2)
+ {
+ LengthIndexedLine ll = new LengthIndexedLine(g);
+ return ll.project(g2.getCoordinate());
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/NodingFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/NodingFunctions.java
new file mode 100644
index 0000000..aea8a76
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/NodingFunctions.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.noding.BasicSegmentString;
+import org.locationtech.jts.noding.FastNodingValidator;
+import org.locationtech.jts.noding.InteriorIntersectionFinder;
+import org.locationtech.jts.noding.IntersectionAdder;
+import org.locationtech.jts.noding.MCIndexNoder;
+import org.locationtech.jts.noding.Noder;
+import org.locationtech.jts.noding.ScaledNoder;
+import org.locationtech.jts.noding.SegmentStringUtil;
+import org.locationtech.jts.noding.snapround.GeometryNoder;
+import org.locationtech.jts.noding.snapround.MCIndexSnapRounder;
+import org.locationtech.jts.precision.GeometryPrecisionReducer;
+
+
+public class NodingFunctions
+{
+
+ /**
+ * Reduces precision pointwise, then snap-rounds.
+ * Note that output set may not contain non-unique linework
+ * (and thus cannot be used as input to Polygonizer directly).
+ * UnaryUnion is one way to make the linework unique.
+ *
+ *
+ * @param geom a geometry containing linework to node
+ * @param scaleFactor the precision model scale factor to use
+ * @return the noded, snap-rounded linework
+ */
+ public static Geometry snapRoundWithPointwisePrecisionReduction(
+ Geometry geom, double scaleFactor) {
+ PrecisionModel pm = new PrecisionModel(scaleFactor);
+
+ Geometry roundedGeom = GeometryPrecisionReducer.reducePointwise(geom, pm);
+
+ List geomList = new ArrayList();
+ geomList.add(roundedGeom);
+
+ GeometryNoder noder = new GeometryNoder(pm);
+ List lines = noder.node(geomList);
+
+ return FunctionsUtil.getFactoryOrDefault(geom).buildGeometry(lines);
+ }
+
+ public static boolean isNodingValid(Geometry geom) {
+ FastNodingValidator nv = new FastNodingValidator(
+ SegmentStringUtil.extractNodedSegmentStrings(geom));
+ return nv.isValid();
+ }
+
+ public static Geometry findSingleNodePoint(Geometry geom) {
+ FastNodingValidator nv = new FastNodingValidator(
+ SegmentStringUtil.extractNodedSegmentStrings(geom));
+ nv.isValid();
+ List intPts = nv.getIntersections();
+ if (intPts.size() == 0) return null;
+ return FunctionsUtil.getFactoryOrDefault(geom).createPoint((Coordinate) intPts.get(0));
+ }
+
+ public static Geometry findNodePoints(Geometry geom)
+ {
+ List intPts = FastNodingValidator.computeIntersections(
+ SegmentStringUtil.extractNodedSegmentStrings(geom) );
+ return FunctionsUtil.getFactoryOrDefault(null)
+ .createMultiPoint(CoordinateArrays.toCoordinateArray(intPts));
+ }
+
+ public static int interiorIntersectionCount(Geometry geom)
+ {
+ InteriorIntersectionFinder intCounter = InteriorIntersectionFinder
+ .createIntersectionCounter( new RobustLineIntersector() );
+ Noder noder = new MCIndexNoder( intCounter );
+ noder.computeNodes( SegmentStringUtil.extractNodedSegmentStrings(geom) );
+ return intCounter.count();
+ }
+
+ public static Geometry MCIndexNodingWithPrecision(Geometry geom, double scaleFactor)
+ {
+ PrecisionModel fixedPM = new PrecisionModel(scaleFactor);
+
+ LineIntersector li = new RobustLineIntersector();
+ li.setPrecisionModel(fixedPM);
+
+ Noder noder = new MCIndexNoder(new IntersectionAdder(li));
+ noder.computeNodes( SegmentStringUtil.extractNodedSegmentStrings(geom) );
+ return SegmentStringUtil.toGeometry( noder.getNodedSubstrings(), FunctionsUtil.getFactoryOrDefault(geom) );
+ }
+
+ public static Geometry MCIndexNoding(Geometry geom)
+ {
+ Noder noder = new MCIndexNoder(new IntersectionAdder(new RobustLineIntersector()));
+ noder.computeNodes( SegmentStringUtil.extractNodedSegmentStrings(geom) );
+ return SegmentStringUtil.toGeometry(noder.getNodedSubstrings(), FunctionsUtil.getFactoryOrDefault(geom));
+ }
+
+ /**
+ * Runs a ScaledNoder on input.
+ * Input vertices should be rounded to precision model.
+ *
+ * @param geom
+ * @param scaleFactor
+ * @return the noded geometry
+ */
+ public static Geometry scaledNoding(Geometry geom, double scaleFactor)
+ {
+ List segs = createSegmentStrings(geom);
+ PrecisionModel fixedPM = new PrecisionModel(scaleFactor);
+ Noder noder = new ScaledNoder(new MCIndexSnapRounder(new PrecisionModel(1.0)),
+ fixedPM.getScale());
+ noder.computeNodes(segs);
+ Collection nodedSegStrings = noder.getNodedSubstrings();
+ return SegmentStringUtil.toGeometry(nodedSegStrings, FunctionsUtil.getFactoryOrDefault(geom));
+ }
+
+ private static List createSegmentStrings(Geometry geom)
+ {
+ List segs = new ArrayList();
+ List lines = LinearComponentExtracter.getLines(geom);
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ segs.add(new BasicSegmentString(line.getCoordinates(), null));
+ }
+ return segs;
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/OffsetCurveFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/OffsetCurveFunctions.java
new file mode 100644
index 0000000..6e3fba8
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/OffsetCurveFunctions.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.operation.buffer.OffsetCurveBuilder;
+
+public class OffsetCurveFunctions {
+
+ public static Geometry offsetCurve(Geometry geom, double distance)
+ {
+ BufferParameters bufParams = new BufferParameters();
+ OffsetCurveBuilder ocb = new OffsetCurveBuilder(
+ geom.getFactory().getPrecisionModel(), bufParams
+ );
+ Coordinate[] pts = ocb.getOffsetCurve(geom.getCoordinates(), distance);
+ Geometry curve = geom.getFactory().createLineString(pts);
+ return curve;
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/OrientationFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/OrientationFunctions.java
new file mode 100644
index 0000000..0068204
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/OrientationFunctions.java
@@ -0,0 +1,41 @@
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+
+public class OrientationFunctions {
+
+ public static boolean isCCW(Geometry g)
+ {
+ Coordinate[] ptsRing = OrientationFunctions.getRing(g);
+ if (ptsRing == null) return false;
+ return Orientation.isCCW(ptsRing);
+ }
+
+ public static int orientationIndex(Geometry segment, Geometry ptGeom) {
+ if (segment.getNumPoints() != 2 || ptGeom.getNumPoints() != 1) {
+ throw new IllegalArgumentException("A must have two points and B must have one");
+ }
+ Coordinate[] segPt = segment.getCoordinates();
+
+ Coordinate p = ptGeom.getCoordinate();
+ int index = Orientation.index(segPt[0], segPt[1], p);
+ return index;
+ }
+
+ static Coordinate[] getRing(Geometry g) {
+ Coordinate[] pts = null;
+ if (g instanceof Polygon) {
+ pts = ((Polygon) g).getExteriorRing().getCoordinates();
+ }
+ else if (g instanceof LineString
+ && ((LineString) g).isClosed()) {
+ pts = g.getCoordinates();
+ }
+ return pts;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayCommonBitsRemovedFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayCommonBitsRemovedFunctions.java
new file mode 100644
index 0000000..53ee3e9
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayCommonBitsRemovedFunctions.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.precision.CommonBitsOp;
+import org.locationtech.jts.precision.EnhancedPrecisionOp;
+
+public class OverlayCommonBitsRemovedFunctions {
+ public static Geometry intersection(Geometry a, Geometry b) { return op().intersection(a, b); }
+ public static Geometry union(Geometry a, Geometry b) { return op().union(a, b); }
+ public static Geometry symDifference(Geometry a, Geometry b) { return op().symDifference(a, b); }
+ public static Geometry difference(Geometry a, Geometry b) { return op().difference(a, b); }
+ public static Geometry differenceBA(Geometry a, Geometry b) { return op().difference(b, a); }
+
+ private static CommonBitsOp op() { return new CommonBitsOp(true); }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayEnhancedPrecisionFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayEnhancedPrecisionFunctions.java
new file mode 100644
index 0000000..a617d69
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayEnhancedPrecisionFunctions.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.precision.EnhancedPrecisionOp;
+
+public class OverlayEnhancedPrecisionFunctions {
+ public static Geometry intersection(Geometry a, Geometry b) { return EnhancedPrecisionOp.intersection(a, b); }
+ public static Geometry union(Geometry a, Geometry b) { return EnhancedPrecisionOp.union(a, b); }
+ public static Geometry symDifference(Geometry a, Geometry b) { return EnhancedPrecisionOp.symDifference(a, b); }
+ public static Geometry difference(Geometry a, Geometry b) { return EnhancedPrecisionOp.difference(a, b); }
+ public static Geometry differenceBA(Geometry a, Geometry b) { return EnhancedPrecisionOp.difference(b, a); }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayFunctions.java
new file mode 100644
index 0000000..a5d7440
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayFunctions.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+
+
+public class OverlayFunctions {
+ public static Geometry intersection(Geometry a, Geometry b) { return a.intersection(b); }
+ public static Geometry union(Geometry a, Geometry b) { return a.union(b); }
+ public static Geometry symDifference(Geometry a, Geometry b) { return a.symDifference(b); }
+ public static Geometry difference(Geometry a, Geometry b) { return a.difference(b); }
+ public static Geometry differenceBA(Geometry a, Geometry b) { return b.difference(a); }
+ public static Geometry unaryUnion(Geometry a) { return a.union(); }
+
+ public static Geometry unionUsingGeometryCollection(Geometry a, Geometry b)
+ {
+ Geometry gc = a.getFactory().createGeometryCollection(
+ new Geometry[] { a, b});
+ return gc.union();
+ }
+
+ public static Geometry clip(Geometry a, Geometry mask)
+ {
+ List geoms = new ArrayList();
+ for (int i = 0; i < a.getNumGeometries(); i++) {
+ Geometry clip = a.getGeometryN(i).intersection(mask);
+ geoms.add(clip);
+ }
+ return FunctionsUtil.buildGeometry(geoms, a);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java
new file mode 100644
index 0000000..ee4721d
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.overlay.OverlayOp;
+
+public class OverlayNoSnapFunctions {
+ public static Geometry intersection(Geometry a, Geometry b) { return OverlayOp.overlayOp(a, b, OverlayOp.INTERSECTION); }
+ public static Geometry union(Geometry a, Geometry b) { return OverlayOp.overlayOp(a, b, OverlayOp.UNION); }
+ public static Geometry symDifference(Geometry a, Geometry b) { return OverlayOp.overlayOp(a, b, OverlayOp.SYMDIFFERENCE); }
+ public static Geometry difference(Geometry a, Geometry b) { return OverlayOp.overlayOp(a, b, OverlayOp.DIFFERENCE); }
+ public static Geometry differenceBA(Geometry a, Geometry b) { return OverlayOp.overlayOp(b, a, OverlayOp.DIFFERENCE); }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/PointLocationFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/PointLocationFunctions.java
new file mode 100644
index 0000000..f50df35
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/PointLocationFunctions.java
@@ -0,0 +1,21 @@
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+public class PointLocationFunctions {
+
+ public static boolean isPointInRing(Geometry g1, Geometry g2) {
+ Geometry ring = g1;
+ Geometry pt = g2;
+ if (g1.getNumPoints() == 1) {
+ ring = g2;
+ pt = g1;
+ }
+ Coordinate[] ptsRing = OrientationFunctions.getRing(ring);
+ if (ptsRing == null) return false;
+ return PointLocation.isInRing(pt.getCoordinate(), ptsRing);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/PolygonOverlayFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/PolygonOverlayFunctions.java
new file mode 100644
index 0000000..b9518d0
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/PolygonOverlayFunctions.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.noding.snapround.GeometryNoder;
+import org.locationtech.jts.operation.polygonize.Polygonizer;
+
+
+public class PolygonOverlayFunctions
+{
+
+ public static Geometry overlaySnapRounded(Geometry g1, Geometry g2, double precisionTol)
+ {
+ PrecisionModel pm = new PrecisionModel(precisionTol);
+ GeometryFactory geomFact = g1.getFactory();
+
+ List lines = LinearComponentExtracter.getLines(g1);
+ // add second input's linework, if any
+ if (g2 != null)
+ LinearComponentExtracter.getLines(g2, lines);
+ List nodedLinework = new GeometryNoder(pm).node(lines);
+ // union the noded linework to remove duplicates
+ Geometry nodedDedupedLinework = geomFact.buildGeometry(nodedLinework).union();
+
+ // polygonize the result
+ Polygonizer polygonizer = new Polygonizer();
+ polygonizer.add(nodedDedupedLinework);
+ Collection polys = polygonizer.getPolygons();
+
+ // convert to collection for return
+ Polygon[] polyArray = GeometryFactory.toPolygonArray(polys);
+ return geomFact.createGeometryCollection(polyArray);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/PolygonizeFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/PolygonizeFunctions.java
new file mode 100644
index 0000000..bece38a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/PolygonizeFunctions.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.LineStringExtracter;
+import org.locationtech.jts.operation.polygonize.Polygonizer;
+
+
+public class PolygonizeFunctions {
+
+ private static Geometry polygonize(Geometry g, boolean extractOnlyPolygonal) {
+ List lines = LineStringExtracter.getLines(g);
+ Polygonizer polygonizer = new Polygonizer(extractOnlyPolygonal);
+ polygonizer.add(lines);
+ return polygonizer.getGeometry();
+ /*
+ Collection polys = polygonizer.getPolygons();
+ Polygon[] polyArray = GeometryFactory.toPolygonArray(polys);
+ return g.getFactory().createGeometryCollection(polyArray);
+ */
+ }
+ public static Geometry polygonize(Geometry g)
+ {
+ return polygonize(g, false);
+ }
+ public static Geometry polygonizePolygonal(Geometry g)
+ {
+ return polygonize(g, true);
+ }
+ public static Geometry polygonizeDangles(Geometry g)
+ {
+ List lines = LineStringExtracter.getLines(g);
+ Polygonizer polygonizer = new Polygonizer();
+ polygonizer.add(lines);
+ Collection geom = polygonizer.getDangles();
+ return g.getFactory().buildGeometry(geom);
+ }
+ public static Geometry polygonizeCutEdges(Geometry g)
+ {
+ List lines = LineStringExtracter.getLines(g);
+ Polygonizer polygonizer = new Polygonizer();
+ polygonizer.add(lines);
+ Collection geom = polygonizer.getCutEdges();
+ return g.getFactory().buildGeometry(geom);
+ }
+ public static Geometry polygonizeInvalidRingLines(Geometry g)
+ {
+ List lines = LineStringExtracter.getLines(g);
+ Polygonizer polygonizer = new Polygonizer();
+ polygonizer.add(lines);
+ Collection geom = polygonizer.getInvalidRingLines();
+ return g.getFactory().buildGeometry(geom);
+ }
+ public static Geometry polygonizeAllErrors(Geometry g)
+ {
+ List lines = LineStringExtracter.getLines(g);
+ Polygonizer polygonizer = new Polygonizer();
+ polygonizer.add(lines);
+ List errs = new ArrayList();
+ errs.addAll(polygonizer.getDangles());
+ errs.addAll(polygonizer.getCutEdges());
+ errs.addAll(polygonizer.getInvalidRingLines());
+ return g.getFactory().buildGeometry(errs);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/PrecisionFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/PrecisionFunctions.java
new file mode 100644
index 0000000..7f7abae
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/PrecisionFunctions.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.precision.*;
+
+public class PrecisionFunctions
+{
+
+ public static Geometry reducePrecisionPointwise(Geometry geom, double scaleFactor)
+ {
+ PrecisionModel pm = new PrecisionModel(scaleFactor);
+ Geometry reducedGeom = GeometryPrecisionReducer.reducePointwise(geom, pm);
+ return reducedGeom;
+ }
+
+ public static Geometry reducePrecision(Geometry geom, double scaleFactor)
+ {
+ PrecisionModel pm = new PrecisionModel(scaleFactor);
+ Geometry reducedGeom = GeometryPrecisionReducer.reduce(geom, pm);
+ return reducedGeom;
+ }
+
+ public static Geometry minClearanceLine(Geometry g)
+ {
+ return MinimumClearance.getLine(g);
+ }
+
+ public static double minClearance(Geometry g)
+ {
+ return MinimumClearance.getDistance(g);
+ }
+
+ public static Geometry minClearanceSimpleLine(Geometry g)
+ {
+ return SimpleMinimumClearance.getLine(g);
+ }
+
+ public static double minClearanceSimple(Geometry g)
+ {
+ return SimpleMinimumClearance.getDistance(g);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/PreparedGeometryFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/PreparedGeometryFunctions.java
new file mode 100644
index 0000000..f1a985f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/PreparedGeometryFunctions.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.prep.PreparedGeometry;
+import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
+
+/**
+ * Function to execute PreparedGeometry methods which have optimized behaviour.
+ * @author mdavis
+ *
+ */
+public class PreparedGeometryFunctions
+{
+ private static PreparedGeometry createPG(Geometry g)
+ {
+ return (new PreparedGeometryFactory()).create(g);
+ }
+
+ public static boolean preparedIntersects(Geometry g1, Geometry g2)
+ {
+ return createPG(g1).intersects(g2);
+ }
+
+ public static boolean preparedContains(Geometry g1, Geometry g2)
+ {
+ return createPG(g1).contains(g2);
+ }
+
+ public static boolean preparedContainsProperly(Geometry g1, Geometry g2)
+ {
+ return createPG(g1).containsProperly(g2);
+ }
+
+ public static boolean preparedCovers(Geometry g1, Geometry g2)
+ {
+ return createPG(g1).covers(g2);
+ }
+
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/SelectionFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/SelectionFunctions.java
new file mode 100644
index 0000000..30cdd0a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/SelectionFunctions.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+
+
+
+public class SelectionFunctions
+{
+ public static Geometry intersects(Geometry a, final Geometry mask)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return mask.intersects(g);
+ }
+ });
+ }
+
+ public static Geometry covers(Geometry a, final Geometry mask)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.covers(mask);
+ }
+ });
+ }
+
+ public static Geometry coveredBy(Geometry a, final Geometry mask)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.coveredBy(mask);
+ }
+ });
+ }
+
+ public static Geometry disjoint(Geometry a, Geometry mask)
+ {
+ List selected = new ArrayList();
+ for (int i = 0; i < a.getNumGeometries(); i++ ) {
+ Geometry g = a.getGeometryN(i);
+ if (mask.disjoint(g)) {
+ selected.add(g);
+ }
+ }
+ return a.getFactory().buildGeometry(selected);
+ }
+ public static Geometry valid(Geometry a)
+ {
+ List selected = new ArrayList();
+ for (int i = 0; i < a.getNumGeometries(); i++ ) {
+ Geometry g = a.getGeometryN(i);
+ if (g.isValid()) {
+ selected.add(g);
+ }
+ }
+ return a.getFactory().buildGeometry(selected);
+ }
+ public static Geometry invalid(Geometry a)
+ {
+ List selected = new ArrayList();
+ for (int i = 0; i < a.getNumGeometries(); i++ ) {
+ Geometry g = a.getGeometryN(i);
+ if (! g.isValid()) {
+ selected.add(g);
+ }
+ }
+ return a.getFactory().buildGeometry(selected);
+ }
+ public static Geometry lengthGreaterThan(Geometry a, final double minLen)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.getLength() > minLen;
+ }
+ });
+ }
+ public static Geometry lengthLessThan(Geometry a, final double maxLen)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.getLength() < maxLen;
+ }
+ });
+ }
+ public static Geometry lengthZero(Geometry a)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.getLength() == 0.0;
+ }
+ });
+ }
+ public static Geometry areaGreaterThan(Geometry a, final double minArea)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.getArea() > minArea;
+ }
+ });
+ }
+ public static Geometry areaLessThan(Geometry a, final double maxArea)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.getArea() < maxArea;
+ }
+ });
+ }
+ public static Geometry areaZero(Geometry a)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.getArea() == 0.0;
+ }
+ });
+ }
+ public static Geometry within(Geometry a, final Geometry mask)
+ {
+ return select(a, new GeometryPredicate() {
+ public boolean isTrue(Geometry g) {
+ return g.within(mask);
+ }
+ });
+ }
+
+ private static Geometry select(Geometry geom, GeometryPredicate pred)
+ {
+ List selected = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++ ) {
+ Geometry g = geom.getGeometryN(i);
+ if (pred.isTrue(g)) {
+ selected.add(g);
+ }
+ }
+ return geom.getFactory().buildGeometry(selected);
+
+ }
+
+ public static Geometry firstNComponents(Geometry g, int n)
+ {
+ List comp = new ArrayList();
+ for (int i = 0; i < g.getNumGeometries() && i < n; i++) {
+ comp.add(g.getGeometryN(i));
+ }
+ return g.getFactory().buildGeometry(comp);
+ }
+}
+
+interface GeometryPredicate
+{
+ boolean isTrue(Geometry geom);
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/SimplificationFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/SimplificationFunctions.java
new file mode 100644
index 0000000..b0ac6e9
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/SimplificationFunctions.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.simplify.DouglasPeuckerSimplifier;
+import org.locationtech.jts.simplify.TopologyPreservingSimplifier;
+import org.locationtech.jts.simplify.VWSimplifier;
+
+public class SimplificationFunctions {
+ public static Geometry simplifyDP(Geometry g, double distance)
+ { return DouglasPeuckerSimplifier.simplify(g, distance); }
+
+ public static Geometry simplifyTP(Geometry g, double distance)
+ { return TopologyPreservingSimplifier.simplify(g, distance); }
+
+ public static Geometry simplifyVW(Geometry g, double distance)
+ { return VWSimplifier.simplify(g, distance); }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/SnappingFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/SnappingFunctions.java
new file mode 100644
index 0000000..611f872
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/SnappingFunctions.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.operation.overlay.snap.*;
+
+/**
+ * Implementations for various geometry functions.
+ *
+ * @author Martin Davis
+ *
+ */
+public class SnappingFunctions
+{
+ public static Geometry snapAtoB(Geometry g, Geometry g2, double distance)
+ {
+ Geometry[] snapped = GeometrySnapper.snap(g, g2, distance);
+ return snapped[0];
+ }
+
+ public static Geometry snapToSelfAndClean(Geometry g, double distance)
+ {
+ return GeometrySnapper.snapToSelf(g, distance, true);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/SortingFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/SortingFunctions.java
new file mode 100644
index 0000000..c293987
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/SortingFunctions.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.util.GeometryExtracter;
+
+
+public class SortingFunctions
+{
+ public static Geometry sortByLength(Geometry g)
+ {
+ List geoms = components(g);
+ Collections.sort(geoms, new GeometryLengthComparator());
+
+ // annotate geometries with area
+ for (Object o : geoms) {
+ Geometry geom = (Geometry) o;
+ geom.setUserData(geom.getLength());
+ }
+
+ return g.getFactory().buildGeometry(geoms);
+ }
+
+ private static class GeometryLengthComparator implements Comparator
+ {
+ public int compare(Object o1, Object o2)
+ {
+ Geometry g1 = (Geometry) o1;
+ Geometry g2 = (Geometry) o2;
+ return Double.compare(g1.getLength(), g2.getLength());
+ }
+ }
+
+ public static Geometry sortByArea(Geometry g)
+ {
+ List geoms = components(g);
+ Collections.sort(geoms, new GeometryAreaComparator());
+
+ // annotate geometries with area
+ for (Object o : geoms) {
+ Geometry geom = (Geometry) o;
+ geom.setUserData(geom.getArea());
+ }
+
+ return g.getFactory().buildGeometry(geoms);
+ }
+
+ private static class GeometryAreaComparator implements Comparator
+ {
+ public int compare(Object o1, Object o2)
+ {
+ Geometry g1 = (Geometry) o1;
+ Geometry g2 = (Geometry) o2;
+ return Double.compare(g1.getArea(), g2.getArea());
+ }
+ }
+
+ private static List components(Geometry g)
+ {
+ List comp = new ArrayList();
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ comp.add(g.getGeometryN(i));
+ }
+ return comp;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/SpatialIndexFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/SpatialIndexFunctions.java
new file mode 100644
index 0000000..cf555fd
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/SpatialIndexFunctions.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.index.kdtree.KdTree;
+import org.locationtech.jts.index.quadtree.Quadtree;
+import org.locationtech.jts.index.strtree.AbstractNode;
+import org.locationtech.jts.index.strtree.Boundable;
+import org.locationtech.jts.index.strtree.GeometryItemDistance;
+import org.locationtech.jts.index.strtree.STRtree;
+
+
+public class SpatialIndexFunctions
+{
+ public static Geometry kdTreeQuery(Geometry pts, Geometry queryEnv, double tolerance)
+ {
+ KdTree index = buildKdTree(pts, tolerance);
+ // if no query env provided query everything inserted
+ if (queryEnv == null) queryEnv = pts;
+ List result = index.query(queryEnv.getEnvelopeInternal());
+ Coordinate[] resultCoords = KdTree.toCoordinates(result);
+ return pts.getFactory().createMultiPoint(resultCoords);
+ }
+
+ public static Geometry kdTreeQueryRepeated(Geometry pts, Geometry queryEnv, double tolerance)
+ {
+ KdTree index = buildKdTree(pts, tolerance);
+ // if no query env provided query everything inserted
+ if (queryEnv == null) queryEnv = pts;
+ List result = index.query(queryEnv.getEnvelopeInternal());
+ Coordinate[] resultCoords = KdTree.toCoordinates(result, true);
+ return pts.getFactory().createMultiPoint(resultCoords);
+ }
+
+ private static KdTree buildKdTree(Geometry geom, double tolerance) {
+ final KdTree index = new KdTree(tolerance);
+ Coordinate[] pt = geom.getCoordinates();
+ for (int i = 0; i < pt.length; i++) {
+ index.insert(pt[i]);
+ }
+ return index;
+ }
+
+ public static Geometry strTreeBounds(Geometry geoms)
+ {
+ STRtree index = buildSTRtree(geoms);
+ List bounds = new ArrayList();
+ addBounds(index.getRoot(), bounds, geoms.getFactory());
+ return geoms.getFactory().buildGeometry(bounds);
+ }
+
+ private static void addBounds(Boundable bnd, List bounds,
+ GeometryFactory factory) {
+ // don't include bounds of leaf nodes
+ if (! (bnd instanceof AbstractNode)) return;
+
+ Envelope env = (Envelope) bnd.getBounds();
+ bounds.add(factory.toGeometry(env));
+ if (bnd instanceof AbstractNode) {
+ AbstractNode node = (AbstractNode) bnd;
+ List children = node.getChildBoundables();
+ for (Iterator i = children.iterator(); i.hasNext(); ) {
+ Boundable child = (Boundable) i.next();
+ addBounds(child, bounds, factory);
+ }
+ }
+ }
+
+ public static Geometry strTreeQuery(Geometry geoms, Geometry queryEnv)
+ {
+ STRtree index = buildSTRtree(geoms);
+ // if no query env provided query everything inserted
+ if (queryEnv == null) queryEnv = geoms;
+ List result = index.query(queryEnv.getEnvelopeInternal());
+ return geoms.getFactory().buildGeometry(result);
+ }
+
+ private static STRtree buildSTRtree(Geometry geom) {
+ final STRtree index = new STRtree();
+ geom.apply(new GeometryFilter() {
+
+ public void filter(Geometry geom) {
+ // only insert atomic geometries
+ if (geom instanceof GeometryCollection) return;
+ index.insert(geom.getEnvelopeInternal(), geom);
+ }
+
+ });
+ return index;
+ }
+
+ public static Geometry strTreeNN(Geometry geoms, Geometry geom)
+ {
+ STRtree index = buildSTRtree(geoms);
+ Object result = index.nearestNeighbour(geom.getEnvelopeInternal(), geom, new GeometryItemDistance());
+ return (Geometry) result;
+ }
+
+ public static Geometry strTreeNNk(Geometry geoms, Geometry geom, int k)
+ {
+ STRtree index = buildSTRtree(geoms);
+ Object[] knnObjects = index.nearestNeighbour(geom.getEnvelopeInternal(), geom, new GeometryItemDistance(), k);
+ List knnGeoms = new ArrayList(Arrays.asList(knnObjects));
+ Geometry geometryCollection = geoms.getFactory().buildGeometry(knnGeoms);
+ return geometryCollection;
+ }
+
+ public static Geometry quadTreeQuery(Geometry geoms, Geometry queryEnv)
+ {
+ Quadtree index = buildQuadtree(geoms);
+ // if no query env provided query everything inserted
+ if (queryEnv == null) queryEnv = geoms;
+ List result = index.query(queryEnv.getEnvelopeInternal());
+ return geoms.getFactory().buildGeometry(result);
+ }
+
+ private static Quadtree buildQuadtree(Geometry geom) {
+ final Quadtree index = new Quadtree();
+ geom.apply(new GeometryFilter() {
+
+ public void filter(Geometry geom) {
+ // only insert atomic geometries
+ if (geom instanceof GeometryCollection) return;
+ index.insert(geom.getEnvelopeInternal(), geom);
+ }
+
+ });
+ return index;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/SpatialPredicateFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/SpatialPredicateFunctions.java
new file mode 100644
index 0000000..28aa66a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/SpatialPredicateFunctions.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Implementations for spatial predicate functions.
+ *
+ * @author Martin Davis
+ *
+ */
+public class SpatialPredicateFunctions {
+
+ public static String relate(Geometry a, Geometry b) {
+ return a.relate(b).toString();
+ }
+ public static boolean intersects(Geometry a, Geometry b) { return a.intersects(b); }
+ public static boolean crosses(Geometry a, Geometry b) { return a.crosses(b); }
+ public static boolean disjoint(Geometry a, Geometry b) { return a.disjoint(b); }
+ public static boolean equals(Geometry a, Geometry b) { return a.equals(b); }
+ public static boolean contains(Geometry a, Geometry b) { return a.contains(b); }
+ public static boolean covers(Geometry a, Geometry b) { return a.covers(b); }
+ public static boolean coveredBy(Geometry a, Geometry b) { return a.coveredBy(b); }
+ public static boolean within(Geometry a, Geometry b) { return a.within(b); }
+ public static boolean overlaps(Geometry a, Geometry b) { return a.overlaps(b); }
+ public static boolean touches(Geometry a, Geometry b) { return a.touches(b); }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/TestCaseGeometryFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/TestCaseGeometryFunctions.java
new file mode 100644
index 0000000..93c1a83
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/TestCaseGeometryFunctions.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.densify.*;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.precision.MinimumClearance;
+
+/**
+ * Geometry functions which
+ * augment the existing methods on {@link Geometry},
+ * for use in XML Test files.
+ * This is the default used in the TestRunner,
+ * and thus all the operations
+ * in this class should be named differently to the Geometry methods
+ * (otherwise they will shadow the real Geometry methods).
+ * <p>
+ * If replacing a Geometry method is desired, this
+ * can be done via the -geomfunc argument to the TestRunner.
+ *
+ * @author Martin Davis
+ *
+ */
+public class TestCaseGeometryFunctions
+{
+ public static Geometry bufferMitredJoin(Geometry g, double distance)
+ {
+ BufferParameters bufParams = new BufferParameters();
+ bufParams.setJoinStyle(BufferParameters.JOIN_MITRE);
+
+ return BufferOp.bufferOp(g, distance, bufParams);
+ }
+
+ public static Geometry densify(Geometry g, double distance)
+ {
+ return Densifier.densify(g, distance);
+ }
+
+ public static double minClearance(Geometry g)
+ {
+ return MinimumClearance.getDistance(g);
+ }
+
+ public static Geometry minClearanceLine(Geometry g)
+ {
+ return MinimumClearance.getLine(g);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/TriangleFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/TriangleFunctions.java
new file mode 100644
index 0000000..3dd1832
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/TriangleFunctions.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.GeometryMapper;
+
+
+public class TriangleFunctions {
+
+ public static Geometry centroid(Geometry g)
+ {
+ return GeometryMapper.map(g,
+ new GeometryMapper.MapOp() {
+ public Geometry map(Geometry g) {
+ Coordinate[] pts = trianglePts(g);
+ Coordinate cc = Triangle.centroid(pts[0], pts[1], pts[2]);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ return geomFact.createPoint(cc);
+ }});
+ }
+
+ public static Geometry circumcentre(Geometry g)
+ {
+ return GeometryMapper.map(g,
+ new GeometryMapper.MapOp() {
+ public Geometry map(Geometry g) {
+ Coordinate[] pts = trianglePts(g);
+ Coordinate cc = Triangle.circumcentre(pts[0], pts[1], pts[2]);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ return geomFact.createPoint(cc);
+ }});
+ }
+
+ public static Geometry perpendicularBisectors(Geometry g)
+ {
+ Coordinate[] pts = trianglePts(g);
+ Coordinate cc = Triangle.circumcentre(pts[0], pts[1], pts[2]);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ LineString[] line = new LineString[3];
+ Coordinate p0 = (new LineSegment(pts[1], pts[2])).closestPoint(cc);
+ line[0] = geomFact.createLineString(new Coordinate[] {p0, cc});
+ Coordinate p1 = (new LineSegment(pts[0], pts[2])).closestPoint(cc);
+ line[1] = geomFact.createLineString(new Coordinate[] {p1, cc});
+ Coordinate p2 = (new LineSegment(pts[0], pts[1])).closestPoint(cc);
+ line[2] = geomFact.createLineString(new Coordinate[] {p2, cc});
+ return geomFact.createMultiLineString(line);
+ }
+
+ public static Geometry incentre(Geometry g)
+ {
+ return GeometryMapper.map(g,
+ new GeometryMapper.MapOp() {
+ public Geometry map(Geometry g) {
+ Coordinate[] pts = trianglePts(g);
+ Coordinate cc = Triangle.inCentre(pts[0], pts[1], pts[2]);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ return geomFact.createPoint(cc);
+ }});
+ }
+
+ public static Geometry angleBisectors(Geometry g)
+ {
+ Coordinate[] pts = trianglePts(g);
+ Coordinate cc = Triangle.inCentre(pts[0], pts[1], pts[2]);
+ GeometryFactory geomFact = FunctionsUtil.getFactoryOrDefault(g);
+ LineString[] line = new LineString[3];
+ line[0] = geomFact.createLineString(new Coordinate[] {pts[0], cc});
+ line[1] = geomFact.createLineString(new Coordinate[] {pts[1], cc});
+ line[2] = geomFact.createLineString(new Coordinate[] {pts[2], cc});
+ return geomFact.createMultiLineString(line);
+ }
+
+
+ private static Coordinate[] trianglePts(Geometry g)
+ {
+ Coordinate[] pts = g.getCoordinates();
+ if (pts.length < 3)
+ throw new IllegalArgumentException("Input geometry must have at least 3 points");
+ return pts;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/TriangulationFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/TriangulationFunctions.java
new file mode 100644
index 0000000..5c35cf2
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/TriangulationFunctions.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.function;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.triangulate.*;
+import org.locationtech.jts.triangulate.quadedge.LocateFailureException;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+import org.locationtech.jtstest.util.*;
+
+
+public class TriangulationFunctions
+{
+ private static final double TRIANGULATION_TOLERANCE = 0.0;
+
+ public static Geometry delaunayEdges(Geometry geom)
+ {
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(geom);
+ builder.setTolerance(TRIANGULATION_TOLERANCE);
+ Geometry edges = builder.getEdges(geom.getFactory());
+ return edges;
+ }
+
+ public static Geometry delaunayTriangles(Geometry geom)
+ {
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(geom);
+ builder.setTolerance(TRIANGULATION_TOLERANCE);
+ Geometry tris = builder.getTriangles(geom.getFactory());
+ return tris;
+ }
+
+ public static Geometry delaunayEdgesWithTolerance(Geometry geom, double tolerance)
+ {
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(geom);
+ builder.setTolerance(tolerance);
+ Geometry edges = builder.getEdges(geom.getFactory());
+ return edges;
+ }
+
+
+ public static Geometry delaunayTrianglesWithTolerance(Geometry geom, double tolerance)
+ {
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(geom);
+ builder.setTolerance(tolerance);
+ Geometry tris = builder.getTriangles(geom.getFactory());
+ return tris;
+ }
+
+ public static Geometry delaunayTrianglesWithToleranceNoError(Geometry geom, double tolerance)
+ {
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(geom);
+ builder.setTolerance(tolerance);
+ try {
+ Geometry tris = builder.getTriangles(geom.getFactory());
+ return tris;
+ }
+ catch (LocateFailureException ex) {
+ System.out.println(ex);
+ // ignore this exception and drop thru
+ }
+ /**
+ * Get the triangles created up until the error
+ */
+ Geometry tris = builder.getSubdivision().getTriangles(geom.getFactory());
+ return tris;
+ }
+
+ public static Geometry voronoiDiagram(Geometry sitesGeom, Geometry clipGeom)
+ {
+ VoronoiDiagramBuilder builder = new VoronoiDiagramBuilder();
+ builder.setSites(sitesGeom);
+ if (clipGeom != null)
+ builder.setClipEnvelope(clipGeom.getEnvelopeInternal());
+ builder.setTolerance(TRIANGULATION_TOLERANCE);
+ Geometry diagram = builder.getDiagram(sitesGeom.getFactory());
+ return diagram;
+ }
+
+ public static Geometry voronoiDiagramWithData(Geometry sitesGeom, Geometry clipGeom)
+ {
+ GeometryDataUtil.setComponentDataToIndex(sitesGeom);
+
+ VertexTaggedGeometryDataMapper mapper = new VertexTaggedGeometryDataMapper();
+ mapper.loadSourceGeometries(sitesGeom);
+
+ VoronoiDiagramBuilder builder = new VoronoiDiagramBuilder();
+ builder.setSites(mapper.getCoordinates());
+ if (clipGeom != null)
+ builder.setClipEnvelope(clipGeom.getEnvelopeInternal());
+ builder.setTolerance(TRIANGULATION_TOLERANCE);
+ Geometry diagram = builder.getDiagram(sitesGeom.getFactory());
+ mapper.transferData(diagram);
+ return diagram;
+ }
+
+
+ public static Geometry conformingDelaunayEdges(Geometry sites, Geometry constraints)
+ {
+ return conformingDelaunayEdgesWithTolerance(sites, constraints, TRIANGULATION_TOLERANCE);
+ }
+
+ public static Geometry conformingDelaunayEdgesWithTolerance(Geometry sites, Geometry constraints, double tol)
+ {
+ ConformingDelaunayTriangulationBuilder builder = new ConformingDelaunayTriangulationBuilder();
+ builder.setSites(sites);
+ builder.setConstraints(constraints);
+ builder.setTolerance(tol);
+
+ GeometryFactory geomFact = sites != null ? sites.getFactory() : constraints.getFactory();
+ Geometry tris = builder.getEdges(geomFact);
+ return tris;
+ }
+
+ public static Geometry conformingDelaunayTriangles(Geometry sites, Geometry constraints)
+ {
+ return conformingDelaunayTrianglesWithTolerance(sites, constraints, TRIANGULATION_TOLERANCE);
+ }
+
+ public static Geometry conformingDelaunayTrianglesWithTolerance(Geometry sites, Geometry constraints, double tol)
+ {
+ ConformingDelaunayTriangulationBuilder builder = new ConformingDelaunayTriangulationBuilder();
+ builder.setSites(sites);
+ builder.setConstraints(constraints);
+ builder.setTolerance(tol);
+
+ GeometryFactory geomFact = sites != null ? sites.getFactory() : constraints.getFactory();
+ Geometry tris = builder.getTriangles(geomFact);
+ return tris;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/ValidationFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/ValidationFunctions.java
new file mode 100644
index 0000000..65d21cf
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/ValidationFunctions.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.valid.IsValidOp;
+import org.locationtech.jts.operation.valid.TopologyValidationError;
+
+
+public class ValidationFunctions
+{
+ /**
+ * Validates all geometries in a collection independently.
+ * Errors are returned as points at the invalid location
+ *
+ * @param g
+ * @return the invalid locations, if any
+ */
+ public static Geometry invalidLocations(Geometry g)
+ {
+ List invalidLoc = new ArrayList();
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ Geometry geom = g.getGeometryN(i);
+ IsValidOp ivop = new IsValidOp(geom);
+ TopologyValidationError err = ivop.getValidationError();
+ if (err != null) {
+ invalidLoc.add(g.getFactory().createPoint(err.getCoordinate()));
+ }
+ }
+ return g.getFactory().buildGeometry(invalidLoc);
+ }
+
+ public static Geometry invalidGeoms(Geometry g)
+ {
+ List invalidGeoms = new ArrayList();
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ Geometry geom = g.getGeometryN(i);
+ IsValidOp ivop = new IsValidOp(geom);
+ TopologyValidationError err = ivop.getValidationError();
+ if (err != null) {
+ invalidGeoms.add(geom);
+ }
+ }
+ return g.getFactory().buildGeometry(invalidGeoms);
+ }
+
+ public static boolean isValidAllowSelfTouchingRingFormingHole(Geometry g) {
+ IsValidOp validOp = new IsValidOp(g);
+ validOp.setSelfTouchingRingFormingHoleValid(true);
+ return validOp.isValid();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/WriterFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/WriterFunctions.java
new file mode 100644
index 0000000..21c8758
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/function/WriterFunctions.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.function;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKBWriter;
+import org.locationtech.jts.io.geojson.GeoJsonWriter;
+import org.locationtech.jts.io.gml2.GMLWriter;
+import org.locationtech.jts.io.kml.KMLWriter;
+import org.locationtech.jtstest.geomfunction.Metadata;
+import org.locationtech.jtstest.util.ClassUtil;
+
+
+public class WriterFunctions
+{
+ public static String writeKML(Geometry geom)
+ {
+ if (geom == null) return "";
+ KMLWriter writer = new KMLWriter();
+ return writer.write(geom);
+ }
+
+ public static String writeGML(Geometry geom)
+ {
+ if (geom == null) return "";
+ return (new GMLWriter()).write(geom);
+ }
+
+ public static String writeOra(Geometry g) throws SecurityException, IllegalArgumentException, ClassNotFoundException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException
+ {
+ if (g == null) return "";
+ // call dynamically to avoid dependency on OraWriter
+ String sql = (String) ClassUtil.dynamicCall("com.vividsolutions.jts.io.oracle.OraWriter",
+ "writeSQL",
+ new Class[] { Geometry.class },
+ new Object[] { g });
+ return sql;
+ //return (new OraWriter(null)).writeSQL(g);
+ }
+
+ public static String writeWKB(Geometry g)
+ {
+ if (g == null) return "";
+ return WKBWriter.toHex((new WKBWriter().write(g)));
+ }
+
+ public static String writeGeoJSON(Geometry g)
+ {
+ if (g == null) return "";
+ return (new GeoJsonWriter().write(g));
+ }
+
+ public static String writeGeoJSONFixDecimal(Geometry g,
+ @Metadata(title="Num Decimals")
+ int numDecimals)
+ {
+ if (g == null) return "";
+ return (new GeoJsonWriter(numDecimals).write(g));
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/BaseGeometryFunction.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/BaseGeometryFunction.java
new file mode 100644
index 0000000..dfcf28e
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/BaseGeometryFunction.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.geomfunction;
+
+import java.lang.reflect.Method;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.util.*;
+
+
+/**
+ * A base for implementations of
+ * {@link GeometryFunction} which provides most
+ * of the required structure.
+ * Extenders must supply the behaviour for the
+ * actual function invocation.
+ *
+ * @author Martin Davis
+ *
+ */
+public abstract class BaseGeometryFunction
+implements GeometryFunction, Comparable
+{
+ public static boolean isBinaryGeomFunction(GeometryFunction func)
+ {
+ return func.getParameterTypes().length >= 1
+ && func.getParameterTypes()[0] == Geometry.class;
+ }
+ public static int firstScalarParamIndex(GeometryFunction func) {
+ Class<?>[] type = func.getParameterTypes();
+ for (int i = 0; i < type.length; i++) {
+ if (! ClassUtil.isGeometry(type[i])) {
+ return i;
+ }
+ }
+ return -1;
+ }
+ protected String category = null;
+ protected String name;
+ protected String description;
+ protected String[] parameterNames;
+ protected Class[] parameterTypes;
+ protected Class returnType;
+
+ public BaseGeometryFunction(
+ String category,
+ String name,
+ String[] parameterNames,
+ Class[] parameterTypes,
+ Class returnType)
+ {
+ this.category = category;
+ this.name = name;
+ this.parameterNames = parameterNames;
+ this.parameterTypes = parameterTypes;
+ this.returnType = returnType;
+ }
+
+ public BaseGeometryFunction(
+ String category,
+ String name,
+ String description,
+ String[] parameterNames,
+ Class[] parameterTypes,
+ Class returnType)
+ {
+ this.category = category;
+ this.name = name;
+ this.description = description;
+ this.parameterNames = parameterNames;
+ this.parameterTypes = parameterTypes;
+ this.returnType = returnType;
+ }
+
+ public String getCategory()
+ {
+ return category;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public String[] getParameterNames()
+ {
+ return parameterNames;
+ }
+
+ /**
+ * Gets the types of the other function arguments,
+ * if any.
+ *
+ * @return the types
+ */
+ public Class[] getParameterTypes()
+ {
+ return parameterTypes;
+ }
+
+ public Class getReturnType()
+ {
+ return returnType;
+ }
+
+ public boolean isBinary() {
+ return parameterTypes.length > 0 && parameterTypes[0] == Geometry.class;
+ }
+
+ public String getSignature()
+ {
+ StringBuffer paramTypes = new StringBuffer();
+ paramTypes.append("Geometry");
+ for (int i = 0 ; i < parameterTypes.length; i++) {
+ paramTypes.append(",");
+ paramTypes.append(ClassUtil.getClassname(parameterTypes[i]));
+ }
+ return name + "(" + paramTypes + ")"
+ + " -> "
+ + ClassUtil.getClassname(returnType);
+ }
+
+ protected static Double getDoubleOrNull(Object[] args, int index)
+ {
+ if (args.length <= index) return null;
+ if (args[index] == null) return null;
+ return (Double) args[index];
+ }
+
+ protected static Integer getIntegerOrNull(Object[] args, int index)
+ {
+ if (args.length <= index) return null;
+ if (args[index] == null) return null;
+ return (Integer) args[index];
+ }
+
+ public abstract Object invoke(Geometry geom, Object[] args);
+
+ /**
+ * Two functions are the same if they have the
+ * same signature (name, parameter types and return type).
+ *
+ * @param obj
+ * @return true if this object is the same as the <tt>obj</tt> argument
+ */
+ public boolean equals(Object obj)
+ {
+ if (! (obj instanceof GeometryFunction)) return false;
+ GeometryFunction func = (GeometryFunction) obj;
+ if (! name.equals(func.getName())) return false;
+ if (! returnType.equals(func.getReturnType())) return false;
+
+ Class[] funcParamTypes = func.getParameterTypes();
+ if (parameterTypes.length != funcParamTypes.length) return false;
+ for (int i = 0; i < parameterTypes.length; i++) {
+ if (! parameterTypes[i].equals(funcParamTypes[i]))
+ return false;
+ }
+ return true;
+ }
+
+ public int compareTo(Object o)
+ {
+ GeometryFunction func = (GeometryFunction) o;
+ int cmp = name.compareTo(func.getName());
+ if (cmp != 0)
+ return cmp;
+ return compareTo(returnType, func.getReturnType());
+ //TODO: compare parameter lists as well
+ }
+
+ private static int compareTo(Class c1, Class c2)
+ {
+ return c1.getName().compareTo(c2.getName());
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunction.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunction.java
new file mode 100644
index 0000000..c634bde
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunction.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.geomfunction;
+
+import org.locationtech.jts.geom.*;
+
+/**
+ * A reification of a function which can be executed on a
+ * {@link Geometry}, possibly with other arguments.
+ * The function may return a Geometry or a scalar value.
+ *
+ * @author Martin Davis
+ *
+ */
+public interface GeometryFunction
+{
+
+ /**
+ * Gets the category name of this function
+ *
+ * @return the category name of the function
+ */
+ String getCategory();
+
+ /**
+ * Gets the name of this function
+ *
+ * @return the name of the function
+ */
+ String getName();
+
+ /**
+ * Gets the description of this function
+ *
+ * @return the name of the function
+ */
+ String getDescription();
+
+ /**
+ * Gets the parameter names for this function
+ *
+ * @return the names of the function parameters
+ */
+ String[] getParameterNames();
+
+ /**
+ * Gets the types of the other function arguments,
+ * if any.
+ *
+ * @return the types
+ */
+ Class[] getParameterTypes();
+
+ /**
+ * Gets the return type of this function
+ *
+ * @return the type of the value returned by this function
+ */
+ Class getReturnType();
+
+ /**
+ * Gets a string representing the signature of this function.
+ *
+ * @return the string for the function signature
+ */
+ String getSignature();
+
+ /**
+ * Invokes this function.
+ * Note that any exceptions returned must be
+ * {@link RuntimeException}s.
+ *
+ * @param geom the target geometry
+ * @param args the other arguments to the function
+ * @return the value computed by the function
+ *
+ */
+ Object invoke(Geometry geom, Object[] args);
+
+ /**
+ * Two functions are the same if they have the
+ * same name, parameter types and return type.
+ *
+ * @param obj
+ * @return true if this object is the same as the <tt>obj</tt> argument
+ */
+ boolean equals(Object obj);
+
+ public abstract boolean isBinary();
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionInvocation.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionInvocation.java
new file mode 100644
index 0000000..8430987
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionInvocation.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.geomfunction;
+
+import org.locationtech.jts.geom.Geometry;
+
+public class GeometryFunctionInvocation {
+
+ private GeometryFunction function;
+ private Object[] args;
+
+ public GeometryFunctionInvocation(GeometryFunction function, Object[] args) {
+ this.function = function;
+ this.args = args;
+ }
+
+ public String getSignature() {
+ if (function == null)
+ return null;
+ return function.getCategory()
+ + "." + function.getName()
+ + "(" + toString(args) + ")";
+ }
+
+ public GeometryFunction getFunction() {
+ return function;
+ }
+
+ public Object[] getArgs() {
+ return args;
+ }
+
+ public static String toString(Object[] param)
+ {
+ if (param == null) return "";
+
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < param.length; i++) {
+ if (i > 0) buf.append(", ");
+ buf.append(toString(param[i]));
+ }
+ return buf.toString();
+ }
+
+ public static String toString(Object o)
+ {
+ if (o == null) return "null";
+ if (o instanceof Geometry)
+ return ((Geometry) o).getGeometryType();
+ return o.toString();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionRegistry.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionRegistry.java
new file mode 100644
index 0000000..4d03dfb
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionRegistry.java
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.geomfunction;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.function.AffineTransformationFunctions;
+import org.locationtech.jtstest.function.BoundaryFunctions;
+import org.locationtech.jtstest.function.BufferByUnionFunctions;
+import org.locationtech.jtstest.function.BufferFunctions;
+import org.locationtech.jtstest.function.LineSegmentFunctions;
+import org.locationtech.jtstest.function.ConstructionFunctions;
+import org.locationtech.jtstest.function.ConversionFunctions;
+import org.locationtech.jtstest.function.CreateFractalShapeFunctions;
+import org.locationtech.jtstest.function.CreateRandomShapeFunctions;
+import org.locationtech.jtstest.function.CreateShapeFunctions;
+import org.locationtech.jtstest.function.DissolveFunctions;
+import org.locationtech.jtstest.function.DistanceFunctions;
+import org.locationtech.jtstest.function.DoubleKeyMap;
+import org.locationtech.jtstest.function.GeometryFunctions;
+import org.locationtech.jtstest.function.JTSFunctions;
+import org.locationtech.jtstest.function.LineHandlingFunctions;
+import org.locationtech.jtstest.function.LinearReferencingFunctions;
+import org.locationtech.jtstest.function.NodingFunctions;
+import org.locationtech.jtstest.function.OffsetCurveFunctions;
+import org.locationtech.jtstest.function.OrientationFunctions;
+import org.locationtech.jtstest.function.OverlayFunctions;
+import org.locationtech.jtstest.function.OverlayNoSnapFunctions;
+import org.locationtech.jtstest.function.PointLocationFunctions;
+import org.locationtech.jtstest.function.PolygonOverlayFunctions;
+import org.locationtech.jtstest.function.PolygonizeFunctions;
+import org.locationtech.jtstest.function.PrecisionFunctions;
+import org.locationtech.jtstest.function.PreparedGeometryFunctions;
+import org.locationtech.jtstest.function.SelectionFunctions;
+import org.locationtech.jtstest.function.SimplificationFunctions;
+import org.locationtech.jtstest.function.SnappingFunctions;
+import org.locationtech.jtstest.function.SortingFunctions;
+import org.locationtech.jtstest.function.SpatialIndexFunctions;
+import org.locationtech.jtstest.function.SpatialPredicateFunctions;
+import org.locationtech.jtstest.function.TriangleFunctions;
+import org.locationtech.jtstest.function.TriangulationFunctions;
+import org.locationtech.jtstest.function.ValidationFunctions;
+import org.locationtech.jtstest.function.WriterFunctions;
+
+
+/**
+ * A registry to manage a collection of {@link GeometryFunction}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryFunctionRegistry
+{
+ public static GeometryFunctionRegistry createTestBuilderRegistry()
+ {
+ GeometryFunctionRegistry funcRegistry = new GeometryFunctionRegistry();
+
+ funcRegistry.add(GeometryFunctions.class);
+ funcRegistry.add(BoundaryFunctions.class);
+ funcRegistry.add(BufferFunctions.class);
+ funcRegistry.add(BufferByUnionFunctions.class);
+ funcRegistry.add(ConstructionFunctions.class);
+ funcRegistry.add(ConversionFunctions.class);
+ funcRegistry.add(LinearReferencingFunctions.class);
+ funcRegistry.add(LineHandlingFunctions.class);
+ funcRegistry.add(NodingFunctions.class);
+ funcRegistry.add(PolygonizeFunctions.class);
+ funcRegistry.add(PolygonOverlayFunctions.class);
+ funcRegistry.add(PrecisionFunctions.class);
+ funcRegistry.add(PreparedGeometryFunctions.class);
+ funcRegistry.add(SelectionFunctions.class);
+ funcRegistry.add(SimplificationFunctions.class);
+ funcRegistry.add(AffineTransformationFunctions.class);
+ funcRegistry.add(DissolveFunctions.class);
+ funcRegistry.add(DistanceFunctions.class);
+ funcRegistry.add(CreateShapeFunctions.class);
+ funcRegistry.add(CreateFractalShapeFunctions.class);
+ funcRegistry.add(CreateRandomShapeFunctions.class);
+ funcRegistry.add(SpatialIndexFunctions.class);
+ funcRegistry.add(SpatialPredicateFunctions.class);
+ funcRegistry.add(JTSFunctions.class);
+ //funcRegistry.add(MemoryFunctions.class);
+ funcRegistry.add(OffsetCurveFunctions.class);
+ funcRegistry.add(OrientationFunctions.class);
+ funcRegistry.add(LineSegmentFunctions.class);
+ funcRegistry.add(OverlayFunctions.class);
+ funcRegistry.add(OverlayNoSnapFunctions.class);
+ funcRegistry.add(PointLocationFunctions.class);
+ //funcRegistry.add(OverlayEnhancedPrecisionFunctions.class);
+ //funcRegistry.add(OverlayCommonBitsRemovedFunctions.class);
+ funcRegistry.add(SnappingFunctions.class);
+ funcRegistry.add(SortingFunctions.class);
+ funcRegistry.add(TriangulationFunctions.class);
+ funcRegistry.add(TriangleFunctions.class);
+ funcRegistry.add(ValidationFunctions.class);
+ funcRegistry.add(WriterFunctions.class);
+
+ return funcRegistry;
+ }
+ public static String functionDescriptionHTML(GeometryFunction func)
+ {
+ String txt = "<b>" + func.getSignature() + "</b>";
+ String desc = func.getDescription();
+ if (desc != null) {
+ txt += "<br><br>" + desc;
+ }
+ return "<html>" + txt + "</html>";
+ }
+
+ private List functions = new ArrayList();
+ private Map sortedFunctions = new TreeMap();
+ private DoubleKeyMap categorizedFunctions = new DoubleKeyMap();
+ private DoubleKeyMap categorizedGeometryFunctions = new DoubleKeyMap();
+ private DoubleKeyMap categorizedScalarFunctions = new DoubleKeyMap();
+
+ public GeometryFunctionRegistry()
+ {
+ }
+
+ public GeometryFunctionRegistry(Class clz)
+ {
+ add(clz);
+ }
+
+ public List getFunctions()
+ {
+ return functions;
+ }
+
+ public List getGeometryFunctions()
+ {
+ List funList = new ArrayList();
+ for (Iterator i = sortedFunctions.values().iterator(); i.hasNext(); )
+ {
+ GeometryFunction fun = (GeometryFunction) i.next();
+ if (hasGeometryResult(fun))
+ funList.add(fun);
+ }
+ return funList;
+ }
+
+ public static boolean hasGeometryResult(GeometryFunction func)
+ {
+ return Geometry.class.isAssignableFrom(func.getReturnType());
+ }
+
+ public List getScalarFunctions()
+ {
+ List scalarFun = new ArrayList();
+ for (Iterator i = sortedFunctions.values().iterator(); i.hasNext(); )
+ {
+ GeometryFunction fun = (GeometryFunction) i.next();
+ if (! hasGeometryResult(fun))
+ scalarFun.add(fun);
+ }
+ return scalarFun;
+ }
+
+ /**
+ * Adds functions for all the static methods in the given class.
+ *
+ * @param geomFuncClass
+ */
+ public void add(Class geomFuncClass)
+ {
+ List funcs = createFunctions(geomFuncClass);
+ // sort list of functions so they appear nicely in the UI list
+ Collections.sort(funcs);
+ add(funcs);
+ }
+
+ /**
+ * Adds functions for all the static methods in the given class.
+ *
+ * @param geomFuncClassname the name of the class to load and extract functions from
+ */
+ public void add(String geomFuncClassname)
+ throws ClassNotFoundException
+ {
+ Class geomFuncClass = null;
+ geomFuncClass = this.getClass().getClassLoader().loadClass(geomFuncClassname);
+ add(geomFuncClass);
+ }
+
+
+ public void add(Collection funcs)
+ {
+ for (Iterator i = funcs.iterator(); i.hasNext(); ) {
+ GeometryFunction f = (GeometryFunction) i.next();
+ add(f);
+ }
+ }
+
+ /**
+ * Create {@link GeometryFunction}s for all the static
+ * methods in the given class
+ *
+ * @param functionClass
+ * @return a list of the functions created
+ */
+ public List createFunctions(Class functionClass) {
+ List funcs = new ArrayList();
+ Method[] method = functionClass.getMethods();
+ for (int i = 0; i < method.length; i++) {
+ int mod = method[i].getModifiers();
+ if (Modifier.isStatic(mod) && Modifier.isPublic(mod)) {
+ funcs.add(StaticMethodGeometryFunction.createFunction(method[i]));
+ }
+ }
+ return funcs;
+ }
+
+
+ /**
+ * Adds a function if it does not currently
+ * exist in the registry, or replaces the existing one
+ * with the same signature.
+ *
+ * @param func a function
+ */
+ public void add(GeometryFunction func)
+ {
+ functions.add(func);
+ sortedFunctions.put(func.getName(), func);
+ categorizedFunctions.put(func.getCategory(), func.getName(), func);
+ if (hasGeometryResult(func)) {
+ categorizedGeometryFunctions.put(func.getCategory(), func.getName(), func);
+ }
+ else {
+ categorizedScalarFunctions.put(func.getCategory(), func.getName(), func);
+ }
+ }
+
+ public DoubleKeyMap getCategorizedGeometryFunctions()
+ {
+ return categorizedGeometryFunctions;
+ }
+
+ public DoubleKeyMap getCategorizedScalarFunctions()
+ {
+ return categorizedScalarFunctions;
+ }
+
+ public Collection getCategories()
+ {
+ return categorizedFunctions.keySet();
+ }
+
+ public Collection getFunctions(String category)
+ {
+ return categorizedFunctions.values(category);
+ }
+
+ /*
+ int index = functions.indexOf(func);
+ if (index == -1) {
+ sortedFunctions.put(func.getName(), func);
+ }
+ else {
+ functions.set(index, func);
+ }
+ }
+ */
+
+
+ /**
+ * Finds the first function which matches the given signature.
+ *
+ * @param name
+ * @param paramTypes
+ * @return a matching function, or null
+ */
+ public GeometryFunction find(String name, Class[] paramTypes)
+ {
+ return null;
+ }
+
+ /**
+ * Finds the first function which matches the given name and argument count.
+ *
+ * @param name
+ * @return a matching function, or null
+ */
+ public GeometryFunction find(String name, int argCount)
+ {
+ for (Iterator i = functions.iterator(); i.hasNext(); ) {
+ GeometryFunction func = (GeometryFunction) i.next();
+ String funcName = func.getName();
+ if (funcName.equalsIgnoreCase(name)
+ && func.getParameterTypes().length == argCount)
+ return func;
+ }
+ return null;
+ }
+ /**
+ * Finds the first function which matches the given name.
+ *
+ * @param name
+ * @return a matching function, or null
+ */
+ public GeometryFunction find(String name)
+ {
+ for (Iterator i = functions.iterator(); i.hasNext(); ) {
+ GeometryFunction func = (GeometryFunction) i.next();
+ String funcName = func.getName();
+ if (funcName.equalsIgnoreCase(name))
+ return func;
+ }
+ return null;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionUtil.java
new file mode 100644
index 0000000..2eeebd0
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/GeometryFunctionUtil.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.geomfunction;
+
+public class GeometryFunctionUtil {
+
+ public static String toolTipText(GeometryFunction func) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("<html>");
+ sb.append(func.getSignature());
+ String desc = func.getDescription();
+ if (desc != null) sb.append("<br>" + desc);
+ sb.append("</html>");
+ return sb.toString();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/Metadata.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/Metadata.java
new file mode 100644
index 0000000..4411da5
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/Metadata.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.geomfunction;
+
+import java.lang.annotation.*;
+
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Metadata
+{
+ String name() default "";
+ String title() default "";
+ String description() default "";
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/MetadataUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/MetadataUtil.java
new file mode 100644
index 0000000..9cd26d2
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/MetadataUtil.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.geomfunction;
+
+import java.lang.annotation.Annotation;
+
+public class MetadataUtil {
+
+ public static String name(Annotation[] anno) {
+ for (int i = 0; i < anno.length; i++) {
+ if (anno[i] instanceof Metadata) {
+ Metadata doc = (Metadata) anno[i];
+ if (doc != null)
+ return doc.name();
+ }
+ }
+ return null;
+ }
+
+ public static String title(Annotation[] anno) {
+ for (int i = 0; i < anno.length; i++) {
+ if (anno[i] instanceof Metadata) {
+ Metadata doc = (Metadata) anno[i];
+ if (doc != null)
+ return doc.title();
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/RepeaterGeometryFunction.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/RepeaterGeometryFunction.java
new file mode 100644
index 0000000..56335b9
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/RepeaterGeometryFunction.java
@@ -0,0 +1,105 @@
+package org.locationtech.jtstest.geomfunction;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.function.FunctionsUtil;
+import org.locationtech.jtstest.util.ClassUtil;
+
+public class RepeaterGeometryFunction implements GeometryFunction {
+
+ private GeometryFunction fun;
+ private int count;
+
+ public RepeaterGeometryFunction(GeometryFunction fun, int count) {
+ this.fun = fun;
+ this.count = count;
+ }
+
+ public String getCategory() {
+ return fun.getCategory();
+ }
+
+ public String getName() {
+ return fun.getName() + repeatAnnotation();
+ }
+
+ public String getDescription() {
+ return fun.getDescription();
+ }
+
+ public String[] getParameterNames() {
+ return fun.getParameterNames();
+ }
+
+ public Class[] getParameterTypes() {
+ return fun.getParameterTypes();
+ }
+
+ public Class getReturnType() {
+ return fun.getReturnType();
+ }
+
+ public String getSignature() {
+ return fun.getSignature();
+ }
+
+ private String repeatAnnotation() {
+ return "*" + count;
+ }
+
+ public boolean isBinary() {
+ return fun.isBinary();
+ }
+
+ public Object invoke(Geometry geom, Object[] args) {
+
+ if (! isRepeatable(fun)) {
+ throw new IllegalArgumentException("Cannot repeat function whose argumnent is not a double");
+ }
+
+ //TODO: handle repeating methods with integer arg
+ int repeatArgIndex = repeatableArgIndex(fun);
+ Double argStart = ClassUtil.toDouble(args[repeatArgIndex]);
+ return invokeRepeated(geom, args, argStart);
+ }
+
+ public static boolean isRepeatable(GeometryFunction fun) {
+ if (! (fun.getReturnType() == Geometry.class )) return false;
+
+ Class[] paramType = fun.getParameterTypes();
+ int repeatArgIndex = repeatableArgIndex(fun);
+ // abort if no repeatable parameter
+ if (paramType.length < repeatArgIndex + 1) return false;
+ Class type = paramType[repeatArgIndex];
+ if (! ClassUtil.isDouble(type)) return false;
+
+ /*
+ Double argBase = ClassUtil.toDouble(args[0]);
+ if (argBase == null) return false;
+ */
+
+ return true;
+ }
+
+ public static int repeatableArgIndex(GeometryFunction fun) {
+ if (fun.isBinary()) return 1;
+ return 0;
+ }
+ private Object invokeRepeated(Geometry geom, Object[] args, double argStart) {
+ Geometry[] results = new Geometry[count];
+ int repeatArgIndex = repeatableArgIndex(fun);
+ for (int i = 1; i <= count; i++) {
+ double val = argStart * i;
+ Geometry result = (Geometry) fun.invoke(geom, copyArgs(args, repeatArgIndex, val));
+ FunctionsUtil.showIndicator(result);
+ results[i-1] = result;
+ }
+ return geom.getFactory().createGeometryCollection(results);
+ }
+
+ private Object[] copyArgs(Object[] args, int replaceIndex, double val) {
+ Object[] newArgs = args.clone();
+ newArgs[replaceIndex] = val;
+ return newArgs;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java
new file mode 100644
index 0000000..bfea750
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.geomfunction;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.*;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.util.*;
+
+
+/**
+ * A {@link GeometryFunction} which calls a static
+ * {@link Method}.
+ *
+ * @author Martin Davis
+ *
+ */
+public class StaticMethodGeometryFunction
+ extends BaseGeometryFunction
+{
+ private static final String PARAM_NAME_TEXT = "Text";
+ private static final String PARAM_NAME_COUNT = "Count";
+ private static final String PARAM_NAME_DISTANCE = "Distance";
+
+ private static final String FUNCTIONS_SUFFIX = "Functions";
+
+ public static StaticMethodGeometryFunction createFunction(Method method)
+ {
+ Assert.isTrue(Geometry.class.isAssignableFrom((method.getParameterTypes())[0]));
+
+ Class clz = method.getDeclaringClass();
+
+ String category = extractCategory(ClassUtil.getClassname(clz));
+ String funcName = method.getName();
+ String description = extractDescription(method);
+ String[] paramNames = extractParamNames(method);
+ Class[] paramTypes = extractParamTypes(method);
+ Class returnType = method.getReturnType();
+
+ return new StaticMethodGeometryFunction(category, funcName,
+ description,
+ paramNames, paramTypes,
+ returnType, method);
+ }
+
+ private static String extractCategory(String className)
+ {
+ String trim = StringUtil.removeFromEnd(className, FUNCTIONS_SUFFIX);
+ return trim;
+ }
+
+ /**
+ * Java doesn't permit accessing the original code parameter names, unfortunately.
+ *
+ * @param method
+ * @return
+ */
+ private static String[] extractParamNames(Method method)
+ {
+ // Synthesize default names
+ String[] name = defaultParamNames(method);
+ // override with metadata titles, if any
+ Annotation[][] anno = method.getParameterAnnotations();
+ // Skip first annotation - it is the target geometry
+ for (int i = 0; i < name.length; i++) {
+ String annoName = MetadataUtil.title(anno[i+1]);
+ if (annoName != null) {
+ name[i] = annoName;
+ }
+ }
+ return name;
+ }
+
+ private static String[] defaultParamNames(Method method) {
+ int firstScalarIndex = firstScalarParamIndex(method);
+ // Synthesize default names
+ Class<?>[] type = method.getParameterTypes();
+ String[] name = new String[type.length - 1];
+ for (int i = 0; i < name.length; i++) {
+ // for first scalar parameter choose default name based on type
+ name[i] = "Arg " + i;
+ if (i+1 == firstScalarIndex) {
+ name[i] = paramNamePrimary(type[firstScalarIndex]);
+ }
+ }
+ return name;
+ }
+ private static int firstScalarParamIndex(Method method) {
+ Class<?>[] type = method.getParameterTypes();
+ for (int i = 0; i < type.length; i++) {
+ if (! ClassUtil.isGeometry(type[i])) {
+ return i;
+ }
+ }
+ return -1;
+ }
+ private static String paramNamePrimary(Class<?> clz) {
+ if (clz == String.class) return PARAM_NAME_TEXT;
+ if (ClassUtil.isDouble(clz)) return PARAM_NAME_DISTANCE;
+ //if (ClassUtil.isInt(clz)) return PARAM_NAME_COUNT;
+ return PARAM_NAME_COUNT;
+ }
+
+ private static String extractDescription(Method method)
+ {
+ Metadata doc = method.getAnnotation(Metadata.class);
+ String desc = (doc == null) ? "" : doc.description();
+ return desc;
+ }
+
+ private static Class[] extractParamTypes(Method method)
+ {
+ Class[] methodParamTypes = method.getParameterTypes();
+ Class[] types = new Class[methodParamTypes.length - 1];
+ for (int i = 1; i < methodParamTypes.length; i++)
+ types[i-1] = methodParamTypes[i];
+ return types;
+ }
+
+ private Method method;
+
+ public StaticMethodGeometryFunction(
+ String category,
+ String name,
+ String description,
+ String[] parameterNames,
+ Class[] parameterTypes,
+ Class returnType,
+ Method method)
+ {
+ super(category, name, description, parameterNames, parameterTypes, returnType);
+ this.method = method;
+ }
+
+ public Object invoke(Geometry g, Object[] arg)
+ {
+ return invoke(method, null, createFullArgs(g, arg));
+ }
+
+ /**
+ * Creates an arg array which includes the target geometry as the first argument
+ *
+ * @param g
+ * @param arg
+ * @return
+ */
+ private static Object[] createFullArgs(Geometry g, Object[] arg)
+ {
+ int fullArgLen = 1;
+ if (arg != null)
+ fullArgLen = arg.length + 1;
+ Object[] fullArg = new Object[fullArgLen];
+ fullArg[0] = g;
+ for (int i = 1; i < fullArgLen; i++) {
+ fullArg[i] = arg[i-1];
+ }
+ return fullArg;
+ }
+
+ public static Object invoke(Method method, Object target, Object[] args)
+ {
+ Object result;
+ try {
+ result = method.invoke(target, args);
+ }
+ catch (InvocationTargetException ex) {
+ Throwable t = ex.getCause();
+ if (t instanceof RuntimeException)
+ throw (RuntimeException) t;
+ throw new RuntimeException(invocationErrMsg(ex));
+ }
+ catch (Exception ex) {
+ System.out.println(ex.getMessage());
+ throw new RuntimeException(ex.getMessage());
+ }
+ return result;
+ }
+
+ private static String invocationErrMsg(InvocationTargetException ex)
+ {
+ Throwable targetEx = ex.getTargetException();
+ String msg = getClassname(targetEx.getClass())
+ + ": " +
+ targetEx.getMessage();
+ return msg;
+ }
+
+ public static String getClassname(Class javaClass)
+ {
+ String jClassName = javaClass.getName();
+ int lastDotPos = jClassName.lastIndexOf(".");
+ return jClassName.substring(lastDotPos + 1, jClassName.length());
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/test/TestCase.java b/modules/app/src/main/java/org/locationtech/jtstest/test/TestCase.java
new file mode 100644
index 0000000..56f994a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/test/TestCase.java
@@ -0,0 +1,360 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.test;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.*;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * @version 1.7
+ */
+public class TestCase implements Testable {
+ private PrecisionModel pm = new PrecisionModel();
+ private WKTWriter wktWriter = new WKTWriter();
+ protected String name, description, expectedIM;
+ protected boolean isRun = false;
+ protected boolean failed = false;
+ //protected boolean passed = false;
+ protected String failedMsg = "";
+ private Geometry expectedConvexHull = null;
+ private Geometry expectedBoundary = null;
+ private Geometry expectedIntersection = null;
+ private Geometry expectedUnion = null;
+ private Geometry expectedDifference = null;
+ private Geometry expectedSymDifference = null;
+ private Geometry expectedCentroid = null;
+ private IntersectionMatrix im;
+ private Geometry[] geom = new Geometry[2];
+ private String wkta;
+ private String wktb;
+
+ public TestCase() {
+ this(null, null, null, null, null, null, null, null, null, null);
+ }
+
+ public TestCase(String name) {
+ this(name, null, null, null, null, null, null, null, null, null);
+ }
+
+ public TestCase(String name, String description, String wkta, String wktb,
+ String expectedIM) {
+ this(name, description, wkta, wktb, expectedIM, null, null, null, null,
+ null);
+ }
+
+ public TestCase(String name, String description, String wkta, String wktb,
+ String expectedIM, String expectedConvexHull, String expectedIntersection,
+ String expectedUnion, String expectedDifference, String expectedSymDifference) {
+ this(name, description, wkta, wktb, expectedIM, expectedConvexHull, expectedIntersection,
+ expectedUnion, expectedDifference, expectedSymDifference, null);
+ }
+
+ public TestCase(String name, String description, String wkta, String wktb,
+ String expectedIM, String expectedConvexHull, String expectedIntersection,
+ String expectedUnion, String expectedDifference, String expectedSymDifference,
+ String expectedBoundary) {
+ try {
+ init(name, description, wkta, wktb, expectedIM, toNullOrGeometry(expectedConvexHull),
+ toNullOrGeometry(expectedIntersection), toNullOrGeometry(expectedUnion),
+ toNullOrGeometry(expectedDifference), toNullOrGeometry(expectedSymDifference),
+ toNullOrGeometry(expectedBoundary));
+ }
+ catch (ParseException e) {
+ Assert.shouldNeverReachHere();
+ }
+ }
+
+ public TestCase(TestCase tc) {
+ init(tc.name, tc.description, tc.getWellKnownText(0), tc.getWellKnownText(1),
+ tc.expectedIM, tc.getExpectedConvexHull(), tc.getExpectedIntersection(),
+ tc.getExpectedUnion(), tc.getExpectedDifference(), tc.getExpectedSymDifference(),
+ tc.getExpectedBoundary());
+ }
+
+ public void setGeometry(int index, Geometry g) {
+ geom[index] = g;
+ }
+
+ public TestCase setPrecisionModel(PrecisionModel pm)
+ {
+ this.pm = pm;
+ return this;
+ }
+ public void setIntersectionMatrix(IntersectionMatrix im) {
+ this.im = im;
+ }
+
+ public void setExpectedIntersectionMatrix(String expectedIntersectionMatrix) {
+ expectedIM = expectedIntersectionMatrix;
+ }
+
+ public TestCase setExpectedRelateMatrix(String expectedIntersectionMatrix) {
+ expectedIM = expectedIntersectionMatrix;
+ return this;
+ }
+
+ public TestCase setTestName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public void setExpectedConvexHull(Geometry expectedConvexHull) {
+ this.expectedConvexHull = expectedConvexHull;
+ }
+
+ public void setExpectedBoundary(Geometry expectedBoundary) {
+ this.expectedBoundary = expectedBoundary;
+ }
+
+ public void setExpectedIntersection(Geometry expectedIntersection) {
+ this.expectedIntersection = expectedIntersection;
+ }
+
+ public void setExpectedUnion(Geometry expectedUnion) {
+ this.expectedUnion = expectedUnion;
+ }
+
+ public void setExpectedDifference(Geometry expectedDifference) {
+ this.expectedDifference = expectedDifference;
+ }
+
+ public void setExpectedSymDifference(Geometry expectedSymDifference) {
+ this.expectedSymDifference = expectedSymDifference;
+ }
+
+ public void setExpectedCentroid(Geometry expectedCentroid) {
+ this.expectedCentroid = expectedCentroid;
+ }
+
+ public TestCase setExpectedIntersection(String wkt) {
+ try {
+ this.expectedIntersection = toNullOrGeometry(wkt);
+ }
+ catch (ParseException e) {
+ Assert.shouldNeverReachHere();
+ }
+ return this;
+ }
+
+ public TestCase setExpectedBoundary(String wkt) {
+ try {
+ this.expectedBoundary = toNullOrGeometry(wkt);
+ }
+ catch (ParseException e) {
+ Assert.shouldNeverReachHere();
+ }
+ return this;
+ }
+
+ public TestCase setA(String wkta) {
+ this.wkta = wkta;
+ return this;
+ }
+
+ public TestCase setB(String wktb) {
+ this.wktb = wktb;
+ return this;
+ }
+
+ public Geometry getGeometry(int index) {
+ return geom[index];
+ }
+
+ public IntersectionMatrix getIntersectionMatrix() {
+ return im;
+ }
+
+ public String getExpectedIntersectionMatrix() {
+ return expectedIM;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public boolean isFailed() {
+ return failed;
+ }
+
+ public String getFailedMsg() {
+ return failedMsg;
+ }
+
+ public boolean isPassed() {
+ return isRun && !failed;
+ }
+
+ public boolean isRun() {
+ return isRun;
+ }
+
+ public String getWellKnownText(int i) {
+ if (geom[i] == null) {
+ return null;
+ }
+ return wktWriter.write(geom[i]);
+ }
+
+ public Geometry getExpectedConvexHull() {
+ return expectedConvexHull;
+ }
+
+ public Geometry getExpectedBoundary() {
+ return expectedBoundary;
+ }
+
+ public Geometry getExpectedIntersection() {
+ return expectedIntersection;
+ }
+
+ public Geometry getExpectedUnion() {
+ return expectedUnion;
+ }
+
+ public Geometry getExpectedDifference() {
+ return expectedDifference;
+ }
+
+ public Geometry getExpectedSymDifference() {
+ return expectedSymDifference;
+ }
+
+ public Geometry[] getGeometries() {
+ return geom;
+ }
+
+ public void runTest() throws ParseException {
+ failed = false;
+ isRun = true;
+ initGeometry();
+ if (expectedIM != null) {
+ IntersectionMatrix im = null;
+ if (geom[0] != null && geom[1] != null) {
+ im = relate(geom[0], geom[1]);
+ }
+ if (im != null) {
+ String msg = " expected " + expectedIM + ", found " + im.toString();
+ assertTrue(im.matches(expectedIM), msg);
+ }
+ }
+ if (expectedBoundary != null) {
+ Geometry result = geom[0].getBoundary();
+ assertEqualsExact(expectedBoundary, result, " expected boundary "
+ + expectedBoundary.toText() + " , found " + result.toText());
+ }
+ if (expectedConvexHull != null) {
+ Geometry result = geom[0].convexHull();
+ assertEqualsExact(expectedConvexHull, result, " expected convex hull "
+ + expectedConvexHull.toText() + " , found " + result.toText());
+ }
+ if (expectedIntersection != null) {
+ Geometry result = geom[0].intersection(geom[1]);
+ assertEqualsExact(expectedIntersection, result, " expected intersection "
+ + expectedIntersection.toText() + " , found " + result.toText());
+ }
+ if (expectedUnion != null) {
+ Geometry result = geom[0].union(geom[1]);
+ assertEqualsExact(expectedUnion, result, " expected union "
+ + expectedUnion.toText() + " , found " + result.toText());
+ }
+ if (expectedDifference != null) {
+ Geometry result = geom[0].difference(geom[1]);
+ assertEqualsExact(expectedDifference, result, " expected difference "
+ + expectedDifference.toText() + " , found " + result.toText());
+ }
+ if (expectedSymDifference != null) {
+ Geometry result = geom[0].symDifference(geom[1]);
+ assertEqualsExact(expectedSymDifference, result, " expected sym difference "
+ + expectedSymDifference.toText() + " , found " + result.toText());
+ }
+ }
+
+ public void initGeometry() throws ParseException {
+ GeometryFactory fact = new GeometryFactory(pm, 0);
+ WKTReader wktRdr = new WKTReader(fact);
+ if (geom[0] != null) {
+ return;
+ }
+ if (wkta != null) {
+ geom[0] = wktRdr.read(wkta);
+ }
+ if (wktb != null) {
+ geom[1] = wktRdr.read(wktb);
+ }
+ }
+
+ void init(String name, String description, String wkta, String wktb, String expectedIM,
+ Geometry expectedConvexHull, Geometry expectedIntersection, Geometry expectedUnion,
+ Geometry expectedDifference, Geometry expectedSymDifference, Geometry expectedBoundary) {
+ this.name = name;
+ this.description = description;
+ this.wkta = wkta;
+ this.wktb = wktb;
+ this.expectedIM = expectedIM;
+ this.expectedConvexHull = expectedConvexHull;
+ this.expectedBoundary = expectedBoundary;
+ this.expectedIntersection = expectedIntersection;
+ this.expectedUnion = expectedUnion;
+ this.expectedDifference = expectedDifference;
+ this.expectedSymDifference = expectedSymDifference;
+ }
+
+ IntersectionMatrix relate(Geometry a, Geometry b) {
+ return a.relate(b);
+ }
+
+ void assertEquals(Object o1, Object o2, String msg) {
+ assertTrue(o1.equals(o2), msg);
+ }
+
+ void assertEqualsExact(Geometry g1, Geometry g2, String msg) {
+ Geometry g1Clone = (Geometry) g1.clone();
+ Geometry g2Clone = (Geometry) g2.clone();
+ g1Clone.normalize();
+ g2Clone.normalize();
+ assertTrue(g1Clone.equalsExact(g2Clone), msg);
+ }
+
+ void assertTrue(boolean val, String msg) {
+ if (!val) {
+ failed = true;
+ failedMsg = msg;
+ }
+ }
+
+ private Geometry toNullOrGeometry(String wellKnownText) throws ParseException {
+ if (wellKnownText == null) {
+ return null;
+ }
+ GeometryFactory fact = new GeometryFactory(pm, 0);
+ WKTReader wktRdr = new WKTReader(fact);
+ return wktRdr.read(wellKnownText);
+ }
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/test/TestCaseList.java b/modules/app/src/main/java/org/locationtech/jtstest/test/TestCaseList.java
new file mode 100644
index 0000000..81eb447
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/test/TestCaseList.java
@@ -0,0 +1,76 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.test;
+
+import java.util.*;
+
+import org.locationtech.jtstest.testbuilder.model.TestCaseEdit;
+
+
+/**
+ * @version 1.7
+ */
+public class TestCaseList {
+ ArrayList tests = new ArrayList();
+
+ public TestCaseList() { }
+
+ public List getList() {
+ return tests;
+ }
+ public int size() {
+ return tests.size();
+ }
+ public Testable get(int i) {
+ return (Testable) tests.get(i);
+ }
+ public void add(Testable tc) {
+ tests.add(tc);
+ }
+ public void add(TestCaseEdit tc, int i) {
+ arrayAdd(tests, tc, i);
+ }
+ public void add(TestCaseList tcl) {
+ for (Iterator i = tcl.tests.iterator(); i.hasNext(); ) {
+ tests.add((Testable) i.next());
+ }
+ }
+ public void remove(int i) {
+ tests.remove(i);
+ }
+
+ /**
+ * A shim for ArrayList.add(Object, int)
+ *
+ * @param list ArrayList to add to
+ * @param o object to add
+ * @param index index to add at
+ */
+ private static void arrayAdd(ArrayList list, Object o, int index) {
+ list.add(o);
+ // adding at or after end of array?
+ if (index >= list.size()) {
+ return;
+ }
+
+ int n = list.size();
+ // move elements up to make room for new element
+ for (int i = n-1; i > index; i--) {
+ list.set(i, list.get(i - 1));
+ }
+ list.set(index, o);
+ }
+}
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/test/Testable.java b/modules/app/src/main/java/org/locationtech/jtstest/test/Testable.java
new file mode 100644
index 0000000..425ac5c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/test/Testable.java
@@ -0,0 +1,50 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.test;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.io.ParseException;
+
+
+/**
+ * @version 1.7
+ */
+public interface Testable {
+
+
+ String getName();
+
+
+ Geometry getGeometry(int index);
+
+
+ void setGeometry(int index, Geometry g);
+
+
+ IntersectionMatrix getIntersectionMatrix();
+
+
+ void setIntersectionMatrix(IntersectionMatrix im);
+
+ void initGeometry() throws ParseException;
+
+ String getDescription();
+
+ String getWellKnownText(int i);
+
+ void setName(String name);
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppConstants.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppConstants.java
new file mode 100644
index 0000000..bc49326
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppConstants.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.Color;
+import java.awt.Font;
+
+import javax.swing.ImageIcon;
+
+import org.locationtech.jts.awt.FontGlyphReader;
+import org.locationtech.jtstest.testbuilder.model.GeometryDepiction;
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+
+
+public class AppConstants
+{
+ public static final int POINT_SIZE = 5;
+ public static final int VERTEX_SIZE = 4;
+ public static double HIGHLIGHT_SIZE = 50.0;
+ public static double VERTEX_SHADOW_SIZE = 100;
+
+ public static double TOPO_STRETCH_VIEW_DIST = 5;
+
+ public static double MASK_WIDTH_FRAC = 0.3333;
+ // a very light gray
+ public static final Color MASK_CLR = new Color(230, 230, 230);
+
+ public static final Color VERTEX_SHADOW_CLR = new Color(180,180,180);
+ public static final Color VERTEX_HIGHLIGHT_CLR = new Color(255, 255, 0);
+
+ public static final Color HIGHLIGHT_CLR = new Color(255, 192, 0, 150);
+ public static final Color HIGHLIGHT_FILL_CLR = new Color(255, 240, 192, 200);
+
+ public static final Color BAND_CLR = new Color(255, 0, 0, 255);
+ public static final Color INDICATOR_FILL_CLR = GeometryDepiction.GEOM_RESULT_FILL_CLR;
+ //public static final Color INDICATOR_LINE_COLOR = new Color(255, 0, 0, 255);
+ //public static final Color INDICATOR_FILL_COLOR = new Color(255, 200, 200, 200);
+ public static final Color INDICATOR_LINE_CLR = GeometryDepiction.GEOM_RESULT_LINE_CLR;
+
+ public static final int AXIS_WIDTH = 3;
+ public static final Color AXIS_CLR = Color.lightGray;
+
+ public static final Color GRID_CLR = Color.lightGray;
+
+ public static final Color GRID_MAJOR_CLR = ColorUtil.gray(240);
+ public static final Color GRID_MINOR_CLR = ColorUtil.gray(190);
+ public static int TOLERANCE_PIXELS = 5;
+
+ public final static ImageIcon ICON_COLLECTION = new ImageIcon(AppConstants.class.getResource("Icon_GeomCollection.png"));
+ public final static ImageIcon ICON_COLLECTION_B = new ImageIcon(AppConstants.class.getResource("Icon_GeomCollection_B.png"));
+ public final static ImageIcon ICON_POLYGON = new ImageIcon(AppConstants.class.getResource("Icon_Polygon.png"));
+ public final static ImageIcon ICON_POLYGON_B = new ImageIcon(AppConstants.class.getResource("Icon_Polygon_B.png"));
+ public final static ImageIcon ICON_LINEARRING = new ImageIcon(AppConstants.class.getResource("Icon_LinearRing.png"));
+ public final static ImageIcon ICON_LINEARRING_B = new ImageIcon(AppConstants.class.getResource("Icon_LinearRing_B.png"));
+ public final static ImageIcon ICON_LINESTRING = new ImageIcon(AppConstants.class.getResource("Icon_LineString.png"));
+ public final static ImageIcon ICON_LINESTRING_B = new ImageIcon(AppConstants.class.getResource("Icon_LineString_B.png"));
+ public final static ImageIcon ICON_POINT = new ImageIcon(AppConstants.class.getResource("Icon_Point.png"));
+ public final static ImageIcon ICON_POINT_B = new ImageIcon(AppConstants.class.getResource("Icon_Point_B.png"));
+
+
+ public final static Font FONT_LABEL = new Font(FontGlyphReader.FONT_SANSSERIF, Font.BOLD, 12);
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppCursors.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppCursors.java
new file mode 100644
index 0000000..ce395e4
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppCursors.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.Cursor;
+import java.awt.Toolkit;
+
+import javax.swing.ImageIcon;
+
+public class AppCursors
+{
+ public static Cursor DRAW_GEOM = Toolkit.getDefaultToolkit().createCustomCursor(
+ IconLoader.icon("DrawCursor.png").getImage(), new java.awt.Point(4, 26),
+ "Draw");
+
+ public static Cursor EDIT_VERTEX = Toolkit.getDefaultToolkit().createCustomCursor(
+ IconLoader.icon("MoveVertexCursor.gif").getImage(),
+ new java.awt.Point(16, 16), "MoveVertex");
+
+ public static Cursor HAND = Toolkit.getDefaultToolkit().createCustomCursor(
+ IconLoader.icon("Hand.gif").getImage(), new java.awt.Point(7, 7), "Pan");
+
+ public static Cursor ZOOM = Toolkit.getDefaultToolkit().createCustomCursor(
+ IconLoader.icon("MagnifyCursor.gif").getImage(),
+ new java.awt.Point(16, 16), "Zoom In");
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppStrings.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppStrings.java
new file mode 100644
index 0000000..1175178
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/AppStrings.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+public class AppStrings {
+
+ public static final String LABEL_TEST_CASE = "Case";
+
+ public static final String GEOM_LABEL_A = "A";
+ public static final String GEOM_LABEL_B = "B";
+
+ public static final String TAB_LABEL_LOG = "Log";
+ public static final String TAB_LABEL_VALUE = "Value";
+ static final String TAB_LABEL_RESULT = "Result";
+ static final String TAB_LABEL_INSPECT = "Inspect";
+ static final String TAB_LABEL_INPUT = "Input";
+ static final String TAB_LABEL_LAYERS = "Layers";
+ static final String TAB_LABEL_STATS = "Stats";
+ static final String TAB_LABEL_CASES = "Cases";
+
+ public static final String TIP_TEXT_ENTRY = "Enter WKT, WKB GeoJSON, or GML, or drag-n-drop a WKT, WKB, GeoJSON, GML or SHP file";
+ public static final String TIP_WKT_PANEL_LOAD_GEOMETRY = "Load geometries";
+ public static final String TIP_INSPECT_GEOMETRY = "Inspect Geometry";
+
+ static final String TIP_EXTRACT_COMPONENTS = "Extract Components to Case";
+
+ static final String TIP_DELETE_VERTEX_COMPONENT = "Delete Vertices or Components";
+
+ static final String TIP_MOVE_VERTEX = "<html>Move/Add/Delete Vertex<br><br>Move = Left-Btn<br>Add = Right-Btn<br>Delete = Ctl-Right-Btn</html>";
+
+ static final String TIP_PAN = "Pan";
+ static final String TIP_ZOOM_TO_FULL_EXTENT = "Zoom To Full Extent";
+ static final String TIP_ZOOM_TO_RESULT = "Zoom To Result";
+ static final String TIP_ZOOM_TO_B = "Zoom To B";
+ static final String TIP_ZOOM_TO_A = "Zoom To A";
+ static final String TIP_ZOOM_1_1 = "Zoom 1:1";
+ static final String TIP_ZOOM = "<html>Zoom In/Out<br><br>In = Left-Btn<br>Out = Right-Btn<br>Extent = Shift-Drag<br>Pan = Ctl-Drag</html>";
+
+ static final String TIP_INFO = "Show Info on Geometry, Segment, or Point";
+
+ static final String TIP_DRAW_RECTANGLE = "Draw Rectangle";
+ static final String TIP_DRAW_POINT = "Draw Point";
+ static final String TIP_DRAW_LINE = "<html>Draw LineString<br><br>Add Pt = Left-Click<br>Stream = Left-Drag</html>";
+ static final String TIP_DRAW_POLY = "<html>Draw Polygon<br><br>Add Pt = Left-Click<br>Stream = Left-Drag</html>";
+
+
+ static final String TIP_EXCHANGE_A_B = "Exchange A & B";
+
+ static final String TIP_CASE_DELETE = "Delete Case";
+ static final String TIP_CASE_DUP = "Duplicate Case";
+ static final String TIP_CASE_ADD_NEW = "Add New Case";
+
+ static final String TIP_NEXT = "<html>Next Case<br><br>No Zoom = Ctl-Click</html>";
+ static final String TIP_PREV = "<html>Previous Case<br><br>No Zoom = Ctl-Click</html>";
+
+ static final String TIP_PASTE_DATA = "Paste from WKT, WKB, or GML";
+
+ static final String TIP_COPY_DATA = "Copy as WKT (Ctl-click for formatted)";
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/BusyDialog.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/BusyDialog.java
new file mode 100644
index 0000000..a5b1ad8
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/BusyDialog.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+import javax.swing.ImageIcon;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+
+import org.locationtech.jtstest.testrunner.GuiUtil;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+/**
+ * An indicator that the app is performing a long operation. Use instead of
+ * an hourglass, as Java 1.3's #setCursor methods are buggy. Make sure
+ * "images/Hourglass.gif" is on the classpath.
+ *
+ * @version 1.7
+ */
+public class BusyDialog extends JDialog {
+ private static Frame owner = null;
+
+ /**
+ * Sets the Frame for which the BusyDialog is displayed.
+ */
+ public static void setOwner(Frame _owner) {
+ owner = _owner;
+ }
+
+ public interface Executable {
+
+ public void execute() throws Exception;
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ private Executable executable;
+ private Thread thread = null;
+ private String description;
+ private ImageIcon icon = new ImageIcon(this.getClass().getResource("Hourglass.gif"));
+ private Exception exception = null;
+ private String stackTrace = null;
+ private javax.swing.Timer timer = new javax.swing.Timer(250, new ActionListener() {
+
+ public void actionPerformed(ActionEvent evt) {
+ label.setText(description);
+ if (!thread.isAlive()) {
+ timer.stop();
+ setVisible(false);
+ }
+ }
+ });
+ JLabel label = new JLabel();
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+
+ /**
+ * Creates a BusyDialog
+ */
+ public BusyDialog() {
+ super(owner, "Busy", true);
+ try {
+ jbInit();
+ pack();
+ } catch (Exception e) {
+ e.printStackTrace(System.out);
+ }
+ }
+
+ private void jbInit() throws Exception {
+ label.setText("Please wait . . .");
+ label.setMaximumSize(new Dimension(400, 40));
+ label.setMinimumSize(new Dimension(400, 40));
+ label.setPreferredSize(new Dimension(400, 40));
+ label.setHorizontalAlignment(SwingConstants.CENTER);
+ label.setIcon(icon);
+ this.setResizable(false);
+ this.setModal(true);
+ this.getContentPane().setLayout(gridBagLayout1);
+ this.addWindowListener(new java.awt.event.WindowAdapter() {
+
+ public void windowOpened(WindowEvent e) {
+ this_windowOpened(e);
+ }
+ });
+ setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+ this.getContentPane().add(
+ label,
+ new GridBagConstraints(
+ 0,
+ 0,
+ 1,
+ 1,
+ 1.0,
+ 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(4, 4, 4, 4),
+ 0,
+ 0));
+ }
+
+ /**
+ * Runs the Executable and displays the BusyDialog.
+ */
+ public void execute(String description, Executable executable) throws Exception {
+ this.executable = executable;
+ this.description = description;
+ exception = null;
+ stackTrace = null;
+ if (owner == null)
+ GuiUtil.centerOnScreen(this);
+ else
+ GuiUtil.center(this, owner);
+ setVisible(true);
+ if (exception != null)
+ throw exception;
+ }
+
+ void this_windowOpened(WindowEvent e) {
+ label.setText(description);
+ Runnable runnable = new Runnable() {
+
+ public void run() {
+ try {
+ executable.execute();
+ } catch (Exception e) {
+ exception = e;
+ stackTrace = StringUtil.getStackTrace(e);
+ }
+ }
+ };
+ thread = new Thread(runnable);
+ thread.start();
+ timer.start();
+ }
+
+ /**
+ * Sets the String displayed in the BusyDialog. Can be safely called
+ * by the AWT event dispatching thread and threads other than the
+ * AWT event dispatching thread.
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getStackTrace() {
+ return stackTrace;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditControlPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditControlPanel.java
new file mode 100644
index 0000000..0b44223
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditControlPanel.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+
+import javax.swing.AbstractButton;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSpinner;
+import javax.swing.JTextField;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingConstants;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryEditControlPanel extends JPanel
+{
+ private TestBuilderModel model;
+ private GeometryEditModel geomModel;
+
+
+ //---------------------------------------------
+ BorderLayout borderLayout1 = new BorderLayout();
+ ButtonGroup geometryType = new ButtonGroup();
+ JPanel jPanel3 = new JPanel();
+ JRadioButton rbNoEdit = new JRadioButton();
+ JRadioButton rbA = new JRadioButton();
+ JRadioButton rbB = new JRadioButton();
+ JPanel jPanel1 = new JPanel();
+ TitledBorder titledBorder2;
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+ ButtonGroup editMode = new ButtonGroup();
+ JPanel jPanel4 = new JPanel();
+ GridBagLayout gridBagLayout2 = new GridBagLayout();
+ Border border3;
+ GridBagLayout gridBagLayout4 = new GridBagLayout();
+ GridLayout gridLayout1 = new GridLayout();
+ JButton btnEraseGeom = new JButton();
+ JPanel jPanel7 = new JPanel();
+ GridLayout gridLayout2 = new GridLayout();
+ private GridBagLayout gridBagLayout5 = new GridBagLayout();
+ private JPanel jPanelPM = new JPanel();
+ JButton btnSetPrecisionModel = new JButton();
+ //LayerControlList layerList = new LayerControlList();
+
+ JPanel jPanel9 = new JPanel();
+ JCheckBox cbMagnifyTopo = new JCheckBox();
+
+ JPanel jPanelMagnify = new JPanel();
+ JSpinner stretchDist = new JSpinner(new SpinnerNumberModel(5, 0, 99999, 1));
+
+ public GeometryEditControlPanel() {
+ //enableEvents(AWTEvent.WINDOW_EVENT_MASK);
+ try {
+ uiInit();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void setModel(TestBuilderModel model) {
+ this.model = model;
+ geomModel = model.getGeometryEditModel();
+ geomModel
+ .addGeometryListener(new org.locationtech.jtstest.testbuilder.model.GeometryListener() {
+ public void geometryChanged(GeometryEvent e) {
+ editPanel_geometryChanged(e);
+ }
+ });
+
+ }
+
+ /**Component initialization*/
+ private void uiInit() throws Exception {
+ titledBorder2 =
+ new TitledBorder(BorderFactory.createLineBorder(Color.gray, 1), "Edit Mode");
+ this.setLayout(borderLayout1);
+ //this.setSize(new Dimension(194, 300));
+ rbNoEdit.setMargin(new Insets(0, 0, 0, 0));
+ rbNoEdit.setPreferredSize(new Dimension(61, 16));
+ rbNoEdit.setText("No Edit");
+ rbNoEdit.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ rbNoEdit_actionPerformed(e);
+ }
+ });
+ rbNoEdit.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ rbNoEdit_actionPerformed(e);
+ }
+ });
+ rbB.setForeground(Color.red);
+ rbB.setMargin(new Insets(0, 0, 0, 0));
+ rbB.setPreferredSize(new Dimension(66, 16));
+ rbB.setText("Edit B");
+ rbB.setFont(new java.awt.Font("Dialog", 1, 14));
+ rbB.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ rbB_actionPerformed(e);
+ }
+ });
+ jPanel1.setLayout(gridBagLayout1);
+ rbA.setMargin(new Insets(0, 0, 0, 0));
+ rbA.setPreferredSize(new Dimension(66, 16));
+ rbA.setText("Edit A");
+ rbA.setForeground(Color.blue);
+ rbA.setFont(new java.awt.Font("Dialog", 1, 14));
+ rbA.setSelected(true);
+ rbA.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbA_actionPerformed(e);
+ }
+ });
+
+ //jPanel1.setBorder(titledBorder2);
+
+ btnEraseGeom.setPreferredSize(new Dimension(43, 20));
+ btnEraseGeom.setMargin(new Insets(2, 2, 2, 2));
+ btnEraseGeom.setText("Erase");
+ btnEraseGeom.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnEraseGeom_actionPerformed(e);
+ }
+ });
+ jPanel7.setLayout(gridLayout2);
+
+// btnSetPrecisionModel.setMaximumSize(new Dimension(30, 27));
+ btnSetPrecisionModel.setMinimumSize(new Dimension(120, 27));
+ btnSetPrecisionModel.setPreferredSize(new Dimension(120, 21));
+ btnSetPrecisionModel.setToolTipText("Set the Precision Model used by all Test Cases");
+ btnSetPrecisionModel.setMargin(new Insets(2, 2, 2, 2));
+ btnSetPrecisionModel.setMnemonic('0');
+ btnSetPrecisionModel.setText("Precision Model...");
+
+ // put box ahead of text
+ //cbMagnifyTopo.setHorizontalTextPosition(AbstractButton.LEADING);
+ cbMagnifyTopo.setText("Magnify Topology");
+ cbMagnifyTopo.setToolTipText("Stretches portions of geometries to reveal fine topological detail");
+ stretchDist.setToolTipText("Stretch Distance");
+
+ /*
+ jPanel1.add(
+ rbNoEdit,
+ new GridBagConstraints(
+ 0,
+ 0,
+ 1,
+ 1,
+ 1.0,
+ 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 5, 0, 0),
+ 0,
+ 0));
+ jPanel1.add(
+ rbA,
+ new GridBagConstraints(
+ 0,
+ 1,
+ 1,
+ 1,
+ 0.0,
+ 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 5, 0, 0),
+ 0,
+ 0));
+ jPanel1.add(
+ rbB,
+ new GridBagConstraints(
+ 0,
+ 2,
+ 1,
+ 1,
+ 0.0,
+ 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 5, 0, 0),
+ 0,
+ 0));
+ jPanel1.add(
+ btnEraseGeom,
+ new GridBagConstraints(
+ 1,
+ 1,
+ 1,
+ 2,
+ 0.0,
+ 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.HORIZONTAL,
+ new Insets(0, 0, 0, 0),
+ 0,
+ 0));
+ */
+
+
+ jPanelPM.setLayout(new FlowLayout());
+ jPanelPM.add(btnSetPrecisionModel);
+
+ //jPanel9.setLayout(new FlowLayout());
+ // jPanel9.add(cbMagnifyTopo);
+
+ jPanelMagnify.setLayout(new FlowLayout());
+ jPanelMagnify.add(cbMagnifyTopo);
+ jPanelMagnify.add(stretchDist);
+ //jPanel10.add(new JLabel());
+ //jPanel10.add(new JLabel("Stretch Distance"));
+
+ //jPanel3.setLayout(gridBagLayout5);
+ jPanel3.setLayout(new GridLayout(2, 1, 10, 2));
+ jPanel3.add(jPanelPM);
+ //jPanel3.add(jPanelMagnify);
+
+
+ //this.add(jPanel1, BorderLayout.NORTH);
+ this.add(jPanel3, BorderLayout.SOUTH);
+ //this.add(layerList, BorderLayout.CENTER);
+
+ editMode.add(rbNoEdit);
+ editMode.add(rbA);
+ editMode.add(rbB);
+ }
+
+ void editPanel_geometryChanged(GeometryEvent e) {
+ updatePanel(false);
+ }
+
+ void rbA_actionPerformed(ActionEvent e) {
+ setEditMode(0);
+ }
+
+ void rbB_actionPerformed(ActionEvent e) {
+ setEditMode(1);
+ }
+
+ void setEditMode(int geomIndex) {
+ geomModel.setReadOnly(false);
+ geomModel.setEditGeomIndex(geomIndex);
+// setGeometryTypeState();
+ }
+
+ void rbNoEdit_actionPerformed(ActionEvent e) {
+ geomModel.setReadOnly(true);
+ }
+
+ void cbStretchTopo_actionPerformed(ActionEvent e) {
+
+ }
+
+ private void updatePanel(boolean partClosed)
+ {
+ }
+
+ void rbGeomLineString_actionPerformed(ActionEvent e) {
+ geomModel.setGeometryType(GeometryType.LINESTRING);
+ }
+
+ void rbGeomPolygon_actionPerformed(ActionEvent e) {
+ geomModel.setGeometryType(GeometryType.POLYGON);
+ }
+
+ void rbGeomPoint_actionPerformed(ActionEvent e) {
+ geomModel.setGeometryType(GeometryType.POINT);
+ }
+
+ void btnEraseGeom_actionPerformed(ActionEvent e) {
+ geomModel.clear();
+// setGeometryTypeState();
+ }
+
+ void setGridSizeButton_actionPerformed(ActionEvent e) {}
+
+ /*
+ public double getStretchSize()
+ {
+ Integer size = (Integer) stretchDist.getValue();
+ return size.intValue();
+ }
+ */
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java
new file mode 100644
index 0000000..a4eb519
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java
@@ -0,0 +1,681 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.text.NumberFormat;
+import java.util.List;
+
+import java.awt.*;
+import java.awt.event.ComponentEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import java.awt.geom.Area;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.testbuilder.model.*;
+import org.locationtech.jtstest.testbuilder.ui.*;
+import org.locationtech.jtstest.testbuilder.ui.render.*;
+import org.locationtech.jtstest.testbuilder.ui.style.AWTUtil;
+import org.locationtech.jtstest.testbuilder.ui.tools.*;
+
+
+/**
+ * Panel which displays rendered geometries.
+ *
+ * Zoom methods take arguments in model space.
+ *
+ * @version 1.7
+ */
+public class GeometryEditPanel extends JPanel
+{
+ /*
+ private static Color[] selectedPointColor = { new Color(0, 64, 128, 255),
+ new Color(170, 64, 0, 255) };
+*/
+
+ private TestBuilderModel tbModel;
+
+ private DrawingGrid grid = new DrawingGrid();
+ private GridRenderer gridRenderer;
+
+ boolean stateAddingPoints = false;
+
+ Coordinate markPoint;
+ Point2D lastPt = new Point2D.Double();
+
+ private Tool currentTool = null; //PolygonTool.getInstance();
+
+ private Viewport viewport = new Viewport(this);
+
+ private RenderManager renderMgr;
+ //private OperationMonitorManager opMonitor;
+
+ //----------------------------------------
+ BorderLayout borderLayout1 = new BorderLayout();
+
+ GeometryPopupMenu menu = new GeometryPopupMenu();
+
+ public GeometryEditPanel() {
+ gridRenderer = new GridRenderer(viewport, grid);
+ try {
+ initUI();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ renderMgr = new RenderManager(this);
+ //opMonitor = new OperationMonitorManager(this, viewport);
+ }
+
+ void initUI() throws Exception {
+ this.addComponentListener(new java.awt.event.ComponentAdapter() {
+
+ public void componentResized(ComponentEvent e) {
+ this_componentResized(e);
+ }
+ });
+ this.setBackground(Color.white);
+ this.setBorder(BorderFactory.createLoweredBevelBorder());
+ this.setLayout(borderLayout1);
+
+ setToolTipText("");
+ setBorder(BorderFactory.createEmptyBorder());
+
+ // deactivate for now, since it interferes with right-click zoom-out
+ //addMouseListener(new PopupClickListener());
+ }
+
+ class PopupClickListener extends MouseAdapter
+ {
+ public void mousePressed(MouseEvent e)
+ {
+ if (e.isPopupTrigger())
+ doPopUp(e);
+ }
+ public void mouseReleased(MouseEvent e)
+ {
+ if (e.isPopupTrigger())
+ doPopUp(e);
+ }
+ private void doPopUp(MouseEvent e)
+ {
+ menu.show(e.getComponent(), e.getX(), e.getY());
+ }
+ }
+
+
+ public void setModel(TestBuilderModel model) {
+ this.tbModel = model;
+ }
+
+ public TestBuilderModel getModel() {
+ return tbModel;
+ }
+ public GeometryEditModel getGeomModel()
+ {
+ return tbModel.getGeometryEditModel();
+ }
+
+ public void setGridEnabled(boolean isEnabled) {
+ gridRenderer.setEnabled(isEnabled);
+ }
+
+ public Viewport getViewport() { return viewport; }
+
+ public void updateView()
+ {
+// fireGeometryChanged(new GeometryEvent(this));
+ forceRepaint();
+ }
+
+ public void forceRepaint() {
+ renderMgr.setDirty(true);
+
+ Component source = SwingUtilities.windowForComponent(this);
+ if (source == null)
+ source = this;
+ source.repaint();
+ }
+
+ private LayerList getLayerList()
+ {
+ return tbModel.getLayers();
+ }
+
+ public void setShowingInput(boolean isEnabled)
+ {
+ if (tbModel == null) return;
+ getLayerList().getLayer(LayerList.LYR_A).setEnabled(isEnabled);
+ getLayerList().getLayer(LayerList.LYR_B).setEnabled(isEnabled);
+ forceRepaint();
+ }
+
+ public void setShowingGeometryA(boolean isEnabled) {
+ if (tbModel == null) return;
+ getLayerList().getLayer(LayerList.LYR_A).setEnabled(isEnabled);
+ forceRepaint();
+ }
+
+ public void setShowingGeometryB(boolean isEnabled) {
+ if (tbModel == null) return;
+ getLayerList().getLayer(LayerList.LYR_B).setEnabled(isEnabled);
+ forceRepaint();
+ }
+
+ public void setShowingResult(boolean isEnabled)
+ {
+ if (tbModel == null) return;
+ getLayerList().getLayer(LayerList.LYR_RESULT).setEnabled(isEnabled);
+ forceRepaint();
+ }
+
+ public void setGridSize(double gridSize) {
+ grid.setGridSize(gridSize);
+ forceRepaint();
+ }
+
+ public void setHighlightPoint(Coordinate pt) {
+ markPoint = pt;
+ }
+
+ public boolean isAddingPoints() {
+ return stateAddingPoints;
+ }
+
+ public void updateGeom()
+ {
+ renderMgr.setDirty(true);
+ getGeomModel().geomChanged();
+ }
+
+ public String getToolTipText(MouseEvent event) {
+// if (event.getPoint().x < 100) return null;
+ Coordinate pt = viewport.toModelCoordinate(event.getPoint());
+ double toleranceInModel = AppConstants.TOLERANCE_PIXELS / getViewport().getScale();
+ // avoid wierd scale issues
+ if (toleranceInModel <= 0.0) return null;
+ return GeometryLocationsWriter.writeLocation(getLayerList(), pt, toleranceInModel);
+// return viewport.toModel(event.getPoint()).toString();
+// return null;
+ }
+
+ public double getToleranceInModel()
+ {
+ return AppConstants.TOLERANCE_PIXELS / getViewport().getScale();
+ }
+
+ public String getInfo(Coordinate pt)
+ {
+ double toleranceInModel = AppConstants.TOLERANCE_PIXELS / getViewport().getScale();
+ GeometryLocationsWriter writer = new GeometryLocationsWriter();
+ writer.setHtml(false);
+ return writer.writeLocationString(getLayerList(), pt, toleranceInModel);
+ }
+
+ public double getGridSize() {
+ return grid.getGridSize();
+ }
+
+ public void paintComponent(Graphics g) {
+ super.paintComponent(g);
+ renderMgr.render();
+ renderMgr.copyImage(g);
+ }
+
+ /*
+ // MD - obsolete
+ public void render(Graphics g)
+ {
+ Graphics2D g2 = (Graphics2D) g;
+ g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
+ gridRenderer.paint(g2);
+ getLayerList().paint((Graphics2D) g2, viewport);
+ }
+ */
+
+ private static int VERTEX_SIZE = AppConstants.VERTEX_SIZE + 1;
+ private static double VERTEX_SIZE_OVER_2 = VERTEX_SIZE / 2;
+
+ private static int INNER_SIZE = VERTEX_SIZE - 2;
+ private static double INNER_SIZE_OVER_2 = INNER_SIZE / 2;
+
+ private void drawHighlightedVertices(Graphics2D g, List coords, Color clr) {
+ Rectangle2D rect = new Rectangle2D.Double();
+ for (int i = 0; i < coords.size(); i++) {
+ Coordinate pt = (Coordinate) coords.get(i);
+ Point2D p = viewport.toView(pt);
+ rect.setFrame(
+ p.getX() - VERTEX_SIZE_OVER_2,
+ p.getY() - VERTEX_SIZE_OVER_2,
+ VERTEX_SIZE,
+ VERTEX_SIZE);
+ g.setColor(clr);
+ g.fill(rect);
+ Rectangle2D rectInner = new Rectangle2D.Double(
+ p.getX() - INNER_SIZE_OVER_2,
+ p.getY() - INNER_SIZE_OVER_2,
+ INNER_SIZE,
+ INNER_SIZE);
+ g.setColor(AppConstants.VERTEX_HIGHLIGHT_CLR);
+ g.fill(rectInner);
+
+ }
+ }
+
+ private void drawHighlightedVertex(Graphics2D g, Coordinate pt, Color clr) {
+ Rectangle2D rect = new Rectangle2D.Double();
+ Point2D p = viewport.toView(pt);
+ rect.setFrame(
+ p.getX() - VERTEX_SIZE_OVER_2,
+ p.getY() - VERTEX_SIZE_OVER_2,
+ VERTEX_SIZE,
+ VERTEX_SIZE);
+ g.setColor(clr);
+ g.fill(rect);
+ Rectangle2D rectInner = new Rectangle2D.Double(
+ p.getX() - INNER_SIZE_OVER_2,
+ p.getY() - INNER_SIZE_OVER_2,
+ INNER_SIZE,
+ INNER_SIZE);
+ g.setColor(AppConstants.VERTEX_HIGHLIGHT_CLR);
+ g.fill(rectInner);
+ }
+
+ private static double VERTEX_SHADOW_SIZE_OVER_2 = AppConstants.VERTEX_SHADOW_SIZE / 2;
+
+ private void drawVertexShadow(Graphics2D g, Coordinate pt, Color clr) {
+ Ellipse2D rect = new Ellipse2D.Double();
+ Point2D p = viewport.toView(pt);
+ rect.setFrame(
+ p.getX() - VERTEX_SHADOW_SIZE_OVER_2,
+ p.getY() - VERTEX_SHADOW_SIZE_OVER_2,
+ AppConstants.VERTEX_SHADOW_SIZE,
+ AppConstants.VERTEX_SHADOW_SIZE);
+ g.setColor(clr);
+ g.fill(rect);
+ }
+
+ private void drawMark(Graphics2D g) {
+ if (markPoint == null)
+ return;
+
+ String markLabel = markPoint.x + ", " + markPoint.y;
+ int strWidth = g.getFontMetrics().stringWidth(markLabel);
+
+ double markSize = AppConstants.HIGHLIGHT_SIZE;
+ Point2D highlightPointView = viewport.toView(markPoint);
+ double markX = highlightPointView.getX();
+ double markY = highlightPointView.getY();
+ Ellipse2D.Double shape = new Ellipse2D.Double(
+ markX - markSize / 2,
+ markY - markSize / 2,
+ markSize, markSize);
+ AWTUtil.setStroke(g, 4);
+ g.setColor(AppConstants.HIGHLIGHT_CLR);
+ g.draw(shape);
+
+ // draw label box
+ Envelope viewEnv = viewport.getViewEnv();
+
+ int bottomOffset = 10;
+ int boxHgt = 20;
+ int boxPadX = 20;
+ int boxWidth = strWidth + 2 * boxPadX;
+ int arrowWidth = 10;
+ int arrowOffset = 2;
+ int labelOffsetY = 5;
+
+ int bottom = (int) viewEnv.getMaxY() - bottomOffset;
+ int centreX = (int) (viewEnv.getMinX() + viewEnv.getMaxX()) / 2;
+
+ int boxMinX = centreX - boxWidth/2;
+ int boxMaxX = centreX + boxWidth/2;
+ int boxMinY = bottom - boxHgt;
+ int boxMaxY = bottom;
+
+ int[] xpts = new int[] {
+ boxMinX, centreX - arrowWidth/2, (int) markX, centreX + arrowWidth/2,
+ boxMaxX, boxMaxX, boxMinX };
+ int[] ypts = new int[] {
+ boxMinY, boxMinY, (int) (markY + arrowOffset), boxMinY,
+ boxMinY, boxMaxY, boxMaxY };
+
+ Polygon poly = new Polygon(xpts, ypts, xpts.length);
+
+ g.setColor(AppConstants.HIGHLIGHT_FILL_CLR);
+ g.fill(poly);
+ AWTUtil.setStroke(g, 1);
+ g.setColor(ColorUtil.opaque(AppConstants.HIGHLIGHT_CLR));
+ g.draw(poly);
+
+ // draw mark point label
+ g.setColor(Color.BLACK);
+ g.drawString(markLabel, centreX - strWidth/2, boxMaxY - labelOffsetY);
+
+ }
+
+ /**
+ * Draws a mask surround to indicate that geometry is being visually altered
+ * @param g
+ */
+ private void drawMagnifyMask(Graphics2D g) {
+ double viewWidth = viewport.getWidthInView();
+ double viewHeight = viewport.getHeightInView();
+
+ float minExtent = (float) Math.min(viewWidth, viewHeight);
+ float maskWidth = (float) (minExtent * AppConstants.MASK_WIDTH_FRAC / 2);
+
+ Area mask = new Area(new Rectangle2D.Float(
+ (float) 0, (float) 0,
+ (float) viewWidth, (float) viewHeight));
+
+ Area maskHole = new Area(new Rectangle2D.Float(
+ (float) maskWidth,
+ (float) maskWidth,
+ ((float) viewWidth) - 2 * maskWidth,
+ ((float) viewHeight) - 2 * maskWidth));
+
+ mask.subtract(maskHole);
+ g.setColor(AppConstants.MASK_CLR);
+ g.fill(mask);
+ }
+
+ public void flash(Geometry g)
+ {
+ Graphics2D gr = (Graphics2D) getGraphics();
+ gr.setXORMode(Color.white);
+ Stroke stroke = new BasicStroke(5);
+
+ Geometry flashGeom = g;
+ if (g instanceof org.locationtech.jts.geom.Point)
+ flashGeom = flashPointGeom(g);
+
+ try {
+ GeometryPainter.paint(flashGeom, viewport, gr, Color.RED, null, stroke);
+ Thread.sleep(200);
+ GeometryPainter.paint(flashGeom, viewport, gr, Color.RED, null, stroke);
+ }
+ catch (Exception ex) {
+ // nothing we can do
+ }
+ gr.setPaintMode();
+ }
+
+ private Geometry flashPointGeom(Geometry g)
+ {
+ double ptRadius = viewport.toModel(4);
+ return g.buffer(ptRadius);
+ }
+
+
+ public Point2D snapToGrid(Point2D modelPoint) {
+ return grid.snapToGrid(modelPoint);
+ }
+
+ void this_componentResized(ComponentEvent e) {
+ renderMgr.componentResized();
+ viewport.update(this.getSize());
+ }
+
+ /**
+ *
+ * @param newTool tool to set, or null to clear tool
+ */
+ public void setCurrentTool(Tool newTool) {
+ if (currentTool != null) currentTool.deactivate();
+ currentTool = newTool;
+ if (currentTool != null) currentTool.activate(this);
+ }
+
+ public void zoomToGeometry(int i) {
+ Geometry g = getGeomModel().getGeometry(i);
+ if (g == null) return;
+ zoom(g.getEnvelopeInternal());
+ }
+
+ public void zoomToInput() {
+ zoom(getGeomModel().getEnvelope());
+ }
+
+ public void zoomToResult() {
+ zoom(getGeomModel().getEnvelopeResult());
+ }
+
+ public void zoomToFullExtent() {
+ zoom(getGeomModel().getEnvelopeAll());
+ }
+
+ public void zoom(Geometry geom)
+ {
+ if (geom == null) return;
+ zoom(geom.getEnvelopeInternal());
+ }
+
+ public void zoom(Point2D zoomBox1, Point2D zoomBox2)
+ {
+ Envelope zoomEnv = new Envelope();
+ zoomEnv.expandToInclude(zoomBox1.getX(), zoomBox1.getY());
+ zoomEnv.expandToInclude(zoomBox2.getX(), zoomBox2.getY());
+ zoom(zoomEnv);
+ }
+
+ public void zoom(Envelope zoomEnv) {
+ if (zoomEnv == null)
+ return;
+
+ if (zoomEnv.isNull()) {
+ viewport.zoomToInitialExtent();
+ return;
+ }
+ double averageExtent = (zoomEnv.getWidth() + zoomEnv.getHeight()) / 2d;
+ // fix to allow zooming to points
+ if (averageExtent == 0.0)
+ averageExtent = 1.0;
+ double buffer = averageExtent * 0.1;
+ zoomEnv.expandBy(buffer);
+ viewport.zoom(zoomEnv);
+ }
+
+ /**
+ * Zoom to a point, ensuring that the zoom point remains in the same screen location.
+ *
+ * @param zoomPt
+ * @param zoomFactor
+ */
+ public void zoom(Point2D zoomPt, double zoomFactor) {
+ double zoomScale = getViewport().getScale() * zoomFactor;
+ viewport.zoom(zoomPt, zoomScale);
+ }
+
+ public void zoomPan(double dx, double dy) {
+ getViewport().zoomPan(dx, dy);
+ }
+
+ public String cursorLocationString(Point2D pView)
+ {
+ Point2D p = getViewport().toModel(pView);
+ NumberFormat format = getViewport().getScaleFormat();
+ return format.format(p.getX())
+ + ", "
+ + format.format(p.getY());
+ }
+
+ public Renderer getRenderer()
+ {
+ return new GeometryEditPanelRenderer();
+ }
+
+ class GeometryEditPanelRenderer implements Renderer
+ {
+ private GeometryStretcherView stretchView = null;
+ private Renderer currentRenderer = null;
+ private boolean isMagnifyingTopology = false;
+ private boolean isRenderingStretchVertices = false;
+
+ public GeometryEditPanelRenderer()
+ {
+ if (DisplayParameters.isMagnifyingTopology()) {
+ stretchView = new GeometryStretcherView(getGeomModel());
+ stretchView.setStretchSize(viewport.toModel(DisplayParameters.getTopologyStretchSize()));
+ stretchView.setNearnessTolerance(viewport.toModel(GeometryStretcherView.NEARNESS_TOL_IN_VIEW));
+ stretchView.setEnvelope(viewport.getModelEnv());
+ isMagnifyingTopology = DisplayParameters.isMagnifyingTopology();
+ isRenderingStretchVertices = stretchView.isViewPerformant();
+ }
+ }
+
+ public void render(Graphics2D g)
+ {
+ Graphics2D g2 = g;
+ g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
+ if (isMagnifyingTopology) {
+ if (isRenderingStretchVertices) {
+ //renderMagnifiedVertexShadows(g2);
+ renderMagnifiedVertexMask(g2);
+ }
+ else {
+ // render indicator that shows stretched view is non-performant
+ renderMagnifyWarning(g2);
+ }
+ }
+
+ gridRenderer.paint(g2);
+
+ renderLayers(g2);
+
+ if (isMagnifyingTopology && isRenderingStretchVertices) {
+ renderMagnifiedVertices(g2);
+ }
+
+ drawMark(g2);
+
+ }
+
+ public void renderLayers(Graphics2D g)
+ {
+ LayerList layerList = getLayerList();
+ int n = layerList.size();
+ for (int i = 0; i < n; i++) {
+ if (isMagnifyingTopology && isRenderingStretchVertices
+ && stretchView != null && i < 2) {
+ //System.out.println("rendering stretch verts");
+ currentRenderer = new LayerRenderer(layerList.getLayer(i),
+ new StaticGeometryContainer(stretchView.getStretchedGeometry(i)),
+ viewport);
+ }
+ else {
+ currentRenderer = new LayerRenderer(layerList.getLayer(i), viewport);
+ }
+ currentRenderer.render(g);
+ }
+ currentRenderer = null;
+ }
+
+ public void renderMagnifiedVertices(Graphics2D g)
+ {
+ LayerList layerList = getLayerList();
+ for (int i = 0; i < 2; i++) {
+ // respect layer visibility
+ if (! layerList.getLayer(i).isEnabled()) continue;
+
+ List stretchedVerts = stretchView.getStretchedVertices(i);
+ if (stretchedVerts == null) continue;
+ for (int j = 0; j < stretchedVerts.size(); j++) {
+ Coordinate p = (Coordinate) stretchedVerts.get(j);
+ drawHighlightedVertex(g, p,
+ i == 0 ? GeometryDepiction.GEOM_A_HIGHLIGHT_CLR :
+ GeometryDepiction.GEOM_B_HIGHLIGHT_CLR);
+ }
+ }
+ }
+
+ public void renderMagnifiedVertexShadows(Graphics2D g)
+ {
+ if (stretchView == null) return;
+ for (int i = 0; i < 2; i++) {
+ List stretchedVerts = stretchView.getStretchedVertices(i);
+ if (stretchedVerts == null) continue;
+ for (int j = 0; j < stretchedVerts.size(); j++) {
+ Coordinate p = (Coordinate) stretchedVerts.get(j);
+ drawVertexShadow(g, p, AppConstants.VERTEX_SHADOW_CLR);
+ }
+ }
+ }
+
+ public void renderMagnifiedVertexMask(Graphics2D g)
+ {
+ if (stretchView == null) return;
+
+ // render lowlight background
+ Rectangle2D rect = new Rectangle2D.Float();
+ rect.setFrame(
+ 0,
+ 0,
+ viewport.getWidthInView(),
+ viewport.getHeightInView());
+ g.setColor(AppConstants.MASK_CLR);
+ g.fill(rect);
+
+ // highlight mag vertices
+ for (int i = 0; i < 2; i++) {
+ List stretchedVerts = stretchView.getStretchedVertices(i);
+ if (stretchedVerts == null) continue;
+ for (int j = 0; j < stretchedVerts.size(); j++) {
+ Coordinate p = (Coordinate) stretchedVerts.get(j);
+ drawVertexShadow(g, p, Color.WHITE);
+ }
+ }
+ }
+
+ public void renderMagnifyWarning(Graphics2D g)
+ {
+ if (stretchView == null) return;
+
+ float maxx = (float) viewport.getWidthInView();
+ float maxy = (float) viewport.getHeightInView();
+ GeneralPath path = new GeneralPath();
+ path.moveTo(0, 0);
+ path.lineTo(maxx, maxy);
+ path.moveTo(0, maxy);
+ path.lineTo(maxx, 0);
+ // render lowlight background
+ g.setColor(AppConstants.MASK_CLR);
+ g.setStroke(new BasicStroke(30));
+ g.draw(path);
+
+ }
+
+ public synchronized void cancel()
+ {
+ if (currentRenderer != null)
+ currentRenderer.cancel();
+ }
+
+ }
+}
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java
new file mode 100644
index 0000000..1a2f2dc
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.event.*;
+import java.util.*;
+
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.border.*;
+
+import org.locationtech.jtstest.function.*;
+import org.locationtech.jtstest.geomfunction.GeometryFunction;
+import org.locationtech.jtstest.util.*;
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryFunctionListPanel extends JPanel {
+ BorderLayout borderLayout1 = new BorderLayout();
+
+ private DefaultListModel listModel = new DefaultListModel();
+
+ JScrollPane jScrollPane1 = new JScrollPane();
+
+ JList list = new JList(listModel){
+ public String getToolTipText(MouseEvent e) {
+ int index = locationToIndex(e.getPoint());
+ if (-1 < index) {
+ GeometryFunction func = (GeometryFunction) getModel().getElementAt(index);
+ return func.getSignature();
+ } else {
+ return null;
+ }
+ }
+ };
+
+ BorderLayout borderLayout2 = new BorderLayout();
+ Border border1;
+
+ private class GeometryFunctionCellRenderer extends JLabel implements
+ ListCellRenderer
+ {
+ Border spaceBorder = BorderFactory.createEmptyBorder(0, 4, 1, 0);
+
+ private final ImageIcon binaryIcon = new ImageIcon(this.getClass()
+ .getResource("BinaryGeomFunction.png"));
+
+ private final ImageIcon unaryIcon = new ImageIcon(this.getClass()
+ .getResource("UnaryGeomFunction.png"));
+
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ GeometryFunction func = (GeometryFunction) value;
+ String name = StringUtil.capitalize(func.getName());
+ setBorder(spaceBorder);
+ setText(name);
+ setOpaque(true);
+ setIcon(func.isBinary() ? binaryIcon : unaryIcon);
+ if (isSelected) {
+ setBackground(list.getSelectionBackground());
+ setForeground(list.getSelectionForeground());
+ } else {
+ setBackground(list.getBackground());
+ setForeground(list.getForeground());
+ }
+ setEnabled(list.isEnabled());
+ setFont(list.getFont());
+ return this;
+ }
+
+ /*
+ public String getToolTipText(MouseEvent e)
+ {
+ return getText();
+ }
+ */
+ }
+
+ public GeometryFunctionListPanel() {
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ list.setCellRenderer(new GeometryFunctionCellRenderer());
+ }
+
+ private void jbInit() throws Exception {
+ setSize(200, 250);
+ border1 = BorderFactory.createEmptyBorder(4, 4, 4, 4);
+ setLayout(borderLayout2);
+ setBorder(border1);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ add(jScrollPane1, BorderLayout.CENTER);
+ jScrollPane1.getViewport().add(list, null);
+ }
+
+ /*
+ private void registerListSelectionListener() {
+ list.getSelectionModel().addListSelectionListener(
+ new ListSelectionListener() {
+
+ public void valueChanged(ListSelectionEvent e) {
+ if (list.getSelectedValue() == null)
+ return;
+ }
+ });
+ }
+*/
+
+ public void registerListSelectionListener(ListSelectionListener listener) {
+ list.getSelectionModel().addListSelectionListener(listener);
+ }
+
+ public void registerMouseListener(MouseListener listener) {
+ list.addMouseListener(listener);
+ }
+
+ public GeometryFunction getFunction() {
+ if (list.getSelectedValue() == null)
+ return null;
+ return (GeometryFunction) list.getSelectedValue();
+ }
+
+ public void populate(List funcs) {
+// listModel.clear();
+ for (Iterator i = funcs.iterator(); i.hasNext(); ) {
+ GeometryFunction func = (GeometryFunction) i.next();
+ listModel.addElement(func);
+ }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java
new file mode 100644
index 0000000..6ac5f69
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.event.*;
+import java.util.*;
+
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.border.*;
+import javax.swing.tree.*;
+
+import org.locationtech.jtstest.function.*;
+import org.locationtech.jtstest.geomfunction.GeometryFunction;
+import org.locationtech.jtstest.geomfunction.GeometryFunctionUtil;
+import org.locationtech.jtstest.testbuilder.event.GeometryFunctionEvent;
+import org.locationtech.jtstest.testbuilder.event.GeometryFunctionListener;
+import org.locationtech.jtstest.util.*;
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryFunctionTreePanel extends JPanel {
+
+ JScrollPane jScrollPane = new JScrollPane();
+
+ JTree tree = new JTree();
+
+ BorderLayout borderLayout = new BorderLayout();
+
+ Border border1;
+
+ private static GeometryFunction getFunctionFromNode(Object value) {
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
+ if (node == null)
+ return null;
+ Object nodeValue = node.getUserObject();
+ if (nodeValue instanceof GeometryFunction)
+ return (GeometryFunction) nodeValue;
+ return null;
+ }
+
+ private class GeometryFunctionRenderer extends DefaultTreeCellRenderer {
+ private final ImageIcon binaryIcon = new ImageIcon(this.getClass()
+ .getResource("BinaryGeomFunction.png"));
+
+ private final ImageIcon unaryIcon = new ImageIcon(this.getClass()
+ .getResource("UnaryGeomFunction.png"));
+
+ public GeometryFunctionRenderer() {
+ }
+
+ public Component getTreeCellRendererComponent(JTree tree, Object value,
+ boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
+
+ super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row,
+ hasFocus);
+ if (leaf) {
+ GeometryFunction func = getFunctionFromNode(value);
+ setIcon(func.isBinary() ? binaryIcon : unaryIcon);
+ //String name = StringUtil.capitalize(func.getName());
+ String name = func.getName();
+ setText(name);
+ setToolTipText(GeometryFunctionUtil.toolTipText(func));
+ } else {
+ setToolTipText(null); // no tool tip
+ }
+ return this;
+ }
+
+ }
+
+ public GeometryFunctionTreePanel() {
+ try {
+ jbInit();
+ javax.swing.ToolTipManager.sharedInstance().registerComponent(tree);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ private void jbInit() throws Exception {
+ setSize(200, 250);
+ border1 = BorderFactory.createEmptyBorder(4, 4, 4, 4);
+ setLayout(borderLayout);
+ setBorder(border1);
+ add(jScrollPane, BorderLayout.CENTER);
+ jScrollPane.getViewport().add(tree, null);
+
+ tree.setRootVisible(false);
+ tree.setShowsRootHandles(true);
+ tree.setCellRenderer(new GeometryFunctionRenderer());
+ tree.getSelectionModel().setSelectionMode(
+ TreeSelectionModel.SINGLE_TREE_SELECTION);
+
+ tree.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount() == 2) {
+ GeometryFunction fun = getFunction();
+ if (fun != null)
+ fireFunctionInvoked(new GeometryFunctionEvent(fun));
+ }
+
+ }
+ });
+ tree.addTreeSelectionListener(new TreeSelectionListener() {
+ public void valueChanged(TreeSelectionEvent e) {
+ GeometryFunction fun = getFunction();
+ if (fun != null)
+ fireFunctionSelected(new GeometryFunctionEvent(fun));
+ }
+ });
+ }
+
+ public GeometryFunction getFunction() {
+ return getFunctionFromNode(tree.getLastSelectedPathComponent());
+ }
+
+ public void populate(DoubleKeyMap funcs) {
+ tree.setModel(createModel(funcs));
+ }
+
+ private TreeModel createModel(DoubleKeyMap funcMap) {
+ DefaultMutableTreeNode top = new DefaultMutableTreeNode();
+
+ Collection categories = funcMap.keySet();
+ for (Iterator i = categories.iterator(); i.hasNext();) {
+ String category = (String) i.next();
+ DefaultMutableTreeNode catNode = new DefaultMutableTreeNode(category);
+ top.add(catNode);
+
+ Collection funcs = funcMap.values(category);
+ for (Iterator j = funcs.iterator(); j.hasNext();) {
+ Object func = j.next();
+ catNode.add(new DefaultMutableTreeNode(func));
+ }
+ }
+ return new DefaultTreeModel(top);
+ }
+
+ private transient Vector eventListeners;
+
+ public synchronized void removeGeometryFunctionListener(
+ GeometryFunctionListener l) {
+ if (eventListeners != null && eventListeners.contains(l)) {
+ Vector v = (Vector) eventListeners.clone();
+ v.removeElement(l);
+ eventListeners = v;
+ }
+ }
+
+ public synchronized void addGeometryFunctionListener(
+ GeometryFunctionListener l) {
+ Vector v = eventListeners == null ? new Vector(2) : (Vector) eventListeners
+ .clone();
+ if (!v.contains(l)) {
+ v.addElement(l);
+ eventListeners = v;
+ }
+ }
+
+ protected void fireFunctionSelected(GeometryFunctionEvent e) {
+ if (eventListeners != null) {
+ Vector listeners = eventListeners;
+ int count = listeners.size();
+ for (int i = 0; i < count; i++) {
+ ((GeometryFunctionListener) listeners.elementAt(i)).functionSelected(e);
+ }
+ }
+ }
+
+ protected void fireFunctionInvoked(GeometryFunctionEvent e) {
+ if (eventListeners != null) {
+ Vector listeners = eventListeners;
+ int count = listeners.size();
+ for (int i = 0; i < count; i++) {
+ ((GeometryFunctionListener) listeners.elementAt(i)).functionInvoked(e);
+ }
+ }
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryInputDialog.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryInputDialog.java
new file mode 100644
index 0000000..60450a9
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryInputDialog.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.border.Border;
+import javax.swing.text.JTextComponent;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.WKTReader;
+
+
+/**
+ * Title:
+ * Description:
+ * Copyright: Copyright (c) 2001
+ * Company:
+ * @author
+ * @version 1.7
+ */
+public class GeometryInputDialog extends JDialog {
+ Geometry[] geom = new Geometry[2];
+ boolean parseError;
+ //=================================================
+ JPanel panel1 = new JPanel();
+ JLabel jLabel1 = new JLabel();
+ JPanel jPanel1 = new JPanel();
+ GridBagLayout gridBagLayout2 = new GridBagLayout();
+ BorderLayout borderLayout1 = new BorderLayout();
+ JPanel jPanel2 = new JPanel();
+ JButton btnLoad = new JButton();
+ JButton btnCancel = new JButton();
+ JLabel jLabel2 = new JLabel();
+ JLabel lblError = new JLabel();
+ JTextArea txtError = new JTextArea();
+ Border border1;
+ JScrollPane jScrollPane1 = new JScrollPane();
+ JTextArea txtA = new JTextArea();
+ JScrollPane jScrollPane2 = new JScrollPane();
+ JTextArea txtB = new JTextArea();
+
+ public GeometryInputDialog(Frame frame, String title, boolean modal) {
+ super(frame, title, modal);
+ try {
+ jbInit();
+ pack();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ public GeometryInputDialog() {
+ this(null, "", false);
+ }
+
+ void jbInit() throws Exception {
+ border1 = BorderFactory.createLineBorder(Color.gray, 2);
+ panel1.setLayout(borderLayout1);
+ jLabel1.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel1.setForeground(Color.blue);
+ jLabel1.setToolTipText("");
+ jLabel1.setText("A");
+ jPanel1.setLayout(gridBagLayout2);
+ btnLoad.setToolTipText("");
+ btnLoad.setText("Load");
+ btnLoad.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ btnLoad_actionPerformed(e);
+ }
+ });
+ btnCancel.setText("Cancel");
+ btnCancel.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ btnCancel_actionPerformed(e);
+ }
+ });
+ jLabel2.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel2.setForeground(Color.red);
+ jLabel2.setText("B");
+ lblError.setToolTipText("");
+ txtError.setLineWrap(true);
+ txtError.setBorder(BorderFactory.createEtchedBorder());
+ txtError.setToolTipText("");
+ txtError.setBackground(Color.lightGray);
+ panel1.setPreferredSize(new java.awt.Dimension(300, 300));
+ txtA.setLineWrap(true);
+ txtB.setLineWrap(true);
+ jScrollPane1.setBorder(BorderFactory.createLoweredBevelBorder());
+ jScrollPane2.setBorder(BorderFactory.createLoweredBevelBorder());
+ getContentPane().add(panel1);
+ panel1.add(jPanel1, BorderLayout.CENTER);
+ jPanel1.add(
+ jLabel1,
+ new GridBagConstraints(
+ 0,
+ 0,
+ 1,
+ 1,
+ 0.1,
+ 0.0,
+ GridBagConstraints.WEST,
+ GridBagConstraints.NONE,
+ new Insets(0, 5, 0, 5),
+ 0,
+ 0));
+ jPanel1.add(
+ jLabel2,
+ new GridBagConstraints(
+ 0,
+ 1,
+ 1,
+ 1,
+ 0.0,
+ 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 5, 0, 5),
+ 0,
+ 0));
+ jPanel1.add(
+ lblError,
+ new GridBagConstraints(
+ 1,
+ 2,
+ 1,
+ 1,
+ 0.0,
+ 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0),
+ 0,
+ 0));
+ jPanel1.add(
+ txtError,
+ new GridBagConstraints(
+ 1,
+ 3,
+ 1,
+ 1,
+ 0.0,
+ 0.2,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0),
+ 0,
+ 0));
+ jPanel1.add(
+ jScrollPane1,
+ new GridBagConstraints(
+ 1,
+ 0,
+ 1,
+ 1,
+ 1.0,
+ 0.3,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0),
+ 0,
+ 0));
+ jPanel1.add(
+ jScrollPane2,
+ new GridBagConstraints(
+ 1,
+ 1,
+ 1,
+ 1,
+ 1.0,
+ 0.3,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0),
+ 0,
+ 0));
+ jScrollPane2.getViewport().add(txtB, null);
+ jScrollPane1.getViewport().add(txtA, null);
+ panel1.add(jPanel2, BorderLayout.SOUTH);
+ jPanel2.add(btnLoad, null);
+ jPanel2.add(btnCancel, null);
+ }
+
+ void btnCancel_actionPerformed(ActionEvent e) {
+ setVisible(false);
+ }
+
+ void btnLoad_actionPerformed(ActionEvent e) {
+ parseError = false;
+ geom[0] = parseGeometry(txtA, Color.blue);
+ if (!parseError)
+ geom[1] = parseGeometry(txtB, Color.red);
+ if (!parseError)
+ setVisible(false);
+ }
+
+ Geometry parseGeometry(JTextComponent txt, Color clr) {
+ try {
+ WKTReader rdr =
+ new WKTReader(
+ new GeometryFactory(JTSTestBuilder.model().getPrecisionModel(), 0));
+ Geometry g = rdr.read(txt.getText());
+ txtError.setText("");
+ return g;
+ } catch (Exception ex) {
+ txtError.setText(ex.getMessage());
+ txtError.setForeground(clr);
+ parseError = true;
+ // TODO: display this exception
+ }
+ return null;
+ }
+
+ Geometry getGeometry(int index) {
+ return geom[index];
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryInspectorDialog.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryInspectorDialog.java
new file mode 100644
index 0000000..0f776ab
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryInspectorDialog.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.Frame;
+
+import javax.swing.JDialog;
+
+import org.locationtech.jts.geom.Geometry;
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryInspectorDialog extends JDialog
+{
+
+ InspectorPanel inspectPanel;
+
+ public GeometryInspectorDialog(Frame frame, String title, boolean modal)
+ {
+ super(frame, title, modal);
+ try {
+ initUI();
+ pack();
+ setSize(500, 500);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ public GeometryInspectorDialog()
+ {
+ this(null, "", false);
+ }
+
+ public GeometryInspectorDialog(Frame frame)
+ {
+ this(null, "Geometry Inspector", false);
+ }
+
+ void initUI() throws Exception
+ {
+ inspectPanel = new InspectorPanel(false);
+ getContentPane().add(inspectPanel);
+ }
+
+ public void setGeometry(String tag, Geometry geometry) {
+ inspectPanel.setGeometry(tag, geometry, 0);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryPopupMenu.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryPopupMenu.java
new file mode 100644
index 0000000..8805fb3
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryPopupMenu.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+
+
+public class GeometryPopupMenu extends JPopupMenu
+{
+ Coordinate clickCoord;
+
+ public GeometryPopupMenu(){
+ initUI();
+ }
+
+ private void initUI()
+ {
+ JMenuItem extractComponentItem = new JMenuItem("Extract Component");
+ extractComponentItem.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.extractComponentsToTestCase(clickCoord);
+ }
+ });
+ add(extractComponentItem);
+
+ JMenuItem copyComponentItem = new JMenuItem("Copy Component");
+ copyComponentItem.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.copyComponentToClipboard(clickCoord);
+ }
+ });
+ add(copyComponentItem);
+
+ JMenuItem infoItem = new JMenuItem("Info");
+ infoItem.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderFrame.instance().displayInfo(clickCoord);
+ }
+ });
+ add(infoItem);
+
+ }
+
+ /**
+ * Record model coordinate of click point for use in menu operations
+ */
+ public void show(Component invoker, int x, int y)
+ {
+ GeometryEditPanel editPanel = (GeometryEditPanel) invoker;
+ clickCoord = editPanel.getViewport().toModelCoordinate(new java.awt.Point(x, y));
+ super.show(invoker, x, y);
+ }
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreeModel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreeModel.java
new file mode 100644
index 0000000..5923f67
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreeModel.java
@@ -0,0 +1,541 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
+import javax.swing.ImageIcon;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+
+import org.locationtech.jts.algorithm.Area;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+
+public class GeometryTreeModel implements TreeModel
+{
+ private Vector<TreeModelListener> treeModelListeners = new Vector<TreeModelListener>();
+
+ private GeometricObjectNode rootGeom;
+
+ public GeometryTreeModel(Geometry geom, int source)
+ {
+ rootGeom = GeometryNode.create(geom, new GeometryContext(source));
+ }
+
+ // ////////////// TreeModel interface implementation ///////////////////////
+
+ /**
+ * Adds a listener for the TreeModelEvent posted after the tree changes.
+ */
+ public void addTreeModelListener(TreeModelListener l)
+ {
+ treeModelListeners.addElement(l);
+ }
+
+ /**
+ * Returns the child of parent at index index in the parent's child array.
+ */
+ public Object getChild(Object parent, int index)
+ {
+ GeometricObjectNode gn = (GeometricObjectNode) parent;
+ return gn.getChildAt(index);
+ }
+
+ /**
+ * Returns the number of children of parent.
+ */
+ public int getChildCount(Object parent)
+ {
+ GeometricObjectNode gn = (GeometricObjectNode) parent;
+ return gn.getChildCount();
+ }
+
+ /**
+ * Returns the index of child in parent.
+ */
+ public int getIndexOfChild(Object parent, Object child)
+ {
+ GeometricObjectNode gn = (GeometricObjectNode) parent;
+ return gn.getIndexOfChild((GeometricObjectNode) child);
+ }
+
+ /**
+ * Returns the root of the tree.
+ */
+ public Object getRoot()
+ {
+ return rootGeom;
+ }
+
+ /**
+ * Returns true if node is a leaf.
+ */
+ public boolean isLeaf(Object node)
+ {
+ GeometricObjectNode gn = (GeometricObjectNode) node;
+ return gn.isLeaf();
+ }
+
+ /**
+ * Removes a listener previously added with addTreeModelListener().
+ */
+ public void removeTreeModelListener(TreeModelListener l)
+ {
+ treeModelListeners.removeElement(l);
+ }
+
+ /**
+ * Messaged when the user has altered the value for the item identified by
+ * path to newValue. Not used by this model.
+ */
+ public void valueForPathChanged(TreePath path, Object newValue)
+ {
+ System.out
+ .println("*** valueForPathChanged : " + path + " --> " + newValue);
+ }
+}
+
+abstract class GeometricObjectNode
+{
+ protected static String indexString(int index)
+ {
+ return "[" + index + "]";
+ }
+
+ protected static String sizeString(int size)
+ {
+ return "(" + size + ")";
+ }
+
+ protected int index = -1;
+
+ protected String text = "";;
+
+ public GeometricObjectNode(String text)
+ {
+ this.text = text;
+ }
+
+ public void setIndex(int index)
+ {
+ this.index = index;
+ }
+
+ public String getText()
+ {
+ if (index >= 0) {
+ return indexString(index) + " : " + text;
+ }
+ return text;
+ }
+
+ public abstract ImageIcon getIcon();
+
+ public abstract Geometry getGeometry();
+
+ public abstract boolean isLeaf();
+
+ public abstract GeometricObjectNode getChildAt(int index);
+
+ public abstract int getChildCount();
+
+ public abstract int getIndexOfChild(GeometricObjectNode child);
+
+}
+
+class GeometryContext {
+ int source = 0;
+
+ GeometryContext(int source) {
+ this.source = source;
+ }
+}
+
+abstract class GeometryNode extends GeometricObjectNode
+{
+ public static GeometryNode create(Geometry geom, GeometryContext context)
+ {
+ if (geom instanceof GeometryCollection)
+ return new GeometryCollectionNode((GeometryCollection) geom, context);
+ if (geom instanceof Polygon)
+ return new PolygonNode((Polygon) geom, context);
+ if (geom instanceof LineString)
+ return new LineStringNode((LineString) geom, context);
+ if (geom instanceof LinearRing)
+ return new LinearRingNode((LinearRing) geom, context);
+ if (geom instanceof Point)
+ return new PointNode((Point) geom, context);
+ return null;
+ }
+
+ protected GeometryContext context;
+ private boolean isLeaf;
+ protected List<GeometricObjectNode> children = null;
+
+ public GeometryNode(Geometry geom, GeometryContext context)
+ {
+ this(geom, 0, null, context);
+ }
+
+ public GeometryNode(Geometry geom, int size, String tag, GeometryContext context)
+ {
+ super(geometryText(geom, size, tag));
+ this.context = context;
+ if (geom.isEmpty()) {
+ isLeaf = true;
+ }
+ }
+
+ private static String geometryText(Geometry geom, int size, String tag)
+ {
+ StringBuilder buf = new StringBuilder();
+ if (tag != null && tag.length() > 0) {
+ buf.append(tag + " : ");
+ }
+ buf.append(geom.getGeometryType());
+ if (geom.isEmpty()) {
+ buf.append(" EMPTY");
+ }
+ else {
+ if (size > 0) {
+ buf.append(" " + sizeString(size));
+ }
+ }
+
+ if (hasLength(geom)) {
+ buf.append(" -- Len: " + geom.getLength());
+ }
+ if (hasArea(geom)) {
+ buf.append(" Area: " + area(geom));
+ }
+
+ return buf.toString();
+ }
+
+ private static double area(Geometry geom) {
+ double area = 0;
+ if (geom.getDimension() >= 2) {
+ area = geom.getArea();
+ }
+ else if (geom instanceof LinearRing) {
+ area = Area.ofRing(geom.getCoordinates());
+ }
+ return area;
+ }
+
+ private static boolean hasArea(Geometry geom) {
+ if (geom.getDimension() >= 2) return true;
+ if (geom instanceof LinearRing) return true;
+ return false;
+ }
+
+ private static boolean hasLength(Geometry geom) {
+ if (geom.getDimension() >= 1) return true;
+ return false;
+ }
+
+ public boolean isLeaf()
+ {
+ return isLeaf;
+ }
+
+ public ImageIcon getIcon()
+ {
+ return context.source == 0 ? AppConstants.ICON_POLYGON : AppConstants.ICON_POLYGON_B;
+ }
+
+ public GeometricObjectNode getChildAt(int index)
+ {
+ if (isLeaf)
+ return null;
+ populateChildren();
+ return children.get(index);
+ }
+
+ public int getChildCount()
+ {
+ if (isLeaf)
+ return 0;
+ populateChildren();
+ return children.size();
+ }
+
+ public int getIndexOfChild(GeometricObjectNode child)
+ {
+ if (isLeaf)
+ return -1;
+ populateChildren();
+ return children.indexOf(child);
+ }
+
+ /**
+ * Lazily creates child nodes
+ */
+ private void populateChildren()
+ {
+ // already initialized
+ if (children != null)
+ return;
+
+ children = new ArrayList<GeometricObjectNode>();
+ fillChildren();
+ }
+
+ protected abstract void fillChildren();
+}
+
+
+class PolygonNode extends GeometryNode
+{
+ Polygon poly;
+
+ PolygonNode(Polygon poly, GeometryContext context)
+ {
+ super(poly, poly.getNumPoints(), null, context);
+ this.poly = poly;
+ }
+
+ public Geometry getGeometry()
+ {
+ return poly;
+ }
+
+ public ImageIcon getIcon()
+ {
+ return context.source == 0 ? AppConstants.ICON_POLYGON : AppConstants.ICON_POLYGON_B;
+ }
+
+ protected void fillChildren()
+ {
+ children.add(new LinearRingNode((LinearRing) poly.getExteriorRing(),
+ "Shell", context));
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ children.add(new LinearRingNode((LinearRing) poly.getInteriorRingN(i),
+ "Hole " + i, context));
+ }
+ }
+
+}
+
+class LineStringNode extends GeometryNode
+{
+ private LineString line;
+
+ public LineStringNode(LineString line, GeometryContext context)
+ {
+ super(line, line.getNumPoints(), null, context);
+ this.line = line;
+ }
+
+ public LineStringNode(LineString line, String tag, GeometryContext context)
+ {
+ super(line, line.getNumPoints(), tag, context);
+ this.line = line;
+ }
+
+ public ImageIcon getIcon()
+ {
+ return context.source == 0 ? AppConstants.ICON_LINESTRING : AppConstants.ICON_LINESTRING_B;
+ }
+
+ public Geometry getGeometry()
+ {
+ return line;
+ }
+
+ protected void fillChildren()
+ {
+ populateChildren(line.getCoordinates());
+ }
+
+ private void populateChildren(Coordinate[] pt)
+ {
+ Envelope env = line.getEnvelopeInternal();
+
+
+ for (int i = 0; i < pt.length; i++) {
+ double dist = Double.NaN;
+ if (i < pt.length - 1) dist = pt[i].distance(pt[i + 1]);
+ GeometricObjectNode node = CoordinateNode.create(pt[i], i, dist);
+ children.add(node);
+ }
+ }
+}
+
+class LinearRingNode extends LineStringNode
+{
+ public LinearRingNode(LinearRing ring, GeometryContext context)
+ {
+ super(ring, context);
+ }
+ public LinearRingNode(LinearRing ring, String tag,
+ GeometryContext context) {
+ super(ring, tag, context);
+ }
+ public ImageIcon getIcon()
+ {
+ return context.source == 0 ? AppConstants.ICON_LINEARRING : AppConstants.ICON_LINEARRING_B;
+ }
+}
+
+class PointNode extends GeometryNode
+{
+ Point pt;
+
+ public PointNode(Point p, GeometryContext context)
+ {
+ super(p, context);
+ pt = p;
+ }
+
+ public ImageIcon getIcon()
+ {
+ return context.source == 0 ? AppConstants.ICON_POINT : AppConstants.ICON_POINT_B;
+ }
+
+ public Geometry getGeometry()
+ {
+ return pt;
+ }
+
+ protected void fillChildren()
+ {
+ children.add(CoordinateNode.create(pt.getCoordinate()));
+ }
+}
+
+class GeometryCollectionNode extends GeometryNode
+{
+ GeometryCollection coll;
+
+ GeometryCollectionNode(GeometryCollection coll, GeometryContext context)
+ {
+ super(coll, coll.getNumGeometries(), null, context);
+ this.coll = coll;
+ }
+
+ public Geometry getGeometry()
+ {
+ return coll;
+ }
+
+ protected void fillChildren()
+ {
+ for (int i = 0; i < coll.getNumGeometries(); i++) {
+ GeometryNode node = create(coll.getGeometryN(i), context);
+ node.setIndex(i);
+ children.add(node);
+ }
+ }
+
+ public ImageIcon getIcon()
+ {
+ return context.source == 0 ? AppConstants.ICON_COLLECTION : AppConstants.ICON_COLLECTION_B;
+ }
+
+
+}
+
+/**
+ * Coordinate is the only leaf node now, but could be
+ * refactored into a LeafNode class.
+ *
+ * @author Martin Davis
+ *
+ */
+class CoordinateNode extends GeometricObjectNode
+{
+ public static CoordinateNode create(Coordinate p)
+ {
+ return new CoordinateNode(p);
+ }
+
+ public static CoordinateNode create(Coordinate p, int i, double distPrev)
+ {
+ return new CoordinateNode(p, i, distPrev);
+ }
+
+ private static DecimalFormat fmt = new DecimalFormat("0.#################", new DecimalFormatSymbols());
+
+ private static String label(Coordinate coord, int i, double distPrev)
+ {
+ String lbl = fmt.format(coord.x) + " " + fmt.format(coord.y);
+ if (! Double.isNaN(distPrev)) {
+ lbl += " -- dist: " + distPrev;
+ }
+ return lbl;
+ }
+
+
+ Coordinate coord;
+
+ public CoordinateNode(Coordinate coord)
+ {
+ this(coord, 0, Double.NaN);
+ }
+
+ public CoordinateNode(Coordinate coord, int i, double distPrev)
+ {
+ super(label(coord, i, distPrev));
+ this.coord = coord;
+ this.index = i;
+ }
+ public ImageIcon getIcon()
+ {
+ return AppConstants.ICON_POINT;
+ }
+
+ public Geometry getGeometry()
+ {
+ GeometryFactory geomFact = new GeometryFactory();
+ return geomFact.createPoint(coord);
+ }
+
+ @Override
+ public boolean isLeaf()
+ {
+ return true;
+ }
+
+ @Override
+ public GeometricObjectNode getChildAt(int index)
+ {
+ throw new IllegalStateException("should not be here");
+ }
+
+ @Override
+ public int getChildCount()
+ {
+ return 0;
+ }
+
+ @Override
+ public int getIndexOfChild(GeometricObjectNode child)
+ {
+ throw new IllegalStateException("should not be here");
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreePanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreePanel.java
new file mode 100644
index 0000000..c9140a6
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreePanel.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.event.*;
+import java.util.*;
+
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.border.*;
+import javax.swing.tree.*;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.function.*;
+import org.locationtech.jtstest.util.*;
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryTreePanel extends JPanel implements TreeWillExpandListener
+{
+ JScrollPane jScrollPane = new JScrollPane();
+ JTree tree = new JTree();
+ BorderLayout borderLayout = new BorderLayout();
+ Border border1;
+
+ private class GeometryTreeCellRenderer extends DefaultTreeCellRenderer {
+ public GeometryTreeCellRenderer() {
+ }
+
+ public Component getTreeCellRendererComponent(JTree tree, Object value,
+ boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
+
+ super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row,
+ hasFocus);
+ if (! (value instanceof GeometricObjectNode))
+ return this;
+
+ GeometricObjectNode o = (GeometricObjectNode) value;
+ setText(o.getText());
+ setIcon(o.getIcon());
+ setToolTipText("geometry");
+ return this;
+ }
+ }
+
+ public GeometryTreePanel() {
+ // default empty model
+ tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("No geometry shown")));
+ //((DefaultMutableTreeNode) (tree.getRoot())).removeAllChildren();
+ try {
+ initUI();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ private void initUI() throws Exception {
+ setSize(200, 250);
+ border1 = BorderFactory.createEmptyBorder(4, 4, 4, 4);
+ setLayout(borderLayout);
+ setBorder(border1);
+ add(jScrollPane, BorderLayout.CENTER);
+ jScrollPane.getViewport().add(tree, null);
+
+ tree.setRootVisible(true);
+ tree.setShowsRootHandles(true);
+ tree.setCellRenderer(new GeometryTreeCellRenderer());
+ tree.getSelectionModel().setSelectionMode(
+ TreeSelectionModel.SINGLE_TREE_SELECTION);
+ // stop expansion with double-click
+ tree.setToggleClickCount(0);
+
+
+ tree.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+ Geometry geom = getSelectedGeometry();
+ if (geom == null) return;
+
+ if (e.getClickCount() == 2) {
+ JTSTestBuilderFrame.getGeometryEditPanel().zoom(geom.getEnvelopeInternal());
+ }
+ // would be nice to flash as well as zoom, but zooming drawing is too slow
+ if (e.getClickCount() == 1) {
+ JTSTestBuilderFrame.getGeometryEditPanel().flash(geom);
+ }
+ }
+ });
+ tree.addTreeSelectionListener(new TreeSelectionListener() {
+ public void valueChanged(TreeSelectionEvent e) {
+ //GeometryFunction fun = getFunction();
+ //if (fun != null)
+ //fireFunctionSelected(new GeometryFunctionEvent(fun));
+ }
+ });
+ }
+ public Geometry getSelectedGeometry() {
+ return getGeometryFromNode(tree.getLastSelectedPathComponent());
+ }
+ public void moveToNextNode(int direction) {
+ direction = (int) Math.signum(direction);
+ TreePath path = tree.getSelectionPath();
+
+ TreePath nextPath2 = nextPath(path, 2 * direction);
+ tree.scrollPathToVisible(nextPath2);
+
+ TreePath nextPath = nextPath(path, direction);
+ tree.setSelectionPath(nextPath);
+ }
+
+ private TreePath nextPath(TreePath path, int offset) {
+ GeometricObjectNode node = (GeometricObjectNode) path.getLastPathComponent();
+ TreePath parentPath = path.getParentPath();
+ GeometricObjectNode parent = (GeometricObjectNode) parentPath.getLastPathComponent();
+ int index = parent.getIndexOfChild(node);
+ int nextIndex = index + offset;
+ if (nextIndex < 0) {
+ nextIndex = 0;
+ }
+ else if (nextIndex >= parent.getChildCount() ) {
+ nextIndex = parent.getChildCount() - 1;
+ }
+ GeometricObjectNode nextNode = parent.getChildAt(nextIndex);
+ TreePath nextPath = parentPath.pathByAddingChild(nextNode);
+ return nextPath;
+ }
+
+ private static Geometry getGeometryFromNode(Object value) {
+ if (value == null)
+ return null;
+ return ((GeometricObjectNode) value).getGeometry();
+ }
+
+ public void populate(Geometry geom, int source) {
+ tree.setModel(new GeometryTreeModel(geom, source));
+ }
+
+ //Required by TreeWillExpandListener interface.
+ public void treeWillExpand(TreeExpansionEvent e)
+ throws ExpandVetoException {
+ TreePath path = e.getPath();
+ Object lastComp = path.getLastPathComponent();
+ }
+
+ //Required by TreeWillExpandListener interface.
+ public void treeWillCollapse(TreeExpansionEvent e) {
+ // take no action
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/IconLoader.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/IconLoader.java
new file mode 100644
index 0000000..445fe24
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/IconLoader.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import javax.swing.ImageIcon;
+
+
+/**
+ * Gets an icon from this class' package.
+ */
+public class IconLoader {
+ public static ImageIcon icon(String filename) {
+ return new ImageIcon(IconLoader.class.getResource(filename));
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/InfoPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/InfoPanel.java
new file mode 100644
index 0000000..ebea33f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/InfoPanel.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jtstest.testbuilder.geom.*;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+/**
+ * @version 1.7
+ */
+public class InfoPanel
+extends JPanel
+{
+ TestBuilderModel tbModel = null;
+
+ JScrollPane jScrollPane1 = new JScrollPane();
+ JTextArea txtInfo = new JTextArea();
+ BorderLayout tabPanelLayout = new BorderLayout();
+
+ StringBuffer text = new StringBuffer();
+
+ public InfoPanel() {
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ void jbInit() throws Exception {
+
+ this.setLayout(tabPanelLayout);
+
+ txtInfo.setWrapStyleWord(true);
+ txtInfo.setLineWrap(true);
+ txtInfo.setBackground(SystemColor.control);
+
+ this.add(jScrollPane1, BorderLayout.CENTER);
+
+ jScrollPane1.setBorder(BorderFactory.createLoweredBevelBorder());
+ jScrollPane1.getViewport().add(txtInfo, null);
+ }
+
+ public void setModel(TestBuilderModel tbModel)
+ {
+ this.tbModel = tbModel;
+ }
+
+ public void OLDsetInfo(String s)
+ {
+ txtInfo.setText(s);
+ }
+
+ private static final String LOG_SEP = "-------------------------------------------------";
+
+ public void setInfo(String s)
+ {
+ if (s == null || s.length() == 0) s = "";
+ txtInfo.setText(s);
+ }
+
+ public void addInfo(String s)
+ {
+ if (s == null || s.length() == 0) return;
+
+ if (text.length() != 0) {
+ text.append("\n");
+ text.append(LOG_SEP);
+ text.append("\n");
+ }
+ text.append(s);
+ txtInfo.setText(text.toString());
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/InspectorPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/InspectorPanel.java
new file mode 100644
index 0000000..cb51d0c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/InspectorPanel.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.ui.SwingUtil;
+
+
+public class InspectorPanel extends TestBuilderPanel {
+
+ private static final int BOX_SPACER = 5;
+
+ private final ImageIcon downIcon = IconLoader.icon("Down.png");
+ private final ImageIcon upIcon = IconLoader.icon("Up.png");
+ private final ImageIcon zoomIcon = IconLoader.icon("MagnifyCursor.gif");
+ private final ImageIcon copyIcon = IconLoader.icon("Copy.png");
+
+ GeometryTreePanel geomTreePanel;
+
+ JButton btnZoom = new JButton();
+ JButton btnCopy = new JButton();
+ JButton btnNext = new JButton();
+ JButton btnPrev = new JButton();
+ JButton btnExpand = new JButton();
+
+ JLabel lblGeom = new JLabel();
+
+ private boolean showExpand = true;
+
+ public InspectorPanel() {
+ this(true);
+ }
+
+ public InspectorPanel(boolean showExpand) {
+ super();
+ this.showExpand = showExpand;
+ uiInit();
+ }
+
+ protected void uiInit() {
+ this.setLayout(new BorderLayout());
+ geomTreePanel = new GeometryTreePanel();
+
+ geomTreePanel.setPreferredSize(new Dimension(300, 500));
+ this.add(geomTreePanel, BorderLayout.CENTER);
+
+ btnZoom.setEnabled(true);
+ btnZoom.setMaximumSize(new Dimension(30, 26));
+ //btnZoom.setText("Zoom");
+ btnZoom.setIcon(zoomIcon);
+ btnZoom.setToolTipText("Zoom to component");
+ btnZoom.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnZoom_actionPerformed(e);
+ }
+ });
+ btnCopy.setEnabled(true);
+ btnCopy.setMaximumSize(new Dimension(30, 30));
+ //btnCopy.setText("Copy");
+ btnCopy.setIcon(copyIcon);
+ btnCopy.setToolTipText("Copy (Ctl-click to copy formatted");
+ btnCopy.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnCopy_actionPerformed(e);
+ }
+ });
+ btnNext.setEnabled(true);
+ btnNext.setMaximumSize(new Dimension(30, 30));
+ //btnNext.setText("Next");
+ btnNext.setIcon(downIcon);
+ btnNext.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnZoomNext_actionPerformed(e, 1);
+ }
+ });
+ btnPrev.setEnabled(true);
+ btnPrev.setMaximumSize(new Dimension(30, 30));
+ //btnPrev.setText("Prev");
+ btnPrev.setIcon(upIcon);
+ btnPrev.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnZoomNext_actionPerformed(e, -1);
+ }
+ });
+
+ lblGeom.setFont(new java.awt.Font("Dialog", 1, 16));
+ lblGeom.setText(" ");
+ lblGeom.setMaximumSize(new Dimension(30, 30));
+ lblGeom.setHorizontalAlignment(JLabel.CENTER);
+
+ JPanel btnPanel = new JPanel();
+ btnPanel.setLayout(new BoxLayout(btnPanel, BoxLayout.PAGE_AXIS));
+ btnPanel.add(lblGeom);
+ btnPanel.add(Box.createRigidArea(new Dimension(0, BOX_SPACER)));
+ btnPanel.add(btnZoom);
+ btnPanel.add(Box.createRigidArea(new Dimension(0, BOX_SPACER)));
+ btnPanel.add(btnPrev);
+ btnPanel.add(btnNext);
+ btnPanel.add(Box.createRigidArea(new Dimension(0, BOX_SPACER)));
+ btnPanel.add(btnCopy);
+ this.add(btnPanel, BorderLayout.WEST);
+
+ if (showExpand) {
+ btnExpand.setEnabled(true);
+ btnExpand.setMaximumSize(new Dimension(30, 30));
+ btnExpand.setText("...");
+ btnExpand.setToolTipText("Display in window");
+ btnExpand.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e)
+ {
+ btnExpand_actionPerformed();
+ }
+ });
+ JPanel btn2Panel = new JPanel();
+ btn2Panel.setLayout(new BoxLayout(btn2Panel, BoxLayout.PAGE_AXIS));
+ btn2Panel.add(btnExpand);
+ this.add(btn2Panel, BorderLayout.EAST);
+ }
+
+ }
+ private void btnExpand_actionPerformed() {
+ JTSTestBuilderController.inspectGeometryDialog();
+ }
+ private void btnZoom_actionPerformed(ActionEvent e) {
+ JTSTestBuilderFrame.getGeometryEditPanel().zoom(geomTreePanel.getSelectedGeometry());
+ }
+ private void btnZoomNext_actionPerformed(ActionEvent e, int direction) {
+ geomTreePanel.moveToNextNode(direction);
+ JTSTestBuilderFrame.getGeometryEditPanel().zoom(geomTreePanel.getSelectedGeometry());
+ }
+ private void btnCopy_actionPerformed(ActionEvent e) {
+ boolean isFormatted = 0 != (e.getModifiers() & ActionEvent.CTRL_MASK);
+ Geometry geom = geomTreePanel.getSelectedGeometry();
+ if (geom == null) return;
+ SwingUtil.copyToClipboard(geom, isFormatted);
+ }
+
+ public void setGeometry(String tag, Geometry a, int source)
+ {
+ lblGeom.setText(tag);
+ lblGeom.setForeground(source == 0 ? Color.BLUE : Color.RED);
+ geomTreePanel.populate(a, source);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilder.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilder.java
new file mode 100644
index 0000000..687deef
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilder.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.UIManager;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.command.*;
+import org.locationtech.jtstest.function.*;
+import org.locationtech.jtstest.geomfunction.GeometryFunctionRegistry;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+/**
+ * A Swing application which supports
+ * creating geometries and running JTS operations.
+ * <p>
+ * <b>Command Line Options</b>
+ * <table border='1'>
+ * <tr>
+ * <td><tt>-geomfunc <i>{ <classname> }</i></tt> </td>
+ * <td>Specifies classes whose <tt>public static<tt> methods will be loaded as geometry functions</td>
+ * </tr>
+ * </table>
+ *
+ * @version 1.7
+ */
+public class JTSTestBuilder
+{
+ private static final String PROP_SWING_DEFAULTLAF = "swing.defaultlaf";
+
+ private static final String OPT_GEOMFUNC = "geomfunc";
+
+ public static JTSTestBuilder instance()
+ {
+ return app;
+ }
+
+ public static TestBuilderModel model() { return instance().tbModel; }
+
+ private static GeometryFunctionRegistry funcRegistry = GeometryFunctionRegistry.createTestBuilderRegistry();
+ private static CommandLine commandLine = createCmdLine();
+ public static JTSTestBuilder app;
+
+ private static CommandLine createCmdLine() {
+ commandLine = new CommandLine('-');
+ commandLine.addOptionSpec(new OptionSpec(OPT_GEOMFUNC, OptionSpec.NARGS_ONE_OR_MORE));
+ return commandLine;
+ }
+
+ public static GeometryFunctionRegistry getFunctionRegistry()
+ {
+ return funcRegistry;
+ }
+
+ public static PrecisionModel getPrecisionModel()
+ {
+ return model().getPrecisionModel();
+ }
+
+ public static GeometryFactory getGeometryFactory()
+ {
+ return model().getGeometryFactory();
+ }
+
+ private TestBuilderModel tbModel = new TestBuilderModel();
+
+ boolean packFrame = false;
+
+ /**Construct the application*/
+ public JTSTestBuilder() {
+ }
+
+ private void initFrame()
+ {
+ JTSTestBuilderFrame frame = new JTSTestBuilderFrame();
+ frame.setModel(model());
+
+ //Validate frames that have preset sizes
+ //Pack frames that have useful preferred size info, e.g. from their layout
+ if (packFrame) {
+ frame.pack();
+ } else {
+ frame.validate();
+ }
+ //Center the window
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ Dimension frameSize = frame.getSize();
+ if (frameSize.height > screenSize.height) {
+ frameSize.height = screenSize.height;
+ }
+ if (frameSize.width > screenSize.width) {
+ frameSize.width = screenSize.width;
+ }
+ frame.setLocation(
+ (screenSize.width - frameSize.width) / 2,
+ (screenSize.height - frameSize.height) / 2);
+ frame.setVisible(true);
+ }
+
+
+ /**Main method*/
+ public static void main(String[] args)
+ {
+ try {
+ readArgs(args);
+ setLookAndFeel();
+ app = new JTSTestBuilder();
+ app.initFrame();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Sets the look and feel, using user-defined LAF if
+ * provided as a system property.
+ *
+ * e.g. Metal: -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel
+ *
+ * @throws InterruptedException
+ * @throws InvocationTargetException
+ */
+ private static void setLookAndFeel() throws InterruptedException, InvocationTargetException
+ {
+ /**
+ * Invoke on Swing thread to pass Java security requirements
+ */
+ javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
+ public void run()
+ {
+ try {
+ String laf = System.getProperty(PROP_SWING_DEFAULTLAF);
+ if (laf == null) {
+ laf = UIManager.getSystemLookAndFeelClassName();
+ }
+ javax.swing.UIManager.setLookAndFeel(laf);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+
+ private static void readArgs(String[] args) throws ParseException,
+ ClassNotFoundException {
+ commandLine.parse(args);
+
+ if (commandLine.hasOption(OPT_GEOMFUNC)) {
+ Option opt = commandLine.getOption(OPT_GEOMFUNC);
+ for (int i = 0; i < opt.getNumArgs(); i++) {
+ String geomFuncClassname = opt.getArg(i);
+ try {
+ funcRegistry.add(geomFuncClassname);
+ System.out.println("Added Geometry Functions from: "
+ + geomFuncClassname);
+ } catch (ClassNotFoundException ex) {
+ System.out.println("Unable to load function class: "
+ + geomFuncClassname);
+ }
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderFrame.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderFrame.java
new file mode 100644
index 0000000..ddea55f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderFrame.java
@@ -0,0 +1,873 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.AWTEvent;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowEvent;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.util.LineStringExtracter;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.clean.CleanDuplicatePoints;
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.controller.ResultController;
+import org.locationtech.jtstest.testbuilder.event.SpatialFunctionPanelEvent;
+import org.locationtech.jtstest.testbuilder.event.SpatialFunctionPanelListener;
+import org.locationtech.jtstest.testbuilder.model.DisplayParameters;
+import org.locationtech.jtstest.testbuilder.model.GeometryEvent;
+import org.locationtech.jtstest.testbuilder.model.HtmlWriter;
+import org.locationtech.jtstest.testbuilder.model.JavaTestWriter;
+import org.locationtech.jtstest.testbuilder.model.TestBuilderModel;
+import org.locationtech.jtstest.testbuilder.model.TestCaseEdit;
+import org.locationtech.jtstest.testbuilder.model.XMLTestWriter;
+import org.locationtech.jtstest.testbuilder.ui.ImageUtil;
+import org.locationtech.jtstest.testbuilder.ui.SwingUtil;
+import org.locationtech.jtstest.testbuilder.ui.dnd.FileDrop;
+import org.locationtech.jtstest.testbuilder.ui.tools.DeleteVertexTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.EditVertexTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.ExtractComponentTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.InfoTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.LineStringTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.PanTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.PointTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.RectangleTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.StreamPolygonTool;
+import org.locationtech.jtstest.testbuilder.ui.tools.ZoomTool;
+import org.locationtech.jtstest.testrunner.GuiUtil;
+import org.locationtech.jtstest.util.FileUtil;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+/**
+ * The main frame for the JTS Test Builder.
+ *
+ * @version 1.7
+ */
+public class JTSTestBuilderFrame extends JFrame
+{
+
+ private static JTSTestBuilderFrame singleton = null;
+ private ResultController resultController = new ResultController(this);
+ private JTSTestBuilderMenuBar tbMenuBar = new JTSTestBuilderMenuBar(this);
+ private JTSTestBuilderToolBar tbToolBar = new JTSTestBuilderToolBar(this);
+ //---------------------------------------------
+ JPanel contentPane;
+ BorderLayout borderLayout1 = new BorderLayout();
+ Border border4;
+ JSplitPane jSplitPane1 = new JSplitPane();
+ JPanel jPanel1 = new JPanel();
+ BorderLayout borderLayout2 = new BorderLayout();
+ TestCasePanel testCasePanel = new TestCasePanel();
+ JPanel jPanel2 = new JPanel();
+ JTabbedPane inputTabbedPane = new JTabbedPane();
+ BorderLayout borderLayout3 = new BorderLayout();
+ JPanel testPanel = new JPanel();
+ WKTPanel wktPanel = new WKTPanel(this);
+ InspectorPanel inspectPanel = new InspectorPanel();
+ TestListPanel testListPanel = new TestListPanel(this);
+ //LayerListPanel layerListPanel = new LayerListPanel();
+ LayerListPanel layerListPanel = new LayerListPanel();
+ GridBagLayout gridBagLayout2 = new GridBagLayout();
+ GridLayout gridLayout1 = new GridLayout();
+ ResultWKTPanel resultWKTPanel = new ResultWKTPanel();
+ ResultValuePanel resultValuePanel = new ResultValuePanel();
+ StatsPanel statsPanel = new StatsPanel();
+ InfoPanel logPanel = new InfoPanel();
+ private ZoomTool zoomTool;
+ private final ImageIcon appIcon = new ImageIcon(this.getClass().getResource("app-icon.gif"));
+
+ private JFileChooser fileChooser = new JFileChooser();
+ private JFileChooser pngFileChooser;
+ private JFileChooser fileAndDirectoryChooser = new JFileChooser();
+ private JFileChooser directoryChooser = new JFileChooser();
+
+ TestBuilderModel tbModel;
+
+ private TestCaseTextDialog testCaseTextDlg = new TestCaseTextDialog(this,
+ "", true);
+ private GeometryInspectorDialog geomInspectorDlg = new GeometryInspectorDialog(this);
+ /*
+ private LoadTestCasesDialog loadTestCasesDlg = new LoadTestCasesDialog(this,
+ "Load Test Cases", true);
+*/
+
+
+ /**
+ * Construct the frame
+ */
+ public JTSTestBuilderFrame() {
+ try {
+ Assert.isTrue(singleton == null);
+ singleton = this;
+ enableEvents(AWTEvent.WINDOW_EVENT_MASK);
+ setIconImage(appIcon.getImage());
+ jbInit();
+ //#setRollover was introduced in Java 1.4 and is not present in 1.3.1. [Jon Aquino]
+ //jToolBar1.setRollover(true);
+ // initList(tcList);
+ //loadEditList(testpp);
+// testCasePanel.setModel(tbModel);
+ testCasePanel.spatialFunctionPanel.addSpatialFunctionPanelListener(
+ new SpatialFunctionPanelListener() {
+ public void functionExecuted(SpatialFunctionPanelEvent e) {
+ resultController.spatialFunctionPanel_functionExecuted(e);
+ }
+ });
+ testCasePanel.scalarFunctionPanel.addSpatialFunctionPanelListener(
+ new SpatialFunctionPanelListener() {
+ public void functionExecuted(SpatialFunctionPanelEvent e) {
+ resultController.scalarFunctionPanel_functionExecuted(e);
+ }
+ });
+ testCasePanel.editCtlPanel.btnSetPrecisionModel.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ precisionModelMenuItem_actionPerformed(e);
+ }
+ });
+ //testCasePanel.editCtlPanel.cbMagnifyTopo.addActionListener(
+ testCasePanel.cbMagnifyTopo.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ revealTopo_actionPerformed();
+ }
+ });
+ //testCasePanel.editCtlPanel.stretchDist
+ testCasePanel.spStretchDist
+ .addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent e) {
+ revealTopo_actionPerformed();
+ }
+ });
+
+ zoomTool = new ZoomTool(2, AppCursors.ZOOM);
+ showGeomsTab();
+ initFileDrop(testCasePanel);
+ testCasePanel.getGeometryEditPanel().setCurrentTool(RectangleTool.getInstance());
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void initFileDrop(Component comp) {
+ new FileDrop(comp, new FileDrop.Listener() {
+ public void filesDropped(java.io.File[] files) {
+ try {
+ openXmlFilesAndDirectories(files);
+ } catch (Exception ex) {
+ SwingUtil.reportException(null, ex);
+ }
+ }
+ });
+ }
+ private void initFileChoosers() {
+ if (pngFileChooser == null) {
+ pngFileChooser = new JFileChooser();
+ pngFileChooser.addChoosableFileFilter(SwingUtil.PNG_FILE_FILTER);
+ pngFileChooser.setDialogTitle("Save PNG");
+ pngFileChooser.setSelectedFile(new File("geoms.png"));
+ }
+ }
+
+ public static JTSTestBuilderFrame instance() {
+ if (singleton == null) {
+ new JTSTestBuilderFrame();
+ }
+ return singleton;
+ }
+
+ public static GeometryEditPanel getGeometryEditPanel()
+ {
+ return instance().getTestCasePanel().getGeometryEditPanel();
+ }
+
+ public TestBuilderModel getModel()
+ {
+ return tbModel;
+ }
+
+ public void setModel(TestBuilderModel model)
+ {
+ tbModel = model;
+ testCasePanel.setModel(tbModel);
+ wktPanel.setModel(model);
+ inspectPanel.setModel(model);
+ resultWKTPanel.setModel(model);
+ resultValuePanel.setModel(model);
+ statsPanel.setModel(model);
+
+ model.getGeometryEditModel().addGeometryListener(
+ new org.locationtech.jtstest.testbuilder.model.GeometryListener() {
+ public void geometryChanged(GeometryEvent e) {
+ model_geometryChanged(e);
+ }
+ });
+
+ testListPanel.populateList();
+ //layerListPanel.init(getModel().getLayers());
+ layerListPanel.populateList();
+ updateTestCaseView();
+ updatePrecisionModelDescription();
+ }
+
+ public static void reportException(Exception e) {
+ SwingUtil.reportException(instance(), e);
+ }
+
+ public void setCurrentTestCase(TestCaseEdit testCase) {
+ tbModel.cases().setCurrent(testCase);
+ updateTestCaseView();
+ JTSTestBuilderController.zoomToInput();
+ }
+
+ public TestCasePanel getTestCasePanel() {
+ return testCasePanel;
+ }
+
+ public ResultWKTPanel getResultWKTPanel() {
+ return resultWKTPanel;
+ }
+
+ public ResultValuePanel getResultValuePanel() {
+ return resultValuePanel;
+ }
+
+ /**
+ * File | Exit action performed
+ */
+ public void jMenuFileExit_actionPerformed(ActionEvent e) {
+ System.exit(0);
+ }
+
+ /**
+ * Help | About action performed
+ */
+ public void jMenuHelpAbout_actionPerformed(ActionEvent e) {
+ JTSTestBuilder_AboutBox dlg = new JTSTestBuilder_AboutBox(this);
+ java.awt.Dimension dlgSize = dlg.getPreferredSize();
+ java.awt.Dimension frmSize = getSize();
+ java.awt.Point loc = getLocation();
+ dlg.setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height
+ - dlgSize.height) / 2 + loc.y);
+ dlg.setModal(true);
+ dlg.setVisible(true);
+ }
+
+ public void showTab(String name)
+ {
+ inputTabbedPane.setSelectedIndex(inputTabbedPane.indexOfTab(name));
+ }
+
+ public void showGeomsTab()
+ {
+ showTab(AppStrings.TAB_LABEL_INPUT);
+ }
+
+ public void showResultWKTTab()
+ {
+ showTab(AppStrings.TAB_LABEL_RESULT);
+ }
+ public void showResultValueTab()
+ {
+ showTab(AppStrings.TAB_LABEL_VALUE);
+ }
+
+ public void showInfoTab()
+ {
+ showTab(AppStrings.TAB_LABEL_LOG);
+ }
+
+ public void openXmlFilesAndDirectories(File[] files) throws Exception {
+ if (files.length == 1) {
+ fileChooser.setSelectedFile(files[0]);
+ }
+ tbModel.openXmlFilesAndDirectories(files);
+ reportProblemsParsingXmlTestFile(tbModel.getParsingProblems());
+ updateTestCaseView();
+ testListPanel.populateList();
+ updatePrecisionModelDescription();
+ JTSTestBuilderController.zoomToInput();
+ }
+
+ /**
+ * Overridden so we can exit when window is closed
+ */
+ protected void processWindowEvent(WindowEvent e) {
+ super.processWindowEvent(e);
+ if (e.getID() == WindowEvent.WINDOW_CLOSING) {
+ jMenuFileExit_actionPerformed(null);
+ }
+ }
+
+ void model_geometryChanged(GeometryEvent e) {
+ //testCasePanel.relatePanel.clearResults();
+ JTSTestBuilderController.geometryViewChanged();
+ updateWktPanel();
+ }
+
+ void createNewCase() {
+ tbModel.cases().createNew();
+ showGeomsTab();
+ updateTestCases();
+ }
+
+ void moveToPrevCase(boolean isZoom) {
+ tbModel.cases().prevCase();
+ updateTestCaseView();
+ if (isZoom) JTSTestBuilderController.zoomToInput();
+ }
+
+ void moveToNextCase(boolean isZoom) {
+ tbModel.cases().nextCase();
+ updateTestCaseView();
+ if (isZoom) JTSTestBuilderController.zoomToInput();
+ }
+
+ void copyCase() {
+ tbModel.cases().copyCase();
+ updateTestCases();
+ }
+ TestCaseEdit currentCase() {
+ return tbModel.cases().getCurrentCase();
+ }
+ public void updateTestCases()
+ {
+ testListPanel.populateList();
+ updateTestCaseView();
+ }
+
+ public void copyResultToTest()
+ {
+ Object currResult = tbModel.getResult();
+ if (! (currResult instanceof Geometry))
+ return;
+ tbModel.addCase(new Geometry[] { (Geometry) currResult, null },
+ "Result of " + tbModel.getOpName());
+ updateTestCaseView();
+ testListPanel.populateList();
+ }
+
+ public void actionExchangeGeoms() {
+ currentCase().exchange();
+ testCasePanel.setTestCase(currentCase());
+ }
+
+ void btnDeleteCase_actionPerformed(ActionEvent e) {
+ tbModel.cases().deleteCase();
+ updateTestCaseView();
+ testListPanel.populateList();
+ }
+
+ /*
+ void menuLoadTestCases_actionPerformed(ActionEvent e) {
+ try {
+ loadTestCasesDlg.show();
+ TestCaseList tcl = loadTestCasesDlg.getList();
+ loadTestCaseList(tcl, new PrecisionModel());
+ refreshNavBar();
+ }
+ catch (Exception x) {
+ reportException(this, x);
+ }
+ }
+
+ void loadTestCaseList(TestCaseList tcl, PrecisionModel precisionModel) throws Exception {
+ tbModel.setPrecisionModel(precisionModel);
+ if (tcl != null) {
+ loadEditList(tcl);
+ }
+ testListPanel.populateList();
+ }
+*/
+
+ void menuExchangeGeom_actionPerformed(ActionEvent e) {
+ currentCase().exchange();
+ testCasePanel.setTestCase(currentCase());
+ }
+
+ void menuViewText_actionPerformed(ActionEvent e) {
+ testCaseTextDlg.setTestCase(currentCase());
+ testCaseTextDlg.setVisible(true);
+ }
+
+ public void actionInspectGeometry() {
+ int geomIndex = tbModel.getGeometryEditModel().getGeomIndex();
+ String tag = geomIndex == 0 ? AppStrings.GEOM_LABEL_A : AppStrings.GEOM_LABEL_B;
+ Geometry geometry = currentCase().getGeometry(geomIndex);
+ inspectPanel.setGeometry( tag, geometry, geomIndex);
+ showTab(AppStrings.TAB_LABEL_INSPECT);
+ /*
+ geomInspectorDlg.setGeometry(
+ geomIndex == 0 ? AppStrings.GEOM_LABEL_A : AppStrings.GEOM_LABEL_B,
+ tbModel.getCurrentTestCaseEdit().getGeometry(geomIndex));
+ */
+ //geomInspectorDlg.setVisible(true);
+ }
+
+ public void actionInspectGeometryDialog() {
+ int geomIndex = tbModel.getGeometryEditModel().getGeomIndex();
+ String tag = geomIndex == 0 ? AppStrings.GEOM_LABEL_A : AppStrings.GEOM_LABEL_B;
+ Geometry geometry = currentCase().getGeometry(geomIndex);
+ geomInspectorDlg.setGeometry(tag, geometry);
+ geomInspectorDlg.setVisible(true);
+ }
+
+ void menuLoadXmlTestFile_actionPerformed(ActionEvent e) {
+ try {
+ fileChooser.removeChoosableFileFilter(SwingUtil.JAVA_FILE_FILTER);
+ fileChooser.addChoosableFileFilter(SwingUtil.XML_FILE_FILTER);
+ fileChooser.setDialogTitle("Open XML Test File(s)");
+ fileChooser.setMultiSelectionEnabled(true);
+ if (JFileChooser.APPROVE_OPTION == fileChooser.showOpenDialog(this)) {
+ File[] files = fileChooser.getSelectedFiles();
+ if (files.length == 0) {
+ files = new File[]{fileChooser.getSelectedFile()};
+ }
+ openXmlFilesAndDirectories(files);
+ }
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(this, x);
+ }
+ }
+
+ void menuSaveAsXml_actionPerformed(ActionEvent e) {
+ try {
+ fileChooser.removeChoosableFileFilter(SwingUtil.JAVA_FILE_FILTER);
+ fileChooser.addChoosableFileFilter(SwingUtil.XML_FILE_FILTER);
+ fileChooser.setDialogTitle("Save XML Test File");
+ if (JFileChooser.APPROVE_OPTION == fileChooser.showSaveDialog(this)) {
+ File file = fileChooser.getSelectedFile();
+ if (! SwingUtil.confirmOverwrite(this, file)) return;
+ FileUtil.setContents(fileChooser.getSelectedFile().getPath(),
+ XMLTestWriter.getRunXml(tbModel.getTestCaseList(), tbModel.getPrecisionModel()) );
+ }
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(this, x);
+ }
+ }
+
+ public String getRunXml()
+ {
+ return XMLTestWriter.getRunXml(tbModel.getTestCaseList(), tbModel.getPrecisionModel());
+ }
+
+ void menuSaveAsJava_actionPerformed(ActionEvent e) {
+ try {
+ fileChooser.removeChoosableFileFilter(SwingUtil.XML_FILE_FILTER);
+ fileChooser.addChoosableFileFilter(SwingUtil.JAVA_FILE_FILTER);
+ fileChooser.setDialogTitle("Save Java File");
+ if (JFileChooser.APPROVE_OPTION == fileChooser.showSaveDialog(this)) {
+ File file = fileChooser.getSelectedFile();
+ if (! SwingUtil.confirmOverwrite(this, file)) return;
+ String className = fileChooser.getSelectedFile().getName();
+ int extensionIndex = className.lastIndexOf(".");
+ if (extensionIndex > 0) {
+ className = className.substring(0, extensionIndex);
+ }
+ ;
+ FileUtil.setContents(fileChooser.getSelectedFile().getPath(), JavaTestWriter.getRunJava(className, tbModel));
+ }
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(this, x);
+ }
+ }
+
+ void menuSaveAsHtml_actionPerformed(ActionEvent e) {
+ try {
+ directoryChooser.setDialogTitle("Select Folder In Which To Save HTML and GIF Files");
+ if (JFileChooser.APPROVE_OPTION == directoryChooser.showSaveDialog(this)) {
+ int choice = JOptionPane.showConfirmDialog(this,
+ "Would you like the spatial function images "
+ + "to show the A and B geometries?", "Confirmation",
+ JOptionPane.YES_NO_CANCEL_OPTION);
+ final HtmlWriter writer = new HtmlWriter();
+ switch (choice) {
+ case JOptionPane.CANCEL_OPTION:
+ return;
+ case JOptionPane.YES_OPTION:
+ writer.setShowingABwithSpatialFunction(true);
+ break;
+ case JOptionPane.NO_OPTION:
+ writer.setShowingABwithSpatialFunction(false);
+ break;
+ }
+ final File directory = directoryChooser.getSelectedFile();
+ Assert.isTrue(directory.exists());
+ // BusyDialog.setOwner(this);
+ // BusyDialog busyDialog = new BusyDialog();
+ // writer.setBusyDialog(busyDialog);
+ // try {
+ // busyDialog.execute("Saving .html and .gif files", new BusyDialog.Executable() {
+ // public void execute() throws Exception {
+ writer.write(directory, tbModel.getTestCaseList(), tbModel.getPrecisionModel());
+ // }
+ // });
+ // }
+ // catch (Exception e2) {
+ // System.out.println(busyDialog.getStackTrace());
+ // throw e2;
+ // }
+ }
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(this, x);
+ }
+ }
+
+ void menuSaveAsPNG_actionPerformed(ActionEvent e) {
+ initFileChoosers();
+ try {
+ String fullFileName = SwingUtil.chooseFilenameWithConfirm(this, pngFileChooser);
+ if (fullFileName == null) return;
+ ImageUtil.writeImage(testCasePanel.getGeometryEditPanel(),
+ fullFileName,
+ ImageUtil.IMAGE_FORMAT_NAME_PNG);
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(this, x);
+ }
+ }
+
+ void menuSaveScreenToClipboard_actionPerformed(ActionEvent e) {
+ try {
+ ImageUtil.saveImageToClipboard(testCasePanel.getGeometryEditPanel(),
+ ImageUtil.IMAGE_FORMAT_NAME_PNG);
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(this, x);
+ }
+ }
+
+ void drawRectangleButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(RectangleTool.getInstance());
+ }
+
+ void drawPolygonButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(StreamPolygonTool.getInstance());
+ }
+
+ void drawLineStringButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(LineStringTool.getInstance());
+ }
+
+ void drawPointButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(PointTool.getInstance());
+ }
+
+ void infoButton_actionPerformed() {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(InfoTool.getInstance());
+ }
+
+ void actionExtractComponentButton() {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(ExtractComponentTool.getInstance());
+ }
+
+ void actionDeleteVertexButton() {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(DeleteVertexTool.getInstance());
+ }
+
+ void zoomInButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(zoomTool);
+ }
+
+ void oneToOneButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().getViewport().zoomToInitialExtent();
+ }
+
+ void zoomToFullExtentButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().zoomToFullExtent();
+ }
+
+ void zoomToResult_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().zoomToResult();
+ }
+
+ void zoomToInputButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().zoomToInput();
+ }
+
+ void zoomToInputA_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().zoomToGeometry(0);
+ }
+
+ void zoomToInputB_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().zoomToGeometry(1);
+ }
+
+ void panButton_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(PanTool.getInstance());
+ }
+
+ void deleteAllTestCasesMenuItem_actionPerformed(ActionEvent e) {
+ tbModel.cases().init();
+ updateTestCaseView();
+ testListPanel.populateList();
+ }
+
+ public void setShowingGrid(boolean showGrid) {
+ testCasePanel.editPanel.setGridEnabled(showGrid);
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+ void showVertexIndicesMenuItem_actionPerformed(ActionEvent e) {
+// testCasePanel.editPanel.setShowVertexIndices(showVertexIndicesMenuItem.isSelected());
+ }
+
+ void menuLoadXmlTestFolder_actionPerformed(ActionEvent e) {
+ try {
+ directoryChooser.removeChoosableFileFilter(SwingUtil.JAVA_FILE_FILTER);
+ directoryChooser.setDialogTitle("Open Folder(s) Containing XML Test Files");
+ directoryChooser.setMultiSelectionEnabled(true);
+ if (JFileChooser.APPROVE_OPTION == directoryChooser.showOpenDialog(this)) {
+ File[] files = directoryChooser.getSelectedFiles();
+ if (files.length == 0) {
+ files = new File[]{fileChooser.getSelectedFile()};
+ }
+ openXmlFilesAndDirectories(files);
+ }
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(this, x);
+ }
+ }
+
+ void precisionModelMenuItem_actionPerformed(ActionEvent e) {
+ try {
+ PrecisionModelDialog precisionModelDialog = new PrecisionModelDialog(
+ this, "Edit Precision Model", true);
+ GuiUtil.center(precisionModelDialog, this);
+ precisionModelDialog.setPrecisionModel(tbModel.getPrecisionModel());
+ precisionModelDialog.setVisible(true);
+ tbModel.changePrecisionModel(precisionModelDialog.getPrecisionModel());
+ updatePrecisionModelDescription();
+ updateGeometry();
+ }
+ catch (ParseException pe) {
+ SwingUtil.reportException(this, pe);
+ }
+ }
+ void revealTopo_actionPerformed() {
+ DisplayParameters.setMagnifyingTopology(testCasePanel.cbMagnifyTopo.isSelected());
+ DisplayParameters.setTopologyStretchSize(testCasePanel.getStretchSize());
+ //tbModel.setMagnifyingTopology(testCasePanel.editCtlPanel.cbMagnifyTopo.isSelected());
+ //tbModel.setTopologyStretchSize(testCasePanel.editCtlPanel.getStretchSize());
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+
+ /**
+ * Component initialization
+ */
+ private void jbInit() throws Exception {
+ fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+ fileChooser.setMultiSelectionEnabled(false);
+ fileAndDirectoryChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+ fileAndDirectoryChooser.setMultiSelectionEnabled(true);
+ directoryChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+ directoryChooser.setMultiSelectionEnabled(false);
+ //Center the window
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+
+ //---------------------------------------------------
+ contentPane = (JPanel) this.getContentPane();
+ border4 = BorderFactory.createBevelBorder(BevelBorder.LOWERED, Color.white,
+ Color.white, new Color(93, 93, 93), new Color(134, 134, 134));
+ contentPane.setLayout(borderLayout1);
+ this.setSize(new Dimension(800, 800));
+ this.setTitle("JTS TestBuilder");
+
+ /*
+ testCasePanel.editPanel.addGeometryListener(
+ new com.vividsolutions.jtstest.testbuilder.model.GeometryListener() {
+
+ public void geometryChanged(GeometryEvent e) {
+ editPanel_geometryChanged(e);
+ }
+ });
+*/
+
+ jSplitPane1.setOrientation(JSplitPane.VERTICAL_SPLIT);
+ jSplitPane1.setPreferredSize(new Dimension(601, 690));
+ jPanel1.setLayout(borderLayout2);
+ jPanel1.setMinimumSize(new Dimension(431, 0));
+ contentPane.setPreferredSize(new Dimension(601, 690));
+ inputTabbedPane.setTabPlacement(JTabbedPane.LEFT);
+ jPanel2.setLayout(borderLayout3);
+ wktPanel.setMinimumSize(new Dimension(111, 0));
+ wktPanel.setPreferredSize(new Dimension(600, 100));
+ wktPanel.setToolTipText(AppStrings.TIP_TEXT_ENTRY);
+ testPanel.setLayout(gridBagLayout2);
+ gridLayout1.setRows(4);
+ gridLayout1.setColumns(1);
+
+ contentPane.add(jSplitPane1, BorderLayout.CENTER);
+ jSplitPane1.add(jPanel1, JSplitPane.TOP);
+ jPanel1.add(testCasePanel, BorderLayout.CENTER);
+ jSplitPane1.add(jPanel2, JSplitPane.BOTTOM);
+ jPanel2.add(tbToolBar.getToolBar(), BorderLayout.NORTH);
+ jPanel2.add(inputTabbedPane, BorderLayout.CENTER);
+ jSplitPane1.setBorder(new EmptyBorder(2,2,2,2));
+ jSplitPane1.setResizeWeight(0.5);
+ inputTabbedPane.add(testListPanel, AppStrings.TAB_LABEL_CASES);
+ inputTabbedPane.add(wktPanel, AppStrings.TAB_LABEL_INPUT);
+ inputTabbedPane.add(resultWKTPanel, AppStrings.TAB_LABEL_RESULT);
+ inputTabbedPane.add(resultValuePanel, AppStrings.TAB_LABEL_VALUE);
+ inputTabbedPane.add(inspectPanel, AppStrings.TAB_LABEL_INSPECT);
+ inputTabbedPane.add(statsPanel, AppStrings.TAB_LABEL_STATS);
+ inputTabbedPane.add(logPanel, AppStrings.TAB_LABEL_LOG);
+ inputTabbedPane.add(layerListPanel, AppStrings.TAB_LABEL_LAYERS);
+ inputTabbedPane.setSelectedIndex(1);
+ inputTabbedPane.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e)
+ {
+ updateStatsPanelIfVisible();
+ }
+ });
+
+ jSplitPane1.setDividerLocation(500);
+ this.setJMenuBar(tbMenuBar.getMenuBar());
+ //contentPane.add(tbToolBar.getToolBar(), BorderLayout.NORTH);
+ }
+
+ public JTSTestBuilderToolBar getToolbar()
+ {
+ return tbToolBar;
+ }
+
+ private void updateStatsPanelIfVisible()
+ {
+ int index = inputTabbedPane.getSelectedIndex();
+ if (index < 0) return;
+ if (inputTabbedPane.getComponent(index) == statsPanel) {
+ statsPanel.refresh();
+ }
+ }
+
+ private void updateGeometry() {
+ testCasePanel.relatePanel.clearResults();
+ testCasePanel.setTestCase(currentCase());
+ updateWktPanel();
+ }
+
+ private void updateWktPanel() {
+ Geometry g0 = tbModel.getGeometryEditModel().getGeometry(0);
+ wktPanel.setText(g0, 0);
+ Geometry g1 = tbModel.getGeometryEditModel().getGeometry(1);
+ wktPanel.setText(g1, 1);
+ }
+
+ private void updatePrecisionModelDescription() {
+ testCasePanel.setPrecisionModelDescription(tbModel.getPrecisionModel().toString());
+ }
+
+ public void updateTestCaseView() {
+ testCasePanel.setTestCase(currentCase());
+ getTestCasePanel().setCurrentTestCaseIndex(tbModel.getCurrentCaseIndex() + 1);
+ getTestCasePanel().setMaxTestCaseIndex(tbModel.getCasesSize());
+ updateWktPanel();
+ updateStatsPanelIfVisible();
+ }
+
+ public void displayInfo(Coordinate modelPt)
+ {
+ displayInfo(
+ testCasePanel.getGeometryEditPanel().getInfo(modelPt)
+ );
+ }
+
+ public void displayInfo(String s)
+ {
+ displayInfo(s, true);
+ }
+
+ public void displayInfo(String s, boolean showTab)
+ {
+ logPanel.addInfo(s);
+ if (showTab) showInfoTab();
+ }
+
+ private void reportProblemsParsingXmlTestFile(List parsingProblems) {
+ if (parsingProblems.isEmpty()) {
+ return;
+ }
+ for (Iterator i = parsingProblems.iterator(); i.hasNext(); ) {
+ String problem = (String) i.next();
+ System.out.println(problem);
+ }
+ JOptionPane.showMessageDialog(this, StringUtil.wrap(parsingProblems.size()
+ + " problems occurred parsing the XML test file."
+ + " The first problem was: " + parsingProblems.get(0), 80),
+ "Error", JOptionPane.ERROR_MESSAGE);
+ }
+
+ void menuRemoveDuplicatePoints_actionPerformed(ActionEvent e) {
+ CleanDuplicatePoints clean = new CleanDuplicatePoints();
+ Geometry cleanGeom = clean.clean(tbModel.getGeometryEditModel().getGeometry(0));
+ currentCase().setGeometry(0, cleanGeom);
+ updateGeometry();
+ }
+
+ void menuChangeToLines_actionPerformed(ActionEvent e) {
+ Geometry cleanGeom = LinearComponentExtracter.getGeometry(tbModel.getGeometryEditModel().getGeometry(0));
+ currentCase().setGeometry(0, cleanGeom);
+ updateGeometry();
+ }
+
+ void btnEditVertex_actionPerformed(ActionEvent e) {
+ testCasePanel.getGeometryEditPanel().setCurrentTool(EditVertexTool.getInstance());
+ }
+
+ private Coordinate pickOffset(Geometry a, Geometry b) {
+ if (a != null && ! a.isEmpty()) {
+ return a.getCoordinates()[0];
+ }
+ if (b != null && ! b.isEmpty()) {
+ return b.getCoordinates()[0];
+ }
+ return null;
+ }
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderMenuBar.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderMenuBar.java
new file mode 100644
index 0000000..4856934
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderMenuBar.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.*;
+
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.model.DisplayParameters;
+
+public class JTSTestBuilderMenuBar
+{
+ JMenuBar jMenuBar1 = new JMenuBar();
+ JMenu jMenuFile = new JMenu();
+ JMenu jMenuHelp = new JMenu();
+ JMenuItem jMenuAbout = new JMenuItem();
+ JMenu jMenuView = new JMenu();
+ JMenuItem jMenuFileExit = new JMenuItem();
+ JMenu jMenuEdit = new JMenu();
+ //JMenu jMenuTools = new JMenu();
+ //JMenu jMenuOptions = new JMenu();
+ JMenuItem menuExchangeGeom = new JMenuItem();
+ JMenuItem menuViewText = new JMenuItem();
+ JMenuItem menuViewGeometry = new JMenuItem();
+ JMenuItem menuLoadXmlTestFile = new JMenuItem();
+ JMenuItem saveAsXmlMenuItem = new JMenuItem();
+ JMenuItem saveAsHtmlMenuItem = new JMenuItem();
+ JMenuItem saveAsPNGMenuItem = new JMenuItem();
+ JMenuItem saveToClipboardMenuItem = new JMenuItem();
+ JMenuItem deleteAllTestCasesMenuItem = new JMenuItem();
+ JCheckBoxMenuItem showVerticesMenuItem = new JCheckBoxMenuItem();
+ JCheckBoxMenuItem showGridMenuItem = new JCheckBoxMenuItem();
+ JCheckBoxMenuItem showOrientationsMenuItem = new JCheckBoxMenuItem();
+ JCheckBoxMenuItem showStructureMenuItem = new JCheckBoxMenuItem();
+ JCheckBoxMenuItem showVertexIndicesMenuItem = new JCheckBoxMenuItem();
+ JMenuItem menuLoadXmlTestFolder = new JMenuItem();
+ JMenuItem precisionModelMenuItem = new JMenuItem();
+ JMenuItem removeDuplicatePoints = new JMenuItem();
+ JMenuItem changeToLines = new JMenuItem();
+ private JMenuItem generateExpectedValuesMenuItem = new JMenuItem();
+
+ JTSTestBuilderFrame tbFrame;
+
+ public JTSTestBuilderMenuBar(JTSTestBuilderFrame tbFrame)
+ {
+ this.tbFrame = tbFrame;
+ }
+
+ public JMenuBar getMenuBar()
+ {
+ jMenuAbout.setText("About");
+ jMenuAbout.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.jMenuHelpAbout_actionPerformed(e);
+ }
+ });
+
+ jMenuFileExit.setText("Exit");
+ jMenuFileExit.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.jMenuFileExit_actionPerformed(e);
+ }
+ });
+ menuExchangeGeom.setText("Exchange Geometries");
+ menuExchangeGeom.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuExchangeGeom_actionPerformed(e);
+ }
+ });
+ menuViewText.setText("Test Case Text...");
+ menuViewText.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuViewText_actionPerformed(e);
+ }
+ });
+ menuViewGeometry.setText("Geometry Inspector...");
+ menuViewGeometry.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.actionInspectGeometry();
+ }
+ });
+ menuLoadXmlTestFile.setText("Open XML File(s)...");
+ menuLoadXmlTestFile.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuLoadXmlTestFile_actionPerformed(e);
+ }
+ });
+ saveAsXmlMenuItem.setText("Save As XML...");
+ saveAsXmlMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuSaveAsXml_actionPerformed(e);
+ }
+ });
+ saveAsHtmlMenuItem.setText("Save As HTML...");
+ saveAsHtmlMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuSaveAsHtml_actionPerformed(e);
+ }
+ });
+ saveAsPNGMenuItem.setText("Save As PNG...");
+ saveAsPNGMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuSaveAsPNG_actionPerformed(e);
+ }
+ });
+ saveToClipboardMenuItem.setText("Save Screen To Clipboard");
+ saveToClipboardMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuSaveScreenToClipboard_actionPerformed(e);
+ }
+ });
+ deleteAllTestCasesMenuItem.setText("Delete All Test Cases");
+ deleteAllTestCasesMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.deleteAllTestCasesMenuItem_actionPerformed(e);
+ }
+ });
+ showVerticesMenuItem.setText("Vertices");
+ showVerticesMenuItem.setSelected(true);
+ showVerticesMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setShowingVertices(showVerticesMenuItem.isSelected());
+ }
+ });
+
+ final JMenuItem showLabelMenuItem = menuItemCheck("Labels", true,
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setShowingLabel(((JMenuItem)e.getSource()).isSelected());
+ }
+ });
+ final JMenuItem basicFillMenuItem = menuItemRadio("Basic Fill", true,
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setFillType(DisplayParameters.FILL_BASIC);
+ }
+ });
+ final JMenuItem varyFillMenuItem = menuItemRadio("Varying Fill", false,
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setFillType(DisplayParameters.FILL_VARY);
+ }
+ });
+ final JMenuItem rainbowFillMenuItem = menuItemRadio("Rainbow Fill", false,
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setFillType(DisplayParameters.FILL_RAINBOW);
+ }
+ });
+ final JMenuItem rainbowRandomFillMenuItem = menuItemRadio("Random Rainbow Fill", false,
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setFillType(DisplayParameters.FILL_RAINBOW_RANDOM);
+ }
+ });
+ showGridMenuItem.setText("Grid");
+ showGridMenuItem.setSelected(true);
+ showGridMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.setShowingGrid(showGridMenuItem.isSelected());
+ }
+ });
+ showStructureMenuItem.setText("Geometry Structure");
+ showStructureMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setShowingStructure(showStructureMenuItem.isSelected());
+ }
+ });
+ showOrientationsMenuItem.setText("Orientations");
+ showOrientationsMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setShowingOrientations(showOrientationsMenuItem.isSelected());
+ }
+ });
+ showVertexIndicesMenuItem.setText("Vertex Indices");
+ showVertexIndicesMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.setShowingVertices(showVerticesMenuItem.isSelected());
+ }
+ });
+ menuLoadXmlTestFolder.setText("Open XML Folder(s)...");
+ menuLoadXmlTestFolder.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuLoadXmlTestFolder_actionPerformed(e);
+ }
+ });
+ precisionModelMenuItem.setText("Precision Model...");
+ precisionModelMenuItem.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.precisionModelMenuItem_actionPerformed(e);
+ }
+ });
+ removeDuplicatePoints.setText("Remove Duplicate Points");
+ removeDuplicatePoints.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuRemoveDuplicatePoints_actionPerformed(e);
+ }
+ });
+ changeToLines.setText("Change to Lines");
+ changeToLines.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.menuChangeToLines_actionPerformed(e);
+ }
+ });
+ generateExpectedValuesMenuItem.setText("Generate Expected Values");
+ generateExpectedValuesMenuItem.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ //generateExpectedValuesMenuItem_actionPerformed(e);
+ }
+ });
+ jMenuFile.setText("File");
+ //jMenuOptions.setText("Options");
+ //jMenuTools.setText("Tools");
+
+ ButtonGroup fillGroup = new ButtonGroup();
+ fillGroup.add(basicFillMenuItem);
+ fillGroup.add(varyFillMenuItem);
+ fillGroup.add(rainbowFillMenuItem);
+ fillGroup.add(rainbowRandomFillMenuItem);
+ basicFillMenuItem.setSelected(true);
+
+ jMenuFile.add(menuLoadXmlTestFile);
+ jMenuFile.add(menuLoadXmlTestFolder);
+ jMenuFile.add(saveAsPNGMenuItem);
+ jMenuFile.add(saveToClipboardMenuItem);
+ jMenuFile.add(saveAsXmlMenuItem);
+ //jMenuFile.add(saveAsHtmlMenuItem);
+ //jMenuFile.add(generateExpectedValuesMenuItem);
+ jMenuFile.addSeparator();
+ jMenuFile.add(jMenuFileExit);
+ //==========================
+
+ jMenuHelp.setText("Help");
+ jMenuHelp.add(jMenuAbout);
+ //==========================
+ jMenuView.setText("View");
+ jMenuView.add(showVerticesMenuItem);
+ //jMenuOptions.add(showVertexIndicesMenuItem);
+ jMenuView.add(showStructureMenuItem);
+ jMenuView.add(showOrientationsMenuItem);
+ jMenuView.add(showLabelMenuItem);
+
+ jMenuView.addSeparator();
+ jMenuView.add(basicFillMenuItem);
+ jMenuView.add(varyFillMenuItem);
+ jMenuView.add(rainbowFillMenuItem);
+ jMenuView.add(rainbowRandomFillMenuItem);
+
+ jMenuView.addSeparator();
+ jMenuView.add(showGridMenuItem);
+
+ jMenuView.addSeparator();
+ jMenuView.add(menuViewText);
+ jMenuView.add(menuViewGeometry);
+ //==========================
+ jMenuEdit.setText("Edit");
+ jMenuEdit.add(deleteAllTestCasesMenuItem);
+ jMenuEdit.add(menuExchangeGeom);
+ jMenuEdit.addSeparator();
+ jMenuEdit.add(precisionModelMenuItem);
+ jMenuEdit.addSeparator();
+ jMenuEdit.add(removeDuplicatePoints);
+ jMenuEdit.add(changeToLines);
+
+ jMenuBar1.add(jMenuFile);
+ jMenuBar1.add(jMenuView);
+ jMenuBar1.add(jMenuEdit);
+ //jMenuBar1.add(jMenuOptions);
+ //jMenuBar1.add(jMenuTools);
+ jMenuBar1.add(jMenuHelp);
+
+ return jMenuBar1;
+ }
+
+ JMenuItem menuItemCheck(String name, boolean init) {
+ return createMenuItemSelectable(new JCheckBoxMenuItem(), name, init, null);
+ }
+ JMenuItem menuItemCheck(String name, boolean init, ActionListener listener) {
+ return createMenuItemSelectable(new JCheckBoxMenuItem(), name, init, listener);
+ }
+ JMenuItem menuItemRadio(String name, boolean init) {
+ return createMenuItemSelectable(new JRadioButtonMenuItem(), name, init, null);
+ }
+ JMenuItem menuItemRadio(String name, boolean init, ActionListener listener) {
+ return createMenuItemSelectable(new JRadioButtonMenuItem(), name, init, listener);
+ }
+
+ JMenuItem createMenuItemSelectable(JMenuItem item, String name, boolean init, ActionListener listener) {
+ item.setText(name);
+ item.setSelected(init);
+ if (listener != null) {
+ item.addActionListener(listener);
+ }
+ return item;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderToolBar.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderToolBar.java
new file mode 100644
index 0000000..207e5dd
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilderToolBar.java
@@ -0,0 +1,540 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JToggleButton;
+import javax.swing.JToolBar;
+import javax.swing.SwingConstants;
+
+public class JTSTestBuilderToolBar {
+
+
+ JTSTestBuilderFrame tbFrame;
+
+ JToolBar jToolBar1 = new JToolBar();
+ JButton previousButton = new JButton();
+ JButton nextButton = new JButton();
+ JButton newButton = new JButton();
+ JButton copyButton = new JButton();
+ JButton deleteButton = new JButton();
+ JButton exchangeButton = new JButton();
+
+ JButton oneToOneButton = new JButton();
+ JButton zoomToFullExtentButton = new JButton();
+ JButton zoomToInputButton = new JButton();
+ JButton zoomToInputAButton = new JButton();
+ JButton zoomToInputBButton = new JButton();
+ JButton zoomToResultButton = new JButton();
+
+ JToggleButton drawRectangleButton = new JToggleButton();
+ JToggleButton drawPolygonButton = new JToggleButton();
+ JToggleButton drawLineStringButton = new JToggleButton();
+ JToggleButton drawPointButton = new JToggleButton();
+ JToggleButton zoomButton = new JToggleButton();
+ JToggleButton infoButton = new JToggleButton();
+ JToggleButton panButton = new JToggleButton();
+ JToggleButton btnEditVertex = new JToggleButton();
+ JToggleButton extractComponentButton;
+ ButtonGroup toolButtonGroup = new ButtonGroup();
+
+ private final ImageIcon leftIcon = new ImageIcon(this.getClass().getResource("Left.png"));
+ private final ImageIcon rightIcon = new ImageIcon(this.getClass().getResource("Right.png"));
+ private final ImageIcon plusIcon = new ImageIcon(this.getClass().getResource("Plus.png"));
+ private final ImageIcon copyCaseIcon = new ImageIcon(this.getClass().getResource("CopyCase.png"));
+ private final ImageIcon deleteIcon = new ImageIcon(this.getClass().getResource("Delete.png"));
+ private final ImageIcon zoomIcon = new ImageIcon(this.getClass().getResource("MagnifyCursor.gif"));
+ private final ImageIcon drawRectangleIcon = new ImageIcon(this.getClass().getResource("DrawRectangle.png"));
+ private final ImageIcon drawRectangleBIcon = new ImageIcon(this.getClass().getResource("DrawRectangleB.png"));
+ private final ImageIcon drawPolygonIcon = new ImageIcon(this.getClass().getResource("DrawPolygon.png"));
+ private final ImageIcon drawPolygonBIcon = new ImageIcon(this.getClass().getResource("DrawPolygonB.png"));
+ private final ImageIcon drawLineStringIcon = new ImageIcon(this.getClass().getResource("DrawLineString.png"));
+ private final ImageIcon drawLineStringBIcon = new ImageIcon(this.getClass().getResource("DrawLineStringB.png"));
+ private final ImageIcon drawPointIcon = new ImageIcon(this.getClass().getResource("DrawPoint.png"));
+ private final ImageIcon drawPointBIcon = new ImageIcon(this.getClass().getResource("DrawPointB.png"));
+ private final ImageIcon infoIcon = new ImageIcon(this.getClass().getResource("Info.png"));
+ private final ImageIcon zoomOneToOneIcon = new ImageIcon(this.getClass().getResource("ZoomOneToOne.png"));
+ private final ImageIcon zoomToInputIcon = new ImageIcon(this.getClass().getResource("ZoomInput.png"));
+ private final ImageIcon zoomToInputAIcon = new ImageIcon(this.getClass().getResource("ZoomInputA.png"));
+ private final ImageIcon zoomToInputBIcon = new ImageIcon(this.getClass().getResource("ZoomInputB.png"));
+ private final ImageIcon zoomToResultIcon = new ImageIcon(this.getClass().getResource("ZoomResult.png"));
+ private final ImageIcon zoomToFullExtentIcon = new ImageIcon(this.getClass().getResource("ZoomAll.png"));
+ private final ImageIcon selectIcon = new ImageIcon(this.getClass().getResource("Select.gif"));
+ private final ImageIcon moveVertexIcon = new ImageIcon(this.getClass().getResource("MoveVertex.png"));
+ private final ImageIcon panIcon = new ImageIcon(this.getClass().getResource("Hand.gif"));
+
+
+ public JTSTestBuilderToolBar(JTSTestBuilderFrame tbFrame)
+ {
+ this.tbFrame = tbFrame;
+ }
+
+ public void clearToolButtons()
+ {
+ // this only works in JSE 1.6
+ // In 1.5, need to add an invisible button and select it
+ //toolButtonGroup.clearSelection();
+ }
+
+ public void unselectExtractComponentButton()
+ {
+ extractComponentButton.setSelected(false);
+ toolButtonGroup.setSelected(extractComponentButton.getModel(), false);
+ }
+
+ public JToolBar getToolBar()
+ {
+ jToolBar1.setFloatable(false);
+
+ /**--------------------------------------------------
+ * Buttons
+ * --------------------------------------------------
+ */
+ previousButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ previousButton.setMaximumSize(new Dimension(30, 30));
+ previousButton.setMinimumSize(new Dimension(30, 30));
+ previousButton.setPreferredSize(new Dimension(30, 30));
+ previousButton.setToolTipText(AppStrings.TIP_PREV);
+ previousButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ previousButton.setIcon(leftIcon);
+ previousButton.setMargin(new Insets(0, 0, 0, 0));
+ previousButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ previousButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ boolean isZoom = 0 == (e.getModifiers() & ActionEvent.CTRL_MASK);
+ tbFrame.moveToPrevCase(isZoom);
+ }
+ });
+
+ nextButton.setMargin(new Insets(0, 0, 0, 0));
+ nextButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ nextButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ nextButton.setMaximumSize(new Dimension(30, 30));
+ nextButton.setMinimumSize(new Dimension(30, 30));
+ nextButton.setPreferredSize(new Dimension(30, 30));
+ nextButton.setToolTipText(AppStrings.TIP_NEXT);
+ nextButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ nextButton.setIcon(rightIcon);
+ nextButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ boolean isZoom = 0 == (e.getModifiers() & ActionEvent.CTRL_MASK);
+ tbFrame.moveToNextCase(isZoom);
+ }
+ });
+
+ newButton.setMargin(new Insets(0, 0, 0, 0));
+ newButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ newButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ newButton.setMaximumSize(new Dimension(30, 30));
+ newButton.setMinimumSize(new Dimension(30, 30));
+ newButton.setPreferredSize(new Dimension(30, 30));
+ newButton.setToolTipText(AppStrings.TIP_CASE_ADD_NEW);
+ newButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ newButton.setIcon(plusIcon);
+ newButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.createNewCase();
+ }
+ });
+
+ copyButton.setMargin(new Insets(0, 0, 0, 0));
+ copyButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ copyButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ copyButton.setMaximumSize(new Dimension(30, 30));
+ copyButton.setMinimumSize(new Dimension(30, 30));
+ copyButton.setPreferredSize(new Dimension(30, 30));
+ copyButton.setToolTipText(AppStrings.TIP_CASE_DUP);
+ copyButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ copyButton.setIcon(copyCaseIcon);
+ copyButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.copyCase();
+ }
+ });
+
+ deleteButton.setMargin(new Insets(0, 0, 0, 0));
+ deleteButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ deleteButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ deleteButton.setMaximumSize(new Dimension(30, 30));
+ deleteButton.setMinimumSize(new Dimension(30, 30));
+ deleteButton.setPreferredSize(new Dimension(30, 30));
+ deleteButton.setToolTipText(AppStrings.TIP_CASE_DELETE);
+ deleteButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ deleteButton.setIcon(deleteIcon);
+ deleteButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.btnDeleteCase_actionPerformed(e);
+ }
+ });
+
+ drawRectangleButton.setMargin(new Insets(0, 0, 0, 0));
+ drawRectangleButton.setPreferredSize(new Dimension(30, 30));
+ drawRectangleButton.setIcon(drawRectangleIcon);
+ drawRectangleButton.setMinimumSize(new Dimension(30, 30));
+ drawRectangleButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ drawRectangleButton.setSelected(true);
+ drawRectangleButton.setToolTipText(AppStrings.TIP_DRAW_RECTANGLE);
+ drawRectangleButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ drawRectangleButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ drawRectangleButton.setMaximumSize(new Dimension(30, 30));
+ drawRectangleButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.drawRectangleButton_actionPerformed(e);
+ }
+ });
+
+ drawPolygonButton.setMargin(new Insets(0, 0, 0, 0));
+ drawPolygonButton.setPreferredSize(new Dimension(30, 30));
+ drawPolygonButton.setIcon(drawPolygonIcon);
+ drawPolygonButton.setMinimumSize(new Dimension(30, 30));
+ drawPolygonButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ drawPolygonButton.setSelected(true);
+ drawPolygonButton.setToolTipText(AppStrings.TIP_DRAW_POLY);
+ drawPolygonButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ drawPolygonButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ drawPolygonButton.setMaximumSize(new Dimension(30, 30));
+ drawPolygonButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.drawPolygonButton_actionPerformed(e);
+ }
+ });
+
+ drawLineStringButton.setMargin(new Insets(0, 0, 0, 0));
+ drawLineStringButton.setPreferredSize(new Dimension(30, 30));
+ drawLineStringButton.setIcon(drawLineStringIcon);
+ drawLineStringButton.setMinimumSize(new Dimension(30, 30));
+ drawLineStringButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ drawLineStringButton.setSelected(true);
+ drawLineStringButton.setToolTipText(AppStrings.TIP_DRAW_LINE);
+ drawLineStringButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ drawLineStringButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ drawLineStringButton.setMaximumSize(new Dimension(30, 30));
+ drawLineStringButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.drawLineStringButton_actionPerformed(e);
+ }
+ });
+ drawPointButton.setMargin(new Insets(0, 0, 0, 0));
+ drawPointButton.setPreferredSize(new Dimension(30, 30));
+ drawPointButton.setIcon(drawPointIcon);
+ drawPointButton.setMinimumSize(new Dimension(30, 30));
+ drawPointButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ drawPointButton.setSelected(true);
+ drawPointButton.setToolTipText(AppStrings.TIP_DRAW_POINT);
+ drawPointButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ drawPointButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ drawPointButton.setMaximumSize(new Dimension(30, 30));
+ drawPointButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.drawPointButton_actionPerformed(e);
+ }
+ });
+ infoButton.setMargin(new Insets(0, 0, 0, 0));
+ infoButton.setPreferredSize(new Dimension(30, 30));
+ infoButton.setIcon(infoIcon);
+ infoButton.setMinimumSize(new Dimension(30, 30));
+ infoButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ infoButton.setSelected(false);
+ infoButton.setToolTipText(AppStrings.TIP_INFO);
+ infoButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ infoButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ infoButton.setMaximumSize(new Dimension(30, 30));
+ infoButton.addActionListener(
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.infoButton_actionPerformed();
+ }
+ });
+ zoomButton.setMaximumSize(new Dimension(30, 30));
+ zoomButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.zoomInButton_actionPerformed(e);
+ }
+ });
+ zoomButton.setToolTipText(AppStrings.TIP_ZOOM);
+ zoomButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomButton.setFont(new java.awt.Font("Serif", 0, 10));
+ zoomButton.setMinimumSize(new Dimension(30, 30));
+ zoomButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomButton.setPreferredSize(new Dimension(30, 30));
+ zoomButton.setIcon(zoomIcon);
+ zoomButton.setMargin(new Insets(0, 0, 0, 0));
+
+ oneToOneButton.setMargin(new Insets(0, 0, 0, 0));
+ oneToOneButton.setIcon(zoomOneToOneIcon);
+ oneToOneButton.setPreferredSize(new Dimension(30, 30));
+ oneToOneButton.setMinimumSize(new Dimension(30, 30));
+ oneToOneButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ oneToOneButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.oneToOneButton_actionPerformed(e);
+ }
+ });
+ oneToOneButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ oneToOneButton.setToolTipText(AppStrings.TIP_ZOOM_1_1);
+ oneToOneButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ oneToOneButton.setMaximumSize(new Dimension(30, 30));
+
+ zoomToInputButton.setMargin(new Insets(0, 0, 0, 0));
+ zoomToInputButton.setIcon(zoomToInputIcon);
+ zoomToInputButton.setPreferredSize(new Dimension(30, 30));
+ zoomToInputButton.setMaximumSize(new Dimension(30, 30));
+ zoomToInputButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomToInputButton.setMinimumSize(new Dimension(30, 30));
+ zoomToInputButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ zoomToInputButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomToInputButton.setToolTipText("Zoom To Input");
+ zoomToInputButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.zoomToInputButton_actionPerformed(e);
+ }
+ });
+
+ zoomToInputAButton.setMargin(new Insets(0, 0, 0, 0));
+ zoomToInputAButton.setIcon(zoomToInputAIcon);
+ zoomToInputAButton.setPreferredSize(new Dimension(30, 30));
+ zoomToInputAButton.setMaximumSize(new Dimension(30, 30));
+ zoomToInputAButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomToInputAButton.setMinimumSize(new Dimension(30, 30));
+ zoomToInputAButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ zoomToInputAButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomToInputAButton.setToolTipText(AppStrings.TIP_ZOOM_TO_A);
+ zoomToInputAButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.zoomToInputA_actionPerformed(e);
+ }
+ });
+
+ zoomToInputBButton.setMargin(new Insets(0, 0, 0, 0));
+ zoomToInputBButton.setIcon(zoomToInputBIcon);
+ zoomToInputBButton.setPreferredSize(new Dimension(30, 30));
+ zoomToInputBButton.setMaximumSize(new Dimension(30, 30));
+ zoomToInputBButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomToInputBButton.setMinimumSize(new Dimension(30, 30));
+ zoomToInputBButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ zoomToInputBButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomToInputBButton.setToolTipText(AppStrings.TIP_ZOOM_TO_B);
+ zoomToInputBButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.zoomToInputB_actionPerformed(e);
+ }
+ });
+ zoomToInputButton.setMaximumSize(new Dimension(30, 30));
+
+ zoomToResultButton.setMargin(new Insets(0, 0, 0, 0));
+ zoomToResultButton.setIcon(zoomToResultIcon);
+ zoomToResultButton.setPreferredSize(new Dimension(30, 30));
+ zoomToResultButton.setMaximumSize(new Dimension(30, 30));
+ zoomToResultButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomToResultButton.setMinimumSize(new Dimension(30, 30));
+ zoomToResultButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ zoomToResultButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomToResultButton.setToolTipText(AppStrings.TIP_ZOOM_TO_RESULT);
+ zoomToResultButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.zoomToResult_actionPerformed(e);
+ }
+ });
+ zoomToResultButton.setMaximumSize(new Dimension(30, 30));
+
+ zoomToFullExtentButton.setMargin(new Insets(0, 0, 0, 0));
+ zoomToFullExtentButton.setIcon(zoomToFullExtentIcon);
+ zoomToFullExtentButton.setPreferredSize(new Dimension(30, 30));
+ zoomToFullExtentButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomToFullExtentButton.setMinimumSize(new Dimension(30, 30));
+ zoomToFullExtentButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ zoomToFullExtentButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomToFullExtentButton.setToolTipText(AppStrings.TIP_ZOOM_TO_FULL_EXTENT);
+ zoomToFullExtentButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.zoomToFullExtentButton_actionPerformed(e);
+ }
+ });
+ zoomToFullExtentButton.setMaximumSize(new Dimension(30, 30));
+
+ panButton.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.panButton_actionPerformed(e);
+ }
+ });
+ panButton.setMaximumSize(new Dimension(30, 30));
+ panButton.setFont(new java.awt.Font("SansSerif", 0, 10));
+ panButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ panButton.setToolTipText(AppStrings.TIP_PAN);
+ panButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ panButton.setMinimumSize(new Dimension(30, 30));
+ panButton.setIcon(panIcon);
+ panButton.setPreferredSize(new Dimension(30, 30));
+ panButton.setMargin(new Insets(0, 0, 0, 0));
+
+ btnEditVertex.setMaximumSize(new Dimension(30, 30));
+ btnEditVertex.setMinimumSize(new Dimension(30, 30));
+ btnEditVertex.setToolTipText(AppStrings.TIP_MOVE_VERTEX);
+ btnEditVertex.setIcon(moveVertexIcon);
+ btnEditVertex.setMargin(new Insets(0, 0, 0, 0));
+ btnEditVertex.setMnemonic('0');
+ btnEditVertex.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ tbFrame.btnEditVertex_actionPerformed(e);
+ }
+ });
+
+ extractComponentButton = createToggleButton(AppStrings.TIP_EXTRACT_COMPONENTS,
+ new ImageIcon(this.getClass().getResource("ExtractComponent.png")),
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e)
+ {
+ tbFrame.actionExtractComponentButton();
+ }
+ });
+
+ JToggleButton deleteVertexButton = createToggleButton(AppStrings.TIP_DELETE_VERTEX_COMPONENT,
+ new ImageIcon(this.getClass().getResource("DeleteVertex.png")),
+ new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e)
+ {
+ tbFrame.actionDeleteVertexButton();
+ }
+ });
+
+ toolButtonGroup.add(drawRectangleButton);
+ toolButtonGroup.add(drawPolygonButton);
+ toolButtonGroup.add(drawLineStringButton);
+ toolButtonGroup.add(drawPointButton);
+ toolButtonGroup.add(panButton);
+ toolButtonGroup.add(zoomButton);
+ toolButtonGroup.add(btnEditVertex);
+ toolButtonGroup.add(deleteVertexButton);
+ toolButtonGroup.add(infoButton);
+ toolButtonGroup.add(extractComponentButton);
+
+
+ jToolBar1.add(newButton, null);
+ jToolBar1.add(copyButton, null);
+ jToolBar1.add(previousButton, null);
+ jToolBar1.add(nextButton, null);
+
+ jToolBar1.add(Box.createHorizontalStrut(8), null);
+ jToolBar1.add(deleteButton, null);
+
+ jToolBar1.add(Box.createHorizontalStrut(8), null);
+ jToolBar1.add(exchangeButton, null);
+
+ jToolBar1.add(Box.createHorizontalStrut(8), null);
+
+ jToolBar1.add(oneToOneButton, null);
+ jToolBar1.add(zoomToInputAButton, null);
+ jToolBar1.add(zoomToInputBButton, null);
+ jToolBar1.add(zoomToInputButton, null);
+ jToolBar1.add(zoomToResultButton, null);
+ jToolBar1.add(zoomToFullExtentButton, null);
+
+ jToolBar1.add(Box.createHorizontalStrut(28), null);
+
+ jToolBar1.add(zoomButton, null);
+ jToolBar1.add(panButton, null);
+ jToolBar1.add(infoButton, null);
+ jToolBar1.add(extractComponentButton, null);
+
+ jToolBar1.add(Box.createHorizontalStrut(28), null);
+
+ jToolBar1.add(drawRectangleButton, null);
+ jToolBar1.add(drawPolygonButton, null);
+ jToolBar1.add(drawLineStringButton, null);
+ jToolBar1.add(drawPointButton, null);
+ jToolBar1.add(btnEditVertex, null);
+ jToolBar1.add(deleteVertexButton, null);
+
+ return jToolBar1;
+ }
+
+ public void setFocusGeometry(int index)
+ {
+ drawRectangleButton.setIcon(index == 0 ? drawRectangleIcon : drawRectangleBIcon);
+ drawPolygonButton.setIcon(index == 0 ? drawPolygonIcon : drawPolygonBIcon);
+ drawLineStringButton.setIcon(index == 0 ? drawLineStringIcon : drawLineStringBIcon);
+ drawPointButton.setIcon(index == 0 ? drawPointIcon : drawPointBIcon);
+ }
+
+ private static JToggleButton createToggleButton(String toolTipText,
+ ImageIcon icon,
+ java.awt.event.ActionListener actionListener)
+ {
+ JToggleButton btn = new JToggleButton();
+ btn.setMargin(new Insets(0, 0, 0, 0));
+ btn.setPreferredSize(new Dimension(30, 30));
+ btn.setIcon(icon);
+ btn.setMinimumSize(new Dimension(30, 30));
+ btn.setVerticalTextPosition(SwingConstants.BOTTOM);
+ btn.setSelected(false);
+ btn.setToolTipText(toolTipText);
+ btn.setHorizontalTextPosition(SwingConstants.CENTER);
+ btn.setFont(new java.awt.Font("SansSerif", 0, 10));
+ btn.setMaximumSize(new Dimension(30, 30));
+ btn.addActionListener(actionListener);
+ return btn;
+ }
+
+ private static JButton createButton(String toolTipText,
+ ImageIcon icon,
+ java.awt.event.ActionListener actionListener)
+ {
+ JButton btn = new JButton();
+ btn.setMargin(new Insets(0, 0, 0, 0));
+ btn.setPreferredSize(new Dimension(30, 30));
+ btn.setIcon(icon);
+ btn.setMinimumSize(new Dimension(30, 30));
+ btn.setVerticalTextPosition(SwingConstants.BOTTOM);
+ btn.setSelected(false);
+ btn.setToolTipText(toolTipText);
+ btn.setHorizontalTextPosition(SwingConstants.CENTER);
+ btn.setFont(new java.awt.Font("SansSerif", 0, 10));
+ btn.setMaximumSize(new Dimension(30, 30));
+ btn.addActionListener(actionListener);
+ return btn;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilder_AboutBox.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilder_AboutBox.java
new file mode 100644
index 0000000..f12b454
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/JTSTestBuilder_AboutBox.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.AWTEvent;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.locationtech.jts.*;
+
+
+/**
+ * @version 1.7
+ */
+public class JTSTestBuilder_AboutBox extends JDialog implements ActionListener {
+ JPanel panel1 = new JPanel();
+ JPanel panel2 = new JPanel();
+ JPanel insetsPanel1 = new JPanel();
+ JPanel insetsPanel2 = new JPanel();
+ JPanel insetsPanel3 = new JPanel();
+ JButton button1 = new JButton();
+ JLabel imageLabel = new JLabel();
+ JLabel label1 = new JLabel();
+ JLabel label2 = new JLabel();
+ JLabel label3 = new JLabel();
+ JLabel label4 = new JLabel();
+ JLabel labelJTS = new JLabel();
+ BorderLayout borderLayout1 = new BorderLayout();
+ BorderLayout borderLayout2 = new BorderLayout();
+ FlowLayout flowLayout1 = new FlowLayout();
+ GridLayout gridLayout1 = new GridLayout();
+ String product = "";
+ String version = "JTS Version " + JTSVersion.CURRENT_VERSION.toString();
+ String copyright = "";
+ String comments = "";
+
+ public JTSTestBuilder_AboutBox(Frame parent) {
+ super(parent);
+ enableEvents(AWTEvent.WINDOW_EVENT_MASK);
+ try {
+ jbInit();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ pack();
+ }
+
+ /**Component initialization*/
+ private void jbInit() throws Exception {
+ //imageLabel.setIcon(new ImageIcon(JTSTestFrame_AboutBox.class.getResource("[Your Image]")));
+ this.setTitle("About");
+ setResizable(false);
+ panel1.setLayout(borderLayout1);
+ panel2.setLayout(borderLayout2);
+ insetsPanel1.setLayout(flowLayout1);
+ insetsPanel2.setLayout(flowLayout1);
+ insetsPanel2.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ gridLayout1.setRows(5);
+ gridLayout1.setColumns(1);
+
+ labelJTS.setFont(new java.awt.Font("Dialog", 1, 16));
+ labelJTS.setForeground(Color.blue);
+ labelJTS.setText("JTS Topology Suite");
+
+ label1.setFont(new java.awt.Font("Dialog", 1, 20));
+ label1.setForeground(SystemColor.desktop);
+ label1.setText("Test Builder");
+
+ label2.setText(version);
+ label3.setText(copyright);
+ label4.setFont(new java.awt.Font("Dialog", 1, 12));
+ label4.setForeground(Color.blue);
+ label4.setText("");
+ insetsPanel3.setLayout(gridLayout1);
+ insetsPanel3.setBorder(BorderFactory.createEmptyBorder(10, 60, 10, 10));
+ button1.setText("Ok");
+ button1.addActionListener(this);
+ insetsPanel2.add(imageLabel, null);
+ panel2.add(insetsPanel2, BorderLayout.WEST);
+ this.getContentPane().add(panel1, null);
+ insetsPanel3.add(labelJTS, null);
+ insetsPanel3.add(label1, null);
+ insetsPanel3.add(label2, null);
+ insetsPanel3.add(label3, null);
+ insetsPanel3.add(label4, null);
+ panel2.add(insetsPanel3, BorderLayout.CENTER);
+ insetsPanel1.add(button1, null);
+ panel1.add(insetsPanel1, BorderLayout.SOUTH);
+ panel1.add(panel2, BorderLayout.NORTH);
+ }
+
+ /**Overridden so we can exit when window is closed*/
+ protected void processWindowEvent(WindowEvent e) {
+ if (e.getID() == WindowEvent.WINDOW_CLOSING) {
+ cancel();
+ }
+ super.processWindowEvent(e);
+ }
+
+ /**Close the dialog*/
+ void cancel() {
+ dispose();
+ }
+
+ /**Close the dialog on a button event*/
+ public void actionPerformed(ActionEvent e) {
+ if (e.getSource() == button1) {
+ cancel();
+ }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerCheckBoxList.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerCheckBoxList.java
new file mode 100644
index 0000000..dfe087d
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerCheckBoxList.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import javax.swing.*;
+import javax.swing.border.*;
+
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.model.Layer;
+
+
+import java.awt.*;
+import java.awt.event.*;
+
+public class LayerCheckBoxList extends JList {
+ protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
+
+ public LayerCheckBoxList(ListModel listModel) {
+ this();
+ setModel(listModel);
+ }
+
+ public LayerCheckBoxList() {
+ setCellRenderer(new CellRenderer());
+
+ addMouseListener(new MouseAdapter() {
+ public void mousePressed(MouseEvent e) {
+ int index = locationToIndex(e.getPoint());
+
+ if (index != -1) {
+ Layer lyr = (Layer) getModel().getElementAt(index);
+ lyr.setEnabled(! lyr.isEnabled());
+ repaint();
+ JTSTestBuilderController.geometryViewChanged();
+ }
+ }
+ });
+
+ setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ }
+
+ protected class CellRenderer implements ListCellRenderer
+ {
+ JCheckBox checkbox = new JCheckBox();
+
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ Layer lyr = (Layer) value;
+ checkbox.setBackground(isSelected ? getSelectionBackground()
+ : getBackground());
+ checkbox.setForeground(isSelected ? getSelectionForeground()
+ : getForeground());
+ checkbox.setSelected(lyr.isEnabled());
+ checkbox.setEnabled(isEnabled());
+ checkbox.setFont(getFont());
+ checkbox.setFocusPainted(false);
+ checkbox.setBorderPainted(true);
+ checkbox.setBorder(isSelected ? UIManager
+ .getBorder("List.focusCellHighlightBorder") : noFocusBorder);
+ checkbox.setText(lyr.getNameInfo());
+ return checkbox;
+ }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerControlList.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerControlList.java
new file mode 100644
index 0000000..e966739
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerControlList.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import javax.swing.*;
+import javax.swing.border.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellRenderer;
+
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.model.Layer;
+import org.locationtech.jtstest.testbuilder.model.LayerList;
+
+
+import java.awt.*;
+import java.awt.event.*;
+
+/**
+ * Experimental control panel for layers.
+ * Not currently used.
+ *
+ * @author Martin Davis
+ *
+ */
+public class LayerControlList extends JPanel
+{
+ protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
+
+ private JTable table;
+
+ class RadioButtonRenderer implements TableCellRenderer
+ {
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column)
+ {
+ if (value == null)
+ return null;
+ return (Component) value;
+ }
+ }
+
+ class CheckBoxRenderer implements TableCellRenderer
+ {
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column)
+ {
+ if (value == null)
+ return null;
+ return (Component) value;
+ }
+ }
+
+ class RadioButtonEditor extends DefaultCellEditor implements ItemListener
+ {
+ private JRadioButton button;
+
+ public RadioButtonEditor(JCheckBox checkBox)
+ {
+ super(checkBox);
+ }
+
+ public Component getTableCellEditorComponent(JTable table, Object value,
+ boolean isSelected, int row, int column)
+ {
+ if (value == null)
+ return null;
+ button = (JRadioButton) value;
+ button.addItemListener(this);
+ return (Component) value;
+ }
+
+ public Object getCellEditorValue()
+ {
+ button.removeItemListener(this);
+ return button;
+ }
+
+ public void itemStateChanged(ItemEvent e)
+ {
+ super.fireEditingStopped();
+ }
+ }
+
+ class CheckBoxEditor extends DefaultCellEditor implements ItemListener
+ {
+ private JCheckBox button;
+
+ public CheckBoxEditor(JCheckBox checkBox)
+ {
+ super(checkBox);
+ }
+
+ public Component getTableCellEditorComponent(JTable table, Object value,
+ boolean isSelected, int row, int column)
+ {
+ if (value == null)
+ return null;
+ button = (JCheckBox) value;
+ button.addItemListener(this);
+ return (Component) value;
+ }
+
+ public Object getCellEditorValue()
+ {
+ button.removeItemListener(this);
+ return button;
+ }
+
+ public void itemStateChanged(ItemEvent e)
+ {
+ super.fireEditingStopped();
+ }
+ }
+
+ public void addChangeListener(final JToggleButton cb, final int index)
+ {
+ cb.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent arg0)
+ {
+ enableUpdate(index, cb.isSelected());
+ }
+ });
+ }
+
+ public LayerControlList()
+ {
+ table = new JTable() {
+ public void tableChanged(TableModelEvent e)
+ {
+ super.tableChanged(e);
+ repaint();
+ }
+ };
+ Object[][] items = new Object[][] {
+ { new JRadioButton(), new JCheckBox(), "A" },
+ { new JRadioButton(), new JCheckBox(), "B" },
+ { new JRadioButton(), new JCheckBox(), "Result" } };
+ DefaultTableModel dm = new DefaultTableModel();
+ dm.setDataVector(items, new Object[] { "", "", "Layer" });
+
+ ButtonGroup group1 = new ButtonGroup();
+ group1.add((JRadioButton) dm.getValueAt(0, 0));
+ group1.add((JRadioButton) dm.getValueAt(1, 0));
+ group1.add((JRadioButton) dm.getValueAt(2, 0));
+
+ addChangeListener((JToggleButton) dm.getValueAt(0, 1), 0);
+ addChangeListener((JToggleButton) dm.getValueAt(1, 1), 1);
+ addChangeListener((JToggleButton) dm.getValueAt(2, 1), 2);
+
+ table.setModel(dm);
+ // table.setShowHorizontalLines(false);
+ // table.setShowVerticalLines(false);
+ table.setGridColor(SystemColor.control);
+ table.setBackground(SystemColor.control);
+
+ table.getColumnModel().getColumn(0)
+ .setCellRenderer(new RadioButtonRenderer());
+ table.getColumnModel().getColumn(0)
+ .setCellEditor(new RadioButtonEditor(new JCheckBox()));
+ table.getColumnModel().getColumn(1).setCellRenderer(new CheckBoxRenderer());
+ table.getColumnModel().getColumn(1)
+ .setCellEditor(new CheckBoxEditor(new JCheckBox()));
+
+ table.getColumnModel().getColumn(0).setMaxWidth(20);
+ table.getColumnModel().getColumn(1).setMaxWidth(20);
+ table.getColumnModel().getColumn(2).setMaxWidth(120);
+
+ // table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+ // JScrollPane scroll = new JScrollPane(table);
+
+ setLayout(new BorderLayout());
+ add(table, BorderLayout.CENTER);
+ }
+
+ public void populateList()
+ {
+ }
+
+ private void enableUpdate(int i, boolean isEnabled)
+ {
+ LayerList lyrList = JTSTestBuilderFrame.instance().getModel().getLayers();
+ Layer lyr = lyrList.getLayer(i);
+ lyr.setEnabled(isEnabled);
+ repaint();
+ JTSTestBuilderController.geometryViewChanged();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java
new file mode 100644
index 0000000..d1d1bd0
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.util.Iterator;
+
+import javax.swing.AbstractListModel;
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.testbuilder.model.Layer;
+import org.locationtech.jtstest.testbuilder.model.LayerList;
+import org.locationtech.jtstest.testbuilder.model.TestCaseEdit;
+
+
+/**
+ * @version 1.7
+ */
+public class LayerListPanel extends JPanel {
+ BorderLayout borderLayout1 = new BorderLayout();
+ private DefaultListModel listModel = new DefaultListModel();
+ JScrollPane jScrollPane1 = new JScrollPane();
+ LayerCheckBoxList list = new LayerCheckBoxList(listModel);
+ BorderLayout borderLayout2 = new BorderLayout();
+
+ public LayerListPanel() {
+ try {
+ uiInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ registerListSelectionListener();
+ }
+
+ private void uiInit() throws Exception {
+ setSize(200, 250);
+ setLayout(borderLayout2);
+ list.setBackground(SystemColor.control);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.setSelectionBackground(Color.GRAY);
+ add(jScrollPane1, BorderLayout.CENTER);
+ jScrollPane1.getViewport().add(list, null);
+ }
+
+ private void registerListSelectionListener() {
+ list.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ public void valueChanged(ListSelectionEvent e) {
+ if (list.getSelectedValue() == null)
+ return;
+//TODO: implement event logic }
+ }});
+ }
+
+ public void populateList() {
+ listModel.clear();
+ LayerList lyrList = JTSTestBuilderFrame.instance().getModel().getLayers();
+
+ for (int i = 0; i < lyrList.size(); i++) {
+ Layer lyr = lyrList.getLayer(i);
+ listModel.addElement(lyr);
+ }
+ }
+
+
+}
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LoadTestCasesDialog.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LoadTestCasesDialog.java
new file mode 100644
index 0000000..ff9ba42
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LoadTestCasesDialog.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.locationtech.jtstest.test.TestCaseList;
+
+
+/**
+ * MD - Probably obsolete
+ *
+ * @author
+ * @version 1.7
+ */
+public class LoadTestCasesDialog extends JDialog {
+ TestCaseList testCaseList; // if non-null, the instance created by this dialog
+ //==============================
+ JPanel panel1 = new JPanel();
+ BorderLayout borderLayout1 = new BorderLayout();
+ JPanel jPanel1 = new JPanel();
+ JButton btnCancel = new JButton();
+ JButton btnOk = new JButton();
+ JPanel jPanel2 = new JPanel();
+ JTextField txtClassname = new JTextField();
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+ JLabel jLabel1 = new JLabel();
+ JLabel jLabel2 = new JLabel();
+ JLabel jLabel3 = new JLabel();
+
+ public LoadTestCasesDialog(Frame frame, String title, boolean modal) {
+ super(frame, title, modal);
+ try {
+ jbInit();
+ pack();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ public LoadTestCasesDialog() {
+ this(null, "", false);
+ }
+
+ void jbInit() throws Exception {
+ panel1.setLayout(borderLayout1);
+ btnCancel.setText("Cancel");
+ btnCancel.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ btnCancel_actionPerformed(e);
+ }
+ });
+ btnOk.setText("Ok");
+ btnOk.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ btnOk_actionPerformed(e);
+ }
+ });
+ jPanel2.setLayout(gridBagLayout1);
+ jLabel1.setToolTipText("");
+ jLabel1.setText("Class name");
+ jPanel2.setPreferredSize(new Dimension(300, 21));
+ panel1.setPreferredSize(new Dimension(300, 200));
+ jLabel2.setFont(new java.awt.Font("Dialog", 2, 10));
+ jLabel2.setToolTipText("");
+ jLabel2.setText(
+ "Enter the fully-qualified classname of a class that extends TestCaseList.");
+ jLabel3.setFont(new java.awt.Font("Dialog", 2, 10));
+ jLabel3.setText("(E.g. \"com.vividsolutions.jtstest.testsuite.TestRelateAA\")");
+ txtClassname.setText("com.vividsolutions.jtstest.testsuite.TestRelatePP");
+ getContentPane().add(panel1);
+ panel1.add(jPanel1, BorderLayout.SOUTH);
+ jPanel1.add(btnOk, null);
+ jPanel1.add(btnCancel, null);
+ panel1.add(jPanel2, BorderLayout.CENTER);
+ jPanel2.add(
+ txtClassname,
+ new GridBagConstraints(
+ 1,
+ 0,
+ 1,
+ 1,
+ 1.0,
+ 0.0,
+ GridBagConstraints.WEST,
+ GridBagConstraints.BOTH,
+ new Insets(5, 5, 5, 5),
+ 0,
+ 0));
+ jPanel2.add(
+ jLabel1,
+ new GridBagConstraints(
+ 0,
+ 0,
+ 1,
+ 1,
+ 0.0,
+ 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 5, 0, 5),
+ 0,
+ 0));
+ jPanel2.add(
+ jLabel2,
+ new GridBagConstraints(
+ 1,
+ 1,
+ 1,
+ 1,
+ 0.0,
+ 0.0,
+ GridBagConstraints.WEST,
+ GridBagConstraints.NONE,
+ new Insets(0, 5, 0, 0),
+ 0,
+ 0));
+ jPanel2.add(
+ jLabel3,
+ new GridBagConstraints(
+ 1,
+ 2,
+ 1,
+ 1,
+ 0.0,
+ 0.0,
+ GridBagConstraints.WEST,
+ GridBagConstraints.NONE,
+ new Insets(0, 5, 0, 0),
+ 0,
+ 0));
+ }
+
+ void btnOk_actionPerformed(ActionEvent e) {
+ testCaseList = null;
+ String errMsg = null;
+ try {
+ Class cls = Class.forName(txtClassname.getText());
+ testCaseList = (TestCaseList) cls.newInstance();
+ } catch (ClassNotFoundException ex) {
+ errMsg = "This class cannot be found. Check that it is on your CLASSPATH";
+ // TODO: alert user to this error
+ } catch (IllegalAccessException ex) {
+ errMsg = "This class cannot be loaded. Check that it has public access";
+ } catch (Exception ex) {
+ errMsg = ex.getMessage();
+ }
+ if (errMsg != null) {
+ JOptionPane.showMessageDialog(
+ this,
+ errMsg,
+ "Class Load Error",
+ JOptionPane.ERROR_MESSAGE);
+ }
+ // TODO: check that class is a subclass of TestClassList
+ setVisible(false);
+ }
+
+ public TestCaseList getList() {
+ return testCaseList;
+ }
+
+ void btnCancel_actionPerformed(ActionEvent e) {
+ setVisible(false);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/PrecisionModelDialog.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/PrecisionModelDialog.java
new file mode 100644
index 0000000..62caf24
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/PrecisionModelDialog.java
@@ -0,0 +1,77 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+
+import org.locationtech.jts.geom.PrecisionModel;
+
+
+
+/**
+ * @version 1.7
+ */
+public class PrecisionModelDialog extends JDialog {
+ JPanel panel1 = new JPanel();
+ BorderLayout borderLayout1 = new BorderLayout();
+ PrecisionModelPanel precisionModelPanel = new PrecisionModelPanel();
+ JPanel jPanel1 = new JPanel();
+ JButton okButton = new JButton();
+
+ public PrecisionModelDialog(Frame frame, String title, boolean modal) {
+ super(frame, title, modal);
+ try {
+ jbInit();
+ pack();
+ }
+ catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ public PrecisionModelDialog() {
+ this(null, "", false);
+ }
+ void jbInit() throws Exception {
+ panel1.setLayout(borderLayout1);
+ okButton.setText("OK");
+ okButton.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ okButton_actionPerformed(e);
+ }
+ });
+ getContentPane().add(panel1);
+ panel1.add(precisionModelPanel, BorderLayout.CENTER);
+ panel1.add(jPanel1, BorderLayout.SOUTH);
+ jPanel1.add(okButton, null);
+ }
+
+ void okButton_actionPerformed(ActionEvent e) {
+ setVisible(false);
+ }
+
+ public PrecisionModel getPrecisionModel() {
+ return precisionModelPanel.getPrecisionModel();
+ }
+
+ public void setPrecisionModel(PrecisionModel precisionModel) {
+ precisionModelPanel.setPrecisionModel(precisionModel);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/PrecisionModelPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/PrecisionModelPanel.java
new file mode 100644
index 0000000..3582934
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/PrecisionModelPanel.java
@@ -0,0 +1,155 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+
+import java.awt.*;
+import javax.swing.*;
+
+import org.locationtech.jts.geom.PrecisionModel;
+
+import java.awt.event.*;
+
+
+/**
+ * @version 1.7
+ */
+public class PrecisionModelPanel extends JPanel {
+private PrecisionModel precisionModel;
+//============================================
+ JLabel jLabel1 = new JLabel();
+ JTextField txtScale = new JTextField();
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+ JLabel jLabel4 = new JLabel();
+ JRadioButton rbFixed = new JRadioButton();
+ JRadioButton rbFloating = new JRadioButton();
+ ButtonGroup btnGrpmodelType = new ButtonGroup();
+ private JRadioButton rbFloatingSingle = new JRadioButton();
+
+ public PrecisionModelPanel() {
+ try {
+ jbInit();
+ }
+ catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ void jbInit() throws Exception {
+ jLabel1.setToolTipText("");
+ jLabel1.setText("Scale");
+ this.setLayout(gridBagLayout1);
+ txtScale.setBackground(Color.white);
+ txtScale.setToolTipText("");
+ txtScale.setText("1.0");
+ txtScale.setHorizontalAlignment(SwingConstants.RIGHT);
+ this.setMinimumSize(new Dimension(300, 200));
+ this.setPreferredSize(new Dimension(300, 200));
+ this.setToolTipText("");
+ jLabel4.setForeground(SystemColor.desktop);
+ jLabel4.setToolTipText("");
+ jLabel4.setText("Set the Precision Model for all Test Cases");
+ rbFixed.setToolTipText(" * <li>FLOATING - represents full double precision floating point.\n" +
+ " * This is the default precision model used in JTS\n");
+ rbFixed.setText("Fixed");
+ rbFixed.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbFixed_actionPerformed(e);
+ }
+ });
+ rbFloating.setText("Floating (Double)");
+ rbFloating.setToolTipText("");
+ rbFloating.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbFloating_actionPerformed(e);
+ }
+ });
+ rbFloatingSingle.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbFloatingSingle_actionPerformed(e);
+ }
+ });
+ rbFloatingSingle.setToolTipText("");
+ rbFloatingSingle.setText("Floating (Single)");
+ this.add(jLabel1, new GridBagConstraints(0, 4, 1, 1, 0.2, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 2, 0, 2), 0, 0));
+ this.add(txtScale, new GridBagConstraints(1, 4, 1, 1, 1.0, 0.0
+ ,GridBagConstraints.SOUTHEAST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 5), 0, 0));
+ this.add(jLabel4, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 10, 0), 0, 0));
+ this.add(rbFixed, new GridBagConstraints(0, 3, 2, 1, 0.2, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 4, 0, 0), 0, 0));
+ this.add(rbFloating, new GridBagConstraints(0, 1, 2, 1, 0.2, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 4, 0, 0), 0, 0));
+ this.add(rbFloatingSingle, new GridBagConstraints(0, 2, 1, 1, 0.2, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 4, 0, 0), 0, 0));
+ btnGrpmodelType.add(rbFloating);
+ btnGrpmodelType.add(rbFixed);
+ btnGrpmodelType.add(rbFloatingSingle);
+ }
+
+ public void setPrecisionModel(PrecisionModel precisionModel)
+ {
+ this.precisionModel = precisionModel;
+ Object modelType = precisionModel.getType();
+ rbFixed.setSelected(modelType == PrecisionModel.FIXED);
+ rbFloating.setSelected(modelType == PrecisionModel.FLOATING);
+ rbFloatingSingle.setSelected(modelType == PrecisionModel.FLOATING_SINGLE);
+ if (modelType == PrecisionModel.FIXED) {
+ txtScale.setText(Double.toString(precisionModel.getScale()));
+ }
+ updateDisplay();
+ }
+
+ public PrecisionModel getPrecisionModel()
+ {
+ if (rbFloating.isSelected()) {
+ return new PrecisionModel();
+ }
+ if (rbFloatingSingle.isSelected()) {
+ return new PrecisionModel(PrecisionModel.FLOATING_SINGLE);
+ }
+ double scale = Double.parseDouble(txtScale.getText());
+ return new PrecisionModel(scale);
+ }
+
+ void updateDisplay()
+ {
+ if (isFloatingSelected()) {
+ txtScale.setEnabled(false);
+ txtScale.setForeground(Color.lightGray);
+ txtScale.setBackground(Color.lightGray);
+ }
+ else {
+ txtScale.setEnabled(true);
+ txtScale.setForeground(Color.black);
+ txtScale.setBackground(Color.white);
+ }
+ }
+
+ boolean isFloatingSelected()
+ {
+ return rbFloating.isSelected() || rbFloatingSingle.isSelected();
+ }
+ void rbFloating_actionPerformed(ActionEvent e) {
+ updateDisplay();
+ }
+
+ void rbFixed_actionPerformed(ActionEvent e) {
+ updateDisplay();
+ }
+ void rbFloatingSingle_actionPerformed(ActionEvent e) {
+ updateDisplay();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/RelatePanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/RelatePanel.java
new file mode 100644
index 0000000..e99c0ee
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/RelatePanel.java
@@ -0,0 +1,564 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+
+import java.awt.*;
+
+import javax.swing.*;
+
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jtstest.testbuilder.model.TestCaseEdit;
+
+
+/**
+ * @version 1.7
+ */
+public class RelatePanel extends JPanel {
+ TestCaseEdit testCase;
+ StringBuffer buf = new StringBuffer("X");
+ // buffer to turn chars into strings
+ //-------------------------------------
+ Border border1;
+ Border border2;
+ JPanel jPanel2 = new JPanel();
+ JLabel jLabel17 = new JLabel();
+ JLabel equalsAB = new JLabel();
+ JLabel jLabel16 = new JLabel();
+ JLabel containsBA = new JLabel();
+ JLabel jLabel15 = new JLabel();
+ JLabel containsAB = new JLabel();
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+ JLabel equalsBA = new JLabel();
+ JLabel jLabel6 = new JLabel();
+ JLabel jLabel5 = new JLabel();
+ JPanel predicates = new JPanel();
+ JLabel jLabel3 = new JLabel();
+ JLabel jLabel2 = new JLabel();
+ JLabel jLabel19 = new JLabel();
+ JLabel jLabel1 = new JLabel();
+ JLabel jLabel18 = new JLabel();
+ JLabel disjointAB = new JLabel();
+ JLabel disjointBA = new JLabel();
+ JLabel intersectsAB = new JLabel();
+ JLabel intersectsBA = new JLabel();
+ JLabel touchesAB = new JLabel();
+ JLabel touchesBA = new JLabel();
+ JLabel crossesAB = new JLabel();
+ JLabel crossesBA = new JLabel();
+ JLabel withinAB = new JLabel();
+ JLabel withinBA = new JLabel();
+ JLabel overlapsAB = new JLabel();
+ JLabel overlapsBA = new JLabel();
+ GridBagLayout gridBagLayout3 = new GridBagLayout();
+ JPanel jPanel3 = new JPanel();
+ JLabel relateIE = new JLabel();
+ JLabel relateIB = new JLabel();
+ GridBagLayout gridBagLayout2 = new GridBagLayout();
+ JPanel jPanel1 = new JPanel();
+ JLabel jLabel14 = new JLabel();
+ JLabel jLabel13 = new JLabel();
+ JLabel jLabel12 = new JLabel();
+ JLabel jLabel11 = new JLabel();
+ JLabel jLabel10 = new JLabel();
+ JTextField txtAB = new JTextField();
+ JLabel jLabel23 = new JLabel();
+ JLabel relateBI = new JLabel();
+ JLabel jLabel22 = new JLabel();
+ JLabel relateEI = new JLabel();
+ JLabel jLabel21 = new JLabel();
+ JLabel jLabel20 = new JLabel();
+ JLabel relateBE = new JLabel();
+ JLabel relateEE = new JLabel();
+ JTextField txtBA = new JTextField();
+ JLabel relateBB = new JLabel();
+ JLabel jLabel9 = new JLabel();
+ JLabel relateEB = new JLabel();
+ JLabel jLabel8 = new JLabel();
+ JLabel jLabel7 = new JLabel();
+ JLabel relateII = new JLabel();
+ TitledBorder titledBorder1;
+ JLabel tickCrossLabel = new JLabel();
+ GridBagLayout gridBagLayout4 = new GridBagLayout();
+ JPanel matrixPanel = new JPanel();
+ GridBagLayout gridBagLayout5 = new GridBagLayout();
+ Border border3;
+ private final ImageIcon tickIcon = new ImageIcon(this.getClass().getResource("tickShaded.gif"));
+ private final ImageIcon crossIcon = new ImageIcon(this.getClass().getResource("crossShaded.gif"));
+ private final ImageIcon clearIcon = new ImageIcon(this.getClass().getResource("clear.gif"));
+ private DocumentListener expectedImDocumentListener =
+ new DocumentListener() {
+
+ public void insertUpdate(DocumentEvent e) {
+ expectedIntersectionMatrixChanged();
+ }
+
+ public void removeUpdate(DocumentEvent e) {
+ expectedIntersectionMatrixChanged();
+ }
+
+ public void changedUpdate(DocumentEvent e) {
+ expectedIntersectionMatrixChanged();
+ }
+ };
+ private JLabel coversAB = new JLabel();
+ private JLabel coversBA = new JLabel();
+ private JLabel jLabel110 = new JLabel();
+ private JLabel jLabel111 = new JLabel();
+ private JLabel coveredByAB = new JLabel();
+ private JLabel coveredByBA = new JLabel();
+
+ public RelatePanel() {
+ try {
+ jbInit();
+ clearResults();
+ //expectedImTextField.getDocument().addDocumentListener(expectedImDocumentListener);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ public void setTestCase(TestCaseEdit testCase) {
+ this.testCase = testCase;
+ clearResults();
+ //expectedImTextField.setText(testCase.getExpectedIntersectionMatrix());
+ }
+
+ public void clearResults() {
+ equalsAB.setText("-");
+ equalsBA.setText("-");
+ disjointAB.setText("-");
+ disjointBA.setText("-");
+ intersectsAB.setText("-");
+ intersectsBA.setText("-");
+ touchesAB.setText("-");
+ touchesBA.setText("-");
+ crossesAB.setText("-");
+ crossesBA.setText("-");
+ withinAB.setText("-");
+ withinBA.setText("-");
+ containsAB.setText("-");
+ containsBA.setText("-");
+ overlapsAB.setText("-");
+ overlapsBA.setText("-");
+ coversAB.setText("-");
+ coversBA.setText("-");
+ coveredByAB.setText("-");
+ coveredByBA.setText("-");
+ relateII.setText("-");
+ relateIB.setText("-");
+ relateIE.setText("-");
+ relateBI.setText("-");
+ relateBB.setText("-");
+ relateBE.setText("-");
+ relateEI.setText("-");
+ relateEB.setText("-");
+ relateEE.setText("-");
+ txtAB.setText("");
+ txtBA.setText("");
+ tickCrossLabel.setIcon(clearIcon);
+ }
+
+ public void runTests() {
+ if (testCase.getGeometry(0) != null && testCase.getGeometry(1) != null) {
+ IntersectionMatrix im = testCase.getIM();
+ IntersectionMatrix imBA = new IntersectionMatrix(im);
+ //IntersectionMatrix expectedIm = new IntersectionMatrix(expectedImTextField.getText());
+ imBA.transpose();
+ setRelateLabel(relateII, im.get(Location.INTERIOR, Location.INTERIOR));
+ setRelateLabel(relateIB, im.get(Location.INTERIOR, Location.BOUNDARY));
+ setRelateLabel(relateIE, im.get(Location.INTERIOR, Location.EXTERIOR));
+ setRelateLabel(relateBI, im.get(Location.BOUNDARY, Location.INTERIOR));
+ setRelateLabel(relateBB, im.get(Location.BOUNDARY, Location.BOUNDARY));
+ setRelateLabel(relateBE, im.get(Location.BOUNDARY, Location.EXTERIOR));
+ setRelateLabel(relateEI, im.get(Location.EXTERIOR, Location.INTERIOR));
+ setRelateLabel(relateEB, im.get(Location.EXTERIOR, Location.BOUNDARY));
+ setRelateLabel(relateEE, im.get(Location.EXTERIOR, Location.EXTERIOR));
+ //tickCrossLabel.setIcon(im.matches(expectedIm.toString()) ? tickIcon : crossIcon);
+ txtAB.setText(im.toString());
+ txtBA.setText(imBA.toString());
+
+ setPredicate(equalsAB, im.isEquals(testCase.getGeometry(0).getDimension(),
+ testCase.getGeometry(1).getDimension()));
+ setPredicate(disjointAB, im.isDisjoint());
+ setPredicate(intersectsAB, im.isIntersects());
+ setPredicate(touchesAB, im.isTouches(testCase.getGeometry(0).getDimension(),
+ testCase.getGeometry(1).getDimension()));
+ setPredicate(crossesAB, im.isCrosses(testCase.getGeometry(0).getDimension(),
+ testCase.getGeometry(1).getDimension()));
+ setPredicate(withinAB, im.isWithin());
+ setPredicate(containsAB, im.isContains());
+ setPredicate(overlapsAB, im.isOverlaps(testCase.getGeometry(0).getDimension(),
+ testCase.getGeometry(1).getDimension()));
+ setPredicate(coversAB, im.isCovers());
+ setPredicate(coveredByAB, im.isCoveredBy());
+
+
+ setPredicate(equalsBA, imBA.isEquals(testCase.getGeometry(1).getDimension(),
+ testCase.getGeometry(0).getDimension()));
+ setPredicate(disjointBA, imBA.isDisjoint());
+ setPredicate(intersectsBA, imBA.isIntersects());
+ setPredicate(touchesBA, imBA.isTouches(testCase.getGeometry(1).getDimension(),
+ testCase.getGeometry(0).getDimension()));
+ setPredicate(crossesBA, imBA.isCrosses(testCase.getGeometry(1).getDimension(),
+ testCase.getGeometry(0).getDimension()));
+ setPredicate(withinBA, imBA.isWithin());
+ setPredicate(containsBA, imBA.isContains());
+ setPredicate(overlapsBA, imBA.isOverlaps(testCase.getGeometry(1).getDimension(),
+ testCase.getGeometry(0).getDimension()));
+ setPredicate(coversBA, imBA.isCovers());
+ setPredicate(coveredByBA, imBA.isCoveredBy());
+ }
+ }
+
+ void setRelateLabel(JLabel lbl, int imValue) {
+ buf.setCharAt(0, org.locationtech.jts.geom.Dimension.toDimensionSymbol(imValue));
+ lbl.setText(buf.toString());
+ }
+
+ void setPredicate(JLabel lbl, boolean b) {
+ String val = b ? "T" : "F";
+ lbl.setText(val);
+ }
+
+ void jbInit() throws Exception {
+ border1 = new TitledBorder(BorderFactory.createLineBorder(Color.gray, 1),
+ "Binary Predicates");
+ border2 = new TitledBorder(BorderFactory.createLineBorder(Color.gray, 1),
+ "Intersection Matrix");
+ titledBorder1 = new TitledBorder(BorderFactory.createLineBorder(Color.gray,
+ 1), "Intersection Matrix");
+ border3 = BorderFactory.createCompoundBorder(new TitledBorder(BorderFactory.createLineBorder(Color.gray,
+ 1), "Intersection Matrix"), BorderFactory.createEmptyBorder(0, 5, 0,
+ 5));
+ this.setLayout(gridBagLayout3);
+ this.setPreferredSize(new java.awt.Dimension(233, 100));
+ jLabel17.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel17.setForeground(Color.blue);
+ jLabel17.setText("Crosses");
+ equalsAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ equalsAB.setToolTipText("");
+ equalsAB.setText("-");
+ jLabel16.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel16.setForeground(Color.blue);
+ jLabel16.setToolTipText("");
+ jLabel16.setText("Within");
+ containsBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ containsBA.setText("-");
+ jLabel15.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel15.setForeground(Color.blue);
+ jLabel15.setToolTipText("");
+ jLabel15.setText("Touches");
+ containsAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ containsAB.setText("-");
+ equalsBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ equalsBA.setToolTipText("");
+ equalsBA.setText("-");
+ jLabel6.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel6.setText("BA");
+ jLabel5.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel5.setText("AB");
+ predicates.setLayout(gridBagLayout1);
+ predicates.setBorder(border1);
+ jLabel3.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel3.setForeground(Color.blue);
+ jLabel3.setToolTipText("");
+ jLabel3.setText("Intersects");
+ jLabel2.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel2.setForeground(Color.blue);
+ jLabel2.setToolTipText("");
+ jLabel2.setText("Disjoint");
+ jLabel19.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel19.setForeground(Color.blue);
+ jLabel19.setToolTipText("");
+ jLabel19.setText("Overlaps");
+ jLabel1.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel1.setForeground(Color.blue);
+ jLabel1.setText("Equals");
+ jLabel18.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel18.setForeground(Color.blue);
+ jLabel18.setToolTipText("");
+ jLabel18.setText("Contains");
+ disjointAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ disjointAB.setToolTipText("");
+ disjointAB.setText("-");
+ disjointBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ disjointBA.setText("-");
+ intersectsAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ intersectsAB.setText("-");
+ intersectsBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ intersectsBA.setText("-");
+ touchesAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ touchesAB.setText("-");
+ touchesBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ touchesBA.setText("-");
+ crossesAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ crossesAB.setText("-");
+ crossesBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ crossesBA.setText("-");
+ withinAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ withinAB.setText("-");
+ withinBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ withinBA.setText("-");
+ overlapsAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ overlapsAB.setText("-");
+ overlapsBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ overlapsBA.setText("-");
+ relateIE.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateIE.setText("F");
+ relateIB.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateIB.setText("F");
+ jPanel1.setLayout(gridBagLayout2);
+ jLabel14.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel14.setForeground(Color.blue);
+ jLabel14.setText("A");
+ jLabel13.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel13.setForeground(Color.blue);
+ jLabel13.setText("Ext");
+ jLabel12.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel12.setForeground(Color.blue);
+ jLabel12.setText("Bdy");
+ jLabel11.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel11.setForeground(Color.blue);
+ jLabel11.setToolTipText("");
+ jLabel11.setText("Int");
+ jLabel10.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel10.setForeground(Color.red);
+ jLabel10.setToolTipText("");
+ jLabel10.setText("Ext");
+ txtAB.setBackground(SystemColor.control);
+ txtAB.setFont(new java.awt.Font("Dialog", 0, 12));
+ txtAB.setMaximumSize(new java.awt.Dimension(100, 21));
+ txtAB.setMinimumSize(new java.awt.Dimension(100, 21));
+ txtAB.setPreferredSize(new java.awt.Dimension(100, 21));
+ txtAB.setToolTipText("");
+ txtAB.setEditable(false);
+ txtAB.setHorizontalAlignment(SwingConstants.LEFT);
+ jLabel23.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel23.setForeground(Color.red);
+ jLabel23.setText("B");
+ relateBI.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateBI.setText("F");
+ jLabel22.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel22.setForeground(Color.blue);
+ jLabel22.setToolTipText("");
+ jLabel22.setText("A");
+ relateEI.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateEI.setText("F");
+ jLabel21.setToolTipText("");
+ jLabel21.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel21.setForeground(Color.blue);
+ jLabel21.setToolTipText("");
+ jLabel21.setText("A");
+ jLabel20.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel20.setForeground(Color.red);
+ jLabel20.setToolTipText("");
+ jLabel20.setText("B");
+ relateBE.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateBE.setText("F");
+ relateEE.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateEE.setText("F");
+ txtBA.setBackground(SystemColor.control);
+ txtBA.setFont(new java.awt.Font("Dialog", 0, 12));
+ txtBA.setMaximumSize(new java.awt.Dimension(100, 21));
+ txtBA.setMinimumSize(new java.awt.Dimension(100, 21));
+ txtBA.setPreferredSize(new java.awt.Dimension(100, 21));
+ txtBA.setEditable(false);
+ txtBA.setHorizontalAlignment(SwingConstants.LEFT);
+ relateBB.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateBB.setText("F");
+ jLabel9.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel9.setForeground(Color.red);
+ jLabel9.setToolTipText("");
+ jLabel9.setText("Bdy");
+ relateEB.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateEB.setText("F");
+ jLabel8.setFont(new java.awt.Font("Dialog", 2, 12));
+ jLabel8.setForeground(Color.red);
+ jLabel8.setToolTipText("");
+ jLabel8.setText("Int");
+ jLabel7.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel7.setForeground(Color.red);
+ jLabel7.setText("B");
+ relateII.setBackground(Color.white);
+ relateII.setFont(new java.awt.Font("Dialog", 1, 12));
+ relateII.setText("F");
+ jPanel3.setLayout(gridBagLayout4);
+ jPanel3.setBorder(border3);
+ tickCrossLabel.setIcon(clearIcon);
+ matrixPanel.setLayout(gridBagLayout5);
+ coversAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ coversAB.setToolTipText("");
+ coversAB.setText("-");
+ coversBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ coversBA.setToolTipText("");
+ coversBA.setText("-");
+ jLabel110.setText("CoveredBy");
+ jLabel110.setToolTipText("");
+ jLabel110.setForeground(Color.blue);
+ jLabel110.setFont(new java.awt.Font("Dialog", 1, 12));
+ jLabel111.setText("Covers");
+ jLabel111.setToolTipText("");
+ jLabel111.setForeground(Color.blue);
+ jLabel111.setFont(new java.awt.Font("Dialog", 1, 12));
+ coveredByAB.setFont(new java.awt.Font("Dialog", 1, 12));
+ coveredByAB.setText("-");
+ coveredByBA.setFont(new java.awt.Font("Dialog", 1, 12));
+ coveredByBA.setText("-");
+ this.add(jPanel3, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+ GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ jPanel3.add(jPanel1, new GridBagConstraints(100, 100, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+ GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(jLabel8, new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 0, 5), 0, 0));
+ matrixPanel.add(jLabel9, new GridBagConstraints(5, 0, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 0, 5), 0, 0));
+ matrixPanel.add(jLabel10, new GridBagConstraints(6, 0, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 0, 5), 0, 0));
+ matrixPanel.add(jLabel11, new GridBagConstraints(2, 1, 2, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 5, 0, 5), 0, 0));
+ matrixPanel.add(jLabel12, new GridBagConstraints(3, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
+ matrixPanel.add(jLabel13, new GridBagConstraints(2, 3, 2, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 5, 0, 5), 0, 0));
+ matrixPanel.add(jLabel14, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ matrixPanel.add(relateII, new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateIB, new GridBagConstraints(5, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateIE, new GridBagConstraints(6, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateBI, new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateBB, new GridBagConstraints(5, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateBE, new GridBagConstraints(6, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateEI, new GridBagConstraints(4, 3, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateEB, new GridBagConstraints(5, 3, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(relateEE, new GridBagConstraints(6, 3, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ matrixPanel.add(jLabel7, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 0), 0, 0));
+ jPanel1.add(txtBA, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
+ jPanel1.add(jLabel22, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
+ jPanel1.add(jLabel23, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ jPanel1.add(tickCrossLabel, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0,
+ 0, 0), 0, 0));
+ jPanel1.add(jLabel20, new GridBagConstraints(1, 0, 1, 2, 0.0, 0.0
+ ,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 2, 0, 3), 0, 0));
+ jPanel1.add(jLabel21, new GridBagConstraints(0, 0, 1, 2, 0.0, 0.0
+ ,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ jPanel1.add(txtAB, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+ jPanel3.add(matrixPanel, new GridBagConstraints(100, 110, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0,
+ 0, 0), 0, 0));
+ this.add(jPanel2, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.SOUTHWEST,
+ GridBagConstraints.BOTH, new Insets(0, -6, 0, 6), 0, 0));
+ jPanel2.add(predicates, null);
+ predicates.add(equalsAB, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(equalsBA, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(jLabel5, new GridBagConstraints(1, 0, 1, 1, 0.1, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 5, 0, 5), 0, 0));
+ predicates.add(jLabel6, new GridBagConstraints(2, 0, 1, 1, 0.1, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 5, 0, 5), 0, 0));
+ predicates.add(jLabel1, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(jLabel2, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(jLabel3, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 5, 0, 10), 0, 0));
+ predicates.add(jLabel15, new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(jLabel17, new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(jLabel16, new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(jLabel18, new GridBagConstraints(0, 7, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(containsAB, new GridBagConstraints(1, 7, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(containsBA, new GridBagConstraints(2, 7, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(disjointAB, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(disjointBA, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(intersectsAB, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(intersectsBA, new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(touchesAB, new GridBagConstraints(1, 4, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(touchesBA, new GridBagConstraints(2, 4, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(crossesAB, new GridBagConstraints(1, 5, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(crossesBA, new GridBagConstraints(2, 5, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(withinAB, new GridBagConstraints(1, 6, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(withinBA, new GridBagConstraints(2, 6, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(overlapsAB, new GridBagConstraints(1, 8, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(overlapsBA, new GridBagConstraints(2, 8, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(coversAB, new GridBagConstraints(1, 9, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(coversBA, new GridBagConstraints(2, 9, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(jLabel19, new GridBagConstraints(0, 8, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.SOUTHEAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(jLabel110, new GridBagConstraints(0, 10, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.SOUTHEAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(jLabel111, new GridBagConstraints(0, 9, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.SOUTHEAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
+ predicates.add(coveredByAB, new GridBagConstraints(1, 10, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ predicates.add(coveredByBA, new GridBagConstraints(2, 10, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ }
+
+
+ private void expectedIntersectionMatrixChanged() {
+ /*
+ if (expectedImTextField.getText().length() == 9) {
+ testCase.setExpectedIntersectionMatrix(expectedImTextField.getText());
+ }
+ */
+ }
+}
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ResultValuePanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ResultValuePanel.java
new file mode 100644
index 0000000..b96c157
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ResultValuePanel.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.model.*;
+import org.locationtech.jtstest.util.ExceptionFormatter;
+
+
+/**
+ * @version 1.7
+ */
+public class ResultValuePanel
+extends JPanel
+{
+ TestBuilderModel tbModel = null;
+ Object currResult = null;
+
+
+ JPanel labelPanel = new JPanel();
+ JLabel resultLabel = new JLabel();
+ BorderLayout labelPanelLayout = new BorderLayout();
+
+ JScrollPane jScrollPane1 = new JScrollPane();
+ JTextArea txtResult = new JTextArea();
+ BorderLayout tabPanelLayout = new BorderLayout();
+
+ public ResultValuePanel() {
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ void jbInit() throws Exception {
+
+ this.setLayout(tabPanelLayout);
+
+ txtResult.setWrapStyleWord(true);
+ txtResult.setLineWrap(true);
+ txtResult.setBackground(SystemColor.control);
+
+ labelPanel.setLayout(labelPanelLayout);
+ labelPanel.setBorder(BorderFactory.createEmptyBorder(0,4,2,2));
+ labelPanel.add(resultLabel);
+ resultLabel.setText("Value");
+
+ this.add(jScrollPane1, BorderLayout.CENTER);
+ this.add(labelPanel, BorderLayout.NORTH);
+
+ jScrollPane1.setBorder(BorderFactory.createLoweredBevelBorder());
+ jScrollPane1.getViewport().add(txtResult, null);
+ }
+
+ public void setModel(TestBuilderModel tbModel)
+ {
+ this.tbModel = tbModel;
+ }
+
+ public void setResult(String opName, String execTime, Object o)
+ {
+ currResult = o;
+ resultLabel.setText("Value of: " + opName
+ + " ( " + execTime + " )");
+
+ if (o == null) {
+ setString("");
+ }
+ else if (o instanceof Throwable) {
+ setError((Throwable) o);
+ }
+ else {
+ setString(o.toString());
+ }
+ }
+
+ public void setString(String s)
+ {
+ txtResult.setText(s);
+ txtResult.setBackground(SystemColor.control);
+ }
+
+ public void setError(Throwable ex)
+ {
+ String exStr = ExceptionFormatter.getFullString(ex);
+ txtResult.setText(exStr);
+ txtResult.setBackground(Color.pink);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ResultWKTPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ResultWKTPanel.java
new file mode 100644
index 0000000..0bcfe3f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ResultWKTPanel.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.util.*;
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.model.*;
+import org.locationtech.jtstest.testbuilder.ui.SwingUtil;
+import org.locationtech.jtstest.util.*;
+
+
+/**
+ * @version 1.7
+ */
+public class ResultWKTPanel
+extends JPanel
+{
+ TestBuilderModel tbModel = null;
+ String opName;
+
+ JScrollPane jScrollPane1 = new JScrollPane();
+ JTextArea txtResult = new JTextArea();
+
+ JPanel labelPanel = new JPanel();
+ JLabel functionLabel = new JLabel();
+ JLabel timeLabel = new JLabel();
+ JLabel memoryLabel = new JLabel();
+ GridLayout labelPanelLayout = new GridLayout(1,3);
+
+ JPanel rPanel = new JPanel();
+ JButton copyButton = new JButton();
+ JButton copyToTestButton = new JButton();
+ JPanel rButtonPanel = new JPanel();
+// FlowLayout rButtonPanelLayout = new FlowLayout();
+ GridLayout rButtonPanelLayout = new GridLayout();
+ BorderLayout rPanelLayout = new BorderLayout();
+ BorderLayout tabPanelLayout = new BorderLayout();
+
+ private final ImageIcon copyIcon = new ImageIcon(this.getClass().getResource("Copy.png"));
+ private final ImageIcon copyToTestIcon = new ImageIcon(this.getClass().getResource("CopyToTest.png"));
+ private final ImageIcon clearIcon = new ImageIcon(this.getClass().getResource("Delete_small.png"));
+
+ public ResultWKTPanel() {
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ void jbInit() throws Exception {
+
+ this.setLayout(tabPanelLayout);
+
+ jScrollPane1.setBorder(BorderFactory.createLoweredBevelBorder());
+
+ JButton copyButton = SwingUtil.createButton(copyIcon, "Copy Result (Ctl-click for formatted)",
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rCopyButton_actionPerformed(e);
+ }
+ });
+ JButton copyToTestButton = SwingUtil.createButton(copyToTestIcon, "Copy Result to new Test",
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderFrame.instance().copyResultToTest();
+ }
+ });
+ JButton btnClearResult = SwingUtil.createButton(clearIcon, "Clear Result",
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.clearResult();
+ }
+ });
+
+
+ rButtonPanelLayout = new GridLayout(3,1);
+ rButtonPanelLayout.setVgap(1);
+ rButtonPanelLayout.setHgap(1);
+ rButtonPanel.setLayout(rButtonPanelLayout);
+ rButtonPanel.add(copyButton);
+ rButtonPanel.add(copyToTestButton);
+ rButtonPanel.add(btnClearResult);
+
+ rPanel.setLayout(rPanelLayout);
+ rPanel.add(rButtonPanel, BorderLayout.NORTH);
+
+ txtResult.setWrapStyleWord(true);
+ txtResult.setLineWrap(true);
+ txtResult.setBackground(SystemColor.control);
+
+ labelPanel.setLayout(labelPanelLayout);
+ //labelPanel.setBorder(BorderFactory.createEmptyBorder(0,4,2,2));
+ labelPanel.add(functionLabel);
+ labelPanel.add(timeLabel);
+ labelPanel.add(memoryLabel);
+
+ functionLabel.setText(" ");
+ functionLabel.setHorizontalAlignment(SwingConstants.CENTER);
+// functionLabel.setBorder(BorderFactory.createLoweredBevelBorder());
+ functionLabel.setToolTipText("Result Info");
+
+ timeLabel.setFont(new Font("SanSerif", Font.BOLD, 16));
+ timeLabel.setText(" ");
+ timeLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+ timeLabel.setBorder(BorderFactory.createLoweredBevelBorder());
+ timeLabel.setToolTipText("Execution Time");
+
+ memoryLabel.setText(" ");
+ memoryLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+ memoryLabel.setBorder(BorderFactory.createLoweredBevelBorder());
+ memoryLabel.setToolTipText("JVM Memory Usage");
+
+ this.add(jScrollPane1, BorderLayout.CENTER);
+ this.add(labelPanel, BorderLayout.NORTH);
+ this.add(rPanel, BorderLayout.WEST);
+
+
+ jScrollPane1.getViewport().add(txtResult, null);
+
+ }
+
+ public void setModel(TestBuilderModel tbModel)
+ {
+ this.tbModel = tbModel;
+ }
+
+ public void setOpName(String opName)
+ {
+ this.opName = opName;
+ }
+
+ public void setRunningTime(String time)
+ {
+ setExecutedTime(time);
+ }
+
+ public void setExecutedTime(String time)
+ {
+ functionLabel.setText(opName);
+ timeLabel.setText(time);
+ memoryLabel.setText(Memory.usedTotalString());
+ }
+
+ public void updateResult()
+ {
+ Object o = tbModel.getResult();
+ if (o == null) {
+ setString("");
+ }
+ else if (o instanceof Geometry) {
+ setGeometry((Geometry) o);
+ }
+ else if (o instanceof Throwable) {
+ setError((Throwable) o);
+ }
+ else {
+ setString(o.toString());
+ }
+ }
+
+ public void clearResult()
+ {
+ functionLabel.setText("");
+ setString("");
+ }
+
+ private void setGeometry(Geometry g)
+ {
+ String str = tbModel.getResultDisplayString(g);
+ txtResult.setText(str);
+ txtResult.setBackground(SystemColor.control);
+ }
+
+ private void setString(String s)
+ {
+ txtResult.setText(s);
+ txtResult.setBackground(SystemColor.control);
+ }
+
+ private void setError(Throwable ex)
+ {
+ String exStr = ExceptionFormatter.getFullString(ex);
+ txtResult.setText(exStr);
+ txtResult.setBackground(Color.pink);
+ }
+
+ void rCopyButton_actionPerformed(ActionEvent e) {
+ boolean isFormatted = 0 != (e.getModifiers() & ActionEvent.CTRL_MASK);
+ tbModel.copyResult(isFormatted);
+ }
+
+ void copyToTestButton_actionPerformed(ActionEvent e) {
+ JTSTestBuilderFrame.instance().copyResultToTest();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ScalarFunctionPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ScalarFunctionPanel.java
new file mode 100644
index 0000000..776fe8e
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ScalarFunctionPanel.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.Vector;
+
+import javax.swing.*;
+import javax.swing.event.*;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.util.Stopwatch;
+import org.locationtech.jtstest.function.*;
+import org.locationtech.jtstest.geomfunction.GeometryFunction;
+import org.locationtech.jtstest.geomfunction.GeometryFunctionRegistry;
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.event.GeometryFunctionEvent;
+import org.locationtech.jtstest.testbuilder.event.GeometryFunctionListener;
+import org.locationtech.jtstest.testbuilder.event.SpatialFunctionPanelEvent;
+import org.locationtech.jtstest.testbuilder.event.SpatialFunctionPanelListener;
+import org.locationtech.jtstest.testbuilder.ui.SwingUtil;
+
+
+
+/**
+ * @version 1.7
+ */
+public class ScalarFunctionPanel
+extends JPanel
+{
+ private static final String[] PARAM_DEFAULT = { "10" };
+
+ JPanel panelRB = new JPanel();
+ GeometryFunctionTreePanel funcListPanel = new GeometryFunctionTreePanel();
+ GridLayout gridLayout1 = new GridLayout();
+ GridLayout gridLayout2 = new GridLayout();
+
+ BorderLayout borderLayout1 = new BorderLayout();
+ BorderLayout borderLayout2 = new BorderLayout();
+
+ JPanel panelParam = new JPanel();
+ JPanel panelExec = new JPanel();
+ JPanel panelExecParam = new JPanel();
+ FlowLayout flowLayout = new FlowLayout();
+ FlowLayout flowLayout1 = new FlowLayout();
+
+ JButton execButton = new JButton();
+
+ private transient Vector spatialFunctionPanelListeners;
+
+ private JLabel lblDistance = new JLabel();
+ private JTextField txtDistance = new JTextField();
+
+ private JComponent[] paramComp = { txtDistance };
+ private JLabel[] paramLabel = { lblDistance };
+
+ private GeometryFunction currentFunc = null;
+ private Stopwatch timer;
+
+ public ScalarFunctionPanel() {
+ try {
+ jbInit();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ void jbInit() throws Exception {
+ funcListPanel.populate(JTSTestBuilder.getFunctionRegistry().getCategorizedScalarFunctions());
+
+ this.setLayout(borderLayout1);
+ panelParam.setLayout(gridLayout2);
+ panelExec.setLayout(flowLayout);
+ panelExecParam.setLayout(borderLayout2);
+ panelRB.setLayout(gridLayout1);
+ gridLayout2.setRows(1);
+ gridLayout2.setColumns(2);
+
+ lblDistance.setText("Distance");
+
+ txtDistance.setMaximumSize(new Dimension(25, 2147483647));
+ txtDistance.setMinimumSize(new Dimension(25, 21));
+ txtDistance.setPreferredSize(new Dimension(25, 17));
+ txtDistance.setText("10");
+ txtDistance.setHorizontalAlignment(SwingConstants.RIGHT);
+
+ panelParam.add(lblDistance);
+ panelParam.add(txtDistance);
+
+ execButton.setText("Compute");
+ execButton.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ execButton_actionPerformed(e);
+ }
+ });
+
+ panelExec.add(execButton);
+
+ panelExecParam.add(panelExec, BorderLayout.NORTH);
+ panelExecParam.add(panelParam, BorderLayout.CENTER);
+
+ this.add(funcListPanel, BorderLayout.CENTER);
+ this.add(panelExecParam, BorderLayout.SOUTH);
+
+ GeometryFunctionListener gfListener = new GeometryFunctionListener() {
+ public void functionSelected(GeometryFunctionEvent e) {
+ functionChanged(e.getFunction());
+ }
+ public void functionInvoked(GeometryFunctionEvent e) {
+ execFunction(e.getFunction(), false);
+ }
+ };
+ funcListPanel.addGeometryFunctionListener(gfListener);
+ }
+
+ void execButton_actionPerformed(ActionEvent e) {
+ execFunction(funcListPanel.getFunction(), false); }
+
+ public void execFunction(GeometryFunction func, boolean createNew) {
+ currentFunc = func;
+ if (currentFunc == null)
+ return;
+ fireFunctionExecuted(new SpatialFunctionPanelEvent(this));
+ }
+
+ private void functionChanged(GeometryFunction func)
+ {
+ currentFunc = func;
+ SpatialFunctionPanel.updateParameters(func, paramComp, paramLabel);
+ execButton.setToolTipText( GeometryFunctionRegistry.functionDescriptionHTML(func) );
+ }
+
+ public Object getResult() {
+ Object result = null;
+ if (currentFunc == null || JTSTestBuilderController.getGeometryA() == null)
+ return null;
+
+ try {
+ timer = new Stopwatch();
+ result = currentFunc.invoke(JTSTestBuilderController.getGeometryA(), getFunctionParams());
+ timer.stop();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace(System.out);
+ result = ex;
+ }
+ return result;
+ }
+
+ private Object[] OLDgetFunctionParams()
+ {
+ // TODO: this is somewhat cheesy
+ Class[] paramTypes = currentFunc.getParameterTypes();
+ if (paramTypes.length == 1
+ && paramTypes[0] == Geometry.class)
+ return new Object[] { JTSTestBuilderController.getGeometryB() };
+
+ if (paramTypes.length == 1
+ && (paramTypes[0] == Double.class || paramTypes[0] == double.class))
+ return new Object[] { SwingUtil.getDouble(txtDistance, null) };
+
+ if (paramTypes.length == 2
+ && paramTypes[0] == Geometry.class
+ && (paramTypes[1] == Double.class || paramTypes[1] == double.class))
+ return new Object[] { JTSTestBuilderController.getGeometryB(), SwingUtil.getDouble(txtDistance, null) };
+
+ if (paramTypes.length >= 2)
+ return new Object[] {
+ SwingUtil.getDouble(txtDistance, null)
+ };
+
+ return null;
+ }
+
+ private Object[] getFunctionParams()
+ {
+ if (currentFunc == null) return null;
+ Class[] paramTypes = currentFunc.getParameterTypes();
+ Object[] paramVal = new Object[paramTypes.length];
+
+ for (int i = 0; i < paramVal.length; i++) {
+ Object valRaw = getParamValue(i);
+ paramVal[i] = SwingUtil.coerce(valRaw, paramTypes[i]);
+ }
+ return paramVal;
+ }
+
+ private Object getParamValue(int index) {
+ if (currentFunc.isBinary() && index == 0)
+ return JTSTestBuilderController.getGeometryB();
+
+ int attrIndex = index - SpatialFunctionPanel.attributeParamOffset(currentFunc);
+
+ switch (attrIndex) {
+ case 0: return SpatialFunctionPanel.valOrDefault(SwingUtil.value(txtDistance), PARAM_DEFAULT[0]);
+ }
+ return null;
+ }
+
+ public String getOpName() {
+ if (currentFunc == null)
+ return "";
+ return currentFunc.getName();
+ }
+
+ public Stopwatch getTimer()
+ {
+ return timer;
+ }
+
+ public synchronized void removeSpatialFunctionPanelListener(SpatialFunctionPanelListener l) {
+ if (spatialFunctionPanelListeners != null && spatialFunctionPanelListeners.contains(l)) {
+ Vector v = (Vector) spatialFunctionPanelListeners.clone();
+ v.removeElement(l);
+ spatialFunctionPanelListeners = v;
+ }
+ }
+
+ public synchronized void addSpatialFunctionPanelListener(SpatialFunctionPanelListener l) {
+ Vector v = spatialFunctionPanelListeners == null ? new Vector(2) : (Vector) spatialFunctionPanelListeners.clone();
+ if (!v.contains(l)) {
+ v.addElement(l);
+ spatialFunctionPanelListeners = v;
+ }
+ }
+
+ protected void fireFunctionExecuted(SpatialFunctionPanelEvent e) {
+ if (spatialFunctionPanelListeners != null) {
+ Vector listeners = spatialFunctionPanelListeners;
+ int count = listeners.size();
+ for (int i = 0; i < count; i++) {
+ ((SpatialFunctionPanelListener) listeners.elementAt(i)).functionExecuted(e);
+ }
+ }
+ }
+
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/SpatialFunctionPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/SpatialFunctionPanel.java
new file mode 100644
index 0000000..dd7f7b0
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/SpatialFunctionPanel.java
@@ -0,0 +1,467 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.border.EmptyBorder;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.util.Stopwatch;
+import org.locationtech.jtstest.geomfunction.BaseGeometryFunction;
+import org.locationtech.jtstest.geomfunction.GeometryFunction;
+import org.locationtech.jtstest.geomfunction.GeometryFunctionRegistry;
+import org.locationtech.jtstest.geomfunction.RepeaterGeometryFunction;
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.event.GeometryFunctionEvent;
+import org.locationtech.jtstest.testbuilder.event.GeometryFunctionListener;
+import org.locationtech.jtstest.testbuilder.event.SpatialFunctionPanelEvent;
+import org.locationtech.jtstest.testbuilder.event.SpatialFunctionPanelListener;
+import org.locationtech.jtstest.testbuilder.ui.SwingUtil;
+import org.locationtech.jtstest.util.ClassUtil;
+
+
+/**
+ * @version 1.7
+ */
+public class SpatialFunctionPanel
+extends JPanel
+{
+ private static final String[] PARAM_DEFAULT = { "10", "0", "0", "0", "0" };
+
+ private static String[] capStyleItems = new String[] { "Round", "Flat", "Square" };
+ private static Object[] capStyleValues = new Object[] {
+ new Integer(BufferParameters.CAP_ROUND),
+ new Integer(BufferParameters.CAP_FLAT),
+ new Integer(BufferParameters.CAP_SQUARE)
+ };
+ private static String[] joinStyleItems = new String[] { "Round", "Mitre", "Bevel" };
+ private static Object[] joinStyleValues = new Object[] {
+ new Integer(BufferParameters.JOIN_ROUND),
+ new Integer(BufferParameters.JOIN_MITRE),
+ new Integer(BufferParameters.JOIN_BEVEL)
+ };
+
+
+
+ JPanel panelRB = new JPanel();
+// GeometryFunctionListPanel geomFuncPanel = new GeometryFunctionListPanel();
+ GeometryFunctionTreePanel geomFuncPanel = new GeometryFunctionTreePanel();
+ GridLayout gridLayout1 = new GridLayout();
+ GridLayout gridLayout2 = new GridLayout();
+
+
+ BorderLayout borderLayout1 = new BorderLayout();
+ BorderLayout borderLayout2 = new BorderLayout();
+
+ JPanel panelParam = new JPanel();
+ JPanel panelExec = new JPanel();
+ JPanel panelExecParam = new JPanel();
+ FlowLayout flowLayout = new FlowLayout();
+ FlowLayout flowLayout1 = new FlowLayout();
+
+ JButton execButton = new JButton();
+ JButton execToNewButton = new JButton();
+
+ private final ImageIcon clearIcon = new ImageIcon(this.getClass().getResource("clear.gif"));
+
+ private transient Vector spatialFunctionPanelListeners;
+ private JPanel panelControl = new JPanel();
+ private JCheckBox displayAAndBCheckBox = new JCheckBox();
+ private JButton btnClearResult = new JButton();
+
+ private JLabel lblDistance = new JLabel();
+ private JTextField txtDistance = new JTextField();
+ private JLabel lblQuadSegs = new JLabel();
+ private JTextField txtQuadrantSegs = new JTextField();
+ private JLabel lblCapStyle = new JLabel();
+ private JComboBox cbCapStyle = new JComboBox();
+ private JLabel lblJoinStyle = new JLabel();
+ private JComboBox cbJoinStyle = new JComboBox();
+ private JLabel lblMitreLimit = new JLabel();
+ private JTextField txtMitreLimit = new JTextField();
+
+ private JComponent[] paramComp = { txtDistance, txtQuadrantSegs, cbCapStyle, cbJoinStyle, txtMitreLimit };
+ private JLabel[] paramLabel = { lblDistance, lblQuadSegs, lblCapStyle, lblJoinStyle, lblMitreLimit };
+
+ private GeometryFunction currentFunc = null;
+ private Stopwatch timer;
+
+ private JButton btnRepeat;
+
+ public SpatialFunctionPanel() {
+ try {
+ jbInit();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ void jbInit() throws Exception {
+// geomFuncPanel.populate(JTSTestBuilder.getFunctionRegistry().getGeometryFunctions());
+ geomFuncPanel.populate(JTSTestBuilder.getFunctionRegistry().getCategorizedGeometryFunctions());
+
+
+ this.setLayout(borderLayout1);
+ panelParam.setLayout(gridLayout2);
+ panelExec.setLayout(flowLayout);
+ panelExecParam.setLayout(borderLayout2);
+ panelRB.setLayout(gridLayout1);
+ gridLayout2.setRows(5);
+ gridLayout2.setColumns(2);
+
+
+ displayAAndBCheckBox.setSelected(true);
+ displayAAndBCheckBox.setToolTipText("");
+ displayAAndBCheckBox.setText("Display Input");
+ displayAAndBCheckBox.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ displayAAndBCheckBox_actionPerformed(e);
+ }
+ });
+
+ lblDistance.setText("Distance");
+
+ txtDistance.setMaximumSize(new Dimension(25, 2147483647));
+ txtDistance.setMinimumSize(new Dimension(25, 21));
+ txtDistance.setPreferredSize(new Dimension(25, 17));
+ txtDistance.setText(PARAM_DEFAULT[0]);
+ txtDistance.setHorizontalAlignment(SwingConstants.RIGHT);
+
+ lblQuadSegs.setText("Quadrant Segs");
+ txtQuadrantSegs.setHorizontalAlignment(SwingConstants.RIGHT);
+
+ lblCapStyle.setText("Cap Style");
+ ComboBoxModel modelCapStyle = new DefaultComboBoxModel(capStyleItems);
+ cbCapStyle.setModel(modelCapStyle);
+
+ lblJoinStyle.setText("Join Style");
+ ComboBoxModel modelJoinStyle = new DefaultComboBoxModel(joinStyleItems);
+ cbJoinStyle.setModel(modelJoinStyle);
+
+ lblMitreLimit.setText("Mitre Limit");
+ txtMitreLimit.setHorizontalAlignment(SwingConstants.RIGHT);
+
+ initLabels(paramLabel);
+
+ panelControl.setLayout(flowLayout1);
+
+
+ btnClearResult.setToolTipText("");
+ btnClearResult.setMargin(new Insets(0, 10, 0, 10));
+ btnClearResult.setSelected(true);
+ btnClearResult.setText("Clear Result");
+ btnClearResult.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ clearResultButton_actionPerformed(e);
+ }
+ });
+
+ panelParam.add(lblDistance);
+ panelParam.add(txtDistance);
+ panelParam.add(lblQuadSegs);
+ panelParam.add(txtQuadrantSegs);
+ panelParam.add(lblCapStyle);
+ panelParam.add(cbCapStyle);
+ panelParam.add(lblJoinStyle);
+ panelParam.add(cbJoinStyle);
+ panelParam.add(lblMitreLimit);
+ panelParam.add(txtMitreLimit);
+
+ panelControl.add(displayAAndBCheckBox, null);
+ //panelControl.add(btnClearResult, null);
+
+ final JTextField txtRepeatCount = new JTextField();
+ txtRepeatCount.setMaximumSize(new Dimension(25, 2147483647));
+ txtRepeatCount.setMinimumSize(new Dimension(30, 21));
+ txtRepeatCount.setPreferredSize(new Dimension(30, 21));
+ txtRepeatCount.setText("10");
+ txtRepeatCount.setHorizontalAlignment(SwingConstants.RIGHT);
+
+ execButton = SwingUtil.createButton("Compute", "Compute the result of the function",
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ execButton_actionPerformed(e);
+ }
+ });
+ execButton.setEnabled(false);
+
+ execToNewButton = SwingUtil.createButton("Compute New", "Compute function result to a new case",
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ execToNewButton_actionPerformed(e);
+ }
+ });
+ execToNewButton.setEnabled(false);
+
+ btnRepeat = SwingUtil.createButton("Repeat", "Repeat function a number of times, incrementing the first parameter",
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ int count = SwingUtil.getInteger(txtRepeatCount, 10);
+ execRepeatFunction(count);
+ }
+ });
+ // until we know what the function is
+ btnRepeat.setEnabled(false);
+
+
+ panelExec.add(execButton);
+ // disabled until behaviour is worked out
+ panelExec.add(execToNewButton);
+ panelExec.add(btnRepeat);
+ panelExec.add(txtRepeatCount);
+
+ panelExecParam.add(panelExec, BorderLayout.NORTH);
+ panelExecParam.add(panelParam, BorderLayout.CENTER);
+ panelExecParam.add(panelControl, BorderLayout.SOUTH);
+
+ this.add(geomFuncPanel, BorderLayout.CENTER);
+ this.add(panelExecParam, BorderLayout.SOUTH);
+
+ GeometryFunctionListener gfListener = new GeometryFunctionListener() {
+ public void functionSelected(GeometryFunctionEvent e) {
+ functionChanged(e.getFunction());
+ }
+ public void functionInvoked(GeometryFunctionEvent e) {
+ execFunction(e.getFunction(), false);
+ }
+ };
+ geomFuncPanel.addGeometryFunctionListener(gfListener);
+ }
+
+ static void initLabels(JLabel[] paramLabel)
+ {
+ for (int i = 0; i < paramLabel.length; i++) {
+ JLabel lbl = paramLabel[i];
+ lbl.setHorizontalAlignment(SwingConstants.RIGHT);
+ lbl.setBorder(new EmptyBorder(5,5,5,5));
+ }
+ }
+
+ public void enableExecuteControl(boolean isEnabled)
+ {
+ execButton.setEnabled(isEnabled);
+ execToNewButton.setEnabled(isEnabled);
+ btnRepeat.setEnabled(isEnabled);
+ }
+
+ void clearResultButton_actionPerformed(ActionEvent e) {
+ clearFunction();
+ }
+
+ void execButton_actionPerformed(ActionEvent e) {
+ execFunction(geomFuncPanel.getFunction(), false);
+ }
+
+ void execToNewButton_actionPerformed(ActionEvent e) {
+ execFunction(geomFuncPanel.getFunction(), true);
+ }
+
+ void execRepeatFunction(int count) {
+
+ GeometryFunction f = geomFuncPanel.getFunction();
+ RepeaterGeometryFunction fRepeat = new RepeaterGeometryFunction(f, count);
+ execFunction(fRepeat, false);
+ }
+
+ void displayAAndBCheckBox_actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.getGeometryEditPanel().setShowingInput(displayAAndBCheckBox.isSelected());
+ }
+
+ private void setCurrentFunction(GeometryFunction func) {
+ currentFunc = func;
+ // fire execution event even if null, to set UI appropriately
+ fireFunctionExecuted(new SpatialFunctionPanelEvent(this));
+ }
+
+ public void execFunction(GeometryFunction func, boolean createNew) {
+ currentFunc = func;
+ if (currentFunc == null)
+ return;
+ fireFunctionExecuted(new SpatialFunctionPanelEvent(this, createNew));
+ }
+
+ private void functionChanged(GeometryFunction func)
+ {
+ currentFunc = func;
+ updateParameters(func, paramComp, paramLabel);
+ execButton.setToolTipText( GeometryFunctionRegistry.functionDescriptionHTML(func) );
+ execButton.setEnabled(true);
+ execToNewButton.setEnabled(true);
+ btnRepeat.setEnabled(RepeaterGeometryFunction.isRepeatable(func));
+ }
+
+
+ static void OLDupdateParameters(GeometryFunction func, JComponent[] paramComp, JLabel[] paramLabel)
+ {
+ int numNonGeomParams = numNonGeomParams(func);
+ for (int i = 0; i < paramComp.length; i++) {
+ boolean isUsed = numNonGeomParams > i;
+ //SwingUtil.setEnabledWithBackground(paramComp[i], isUsed);
+ //*
+ if (isUsed) {
+ paramLabel[i].setText(func.getParameterNames()[i]);
+ }
+ //*/
+ paramComp[i].setVisible(isUsed);
+ paramLabel[i].setVisible(isUsed);
+ SpatialFunctionPanel.setToolTipText(paramComp[i], func, i + 1);
+ }
+ }
+
+ static void updateParameters(GeometryFunction func, JComponent[] paramComp, JLabel[] paramLabel)
+ {
+ int numNonGeomParams = numNonGeomParams(func);
+ int indexOffset = BaseGeometryFunction.firstScalarParamIndex(func);
+ for (int i = 0; i < paramComp.length; i++) {
+ boolean isUsed = numNonGeomParams > i;
+ if (isUsed) {
+ paramLabel[i].setText(func.getParameterNames()[i+indexOffset]);
+ }
+ paramComp[i].setVisible(isUsed);
+ paramLabel[i].setVisible(isUsed);
+ SpatialFunctionPanel.setToolTipText(paramComp[i], func, i + 1);
+ }
+ }
+
+ private static void setToolTipText(JComponent control, GeometryFunction func, int i) {
+ String txt = null;
+ if (func.getParameterTypes().length > i) {
+ txt = "Enter an " + func.getParameterTypes()[i].getSimpleName();
+ }
+ control.setToolTipText(txt);
+ }
+
+ private static int numNonGeomParams(GeometryFunction func)
+ {
+ int count = 0;
+ Class[] paramTypes = func.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++) {
+ if (! ClassUtil.isGeometry(paramTypes[i]))
+ count++;
+ }
+ return count;
+ }
+
+ public static int attributeParamOffset(GeometryFunction func) {
+ return func.isBinary() ? 1 : 0;
+ }
+
+ public boolean shouldShowGeometryA() {
+ return displayAAndBCheckBox.isSelected();
+ }
+
+ public boolean shouldShowGeometryB() {
+ return displayAAndBCheckBox.isSelected();
+ }
+
+ public void clearFunction() {
+ setCurrentFunction(null);
+ }
+
+ public Object[] getFunctionParams()
+ {
+ if (currentFunc == null) return null;
+ Class[] paramTypes = currentFunc.getParameterTypes();
+ Object[] paramVal = new Object[paramTypes.length];
+
+ for (int i = 0; i < paramVal.length; i++) {
+ Object valRaw = getParamValue(i);
+ paramVal[i] = SwingUtil.coerce(valRaw, paramTypes[i]);
+ }
+ return paramVal;
+ }
+
+ private Object getParamValue(int index) {
+ if (currentFunc.isBinary() && index == 0)
+ return JTSTestBuilderController.getGeometryB();
+
+ int attrIndex = index - attributeParamOffset(currentFunc);
+
+ switch (attrIndex) {
+ case 0: return valOrDefault(SwingUtil.value(txtDistance), PARAM_DEFAULT[0]);
+ case 1: return valOrDefault(SwingUtil.value(txtQuadrantSegs), PARAM_DEFAULT[1]);
+ case 2: return SwingUtil.value(cbCapStyle, capStyleValues);
+ case 3: return SwingUtil.value(cbJoinStyle, joinStyleValues);
+ case 4: return valOrDefault(SwingUtil.value(txtMitreLimit), PARAM_DEFAULT[4]);
+ }
+ return null;
+ }
+
+ public static String valOrDefault(String s, String defaultVal) {
+ if (s.length() > 0) return s;
+ return defaultVal;
+ }
+
+ public boolean isFunctionSelected()
+ {
+ return currentFunc != null;
+ }
+
+ public GeometryFunction getFunction() {
+ return currentFunc;
+ }
+
+ //=================================================
+ // Events
+ //=================================================
+
+ public synchronized void removeSpatialFunctionPanelListener(SpatialFunctionPanelListener l) {
+ if (spatialFunctionPanelListeners != null && spatialFunctionPanelListeners.contains(l)) {
+ Vector v = (Vector) spatialFunctionPanelListeners.clone();
+ v.removeElement(l);
+ spatialFunctionPanelListeners = v;
+ }
+ }
+
+ public synchronized void addSpatialFunctionPanelListener(SpatialFunctionPanelListener l) {
+ Vector v = spatialFunctionPanelListeners == null ? new Vector(2) : (Vector) spatialFunctionPanelListeners.clone();
+ if (!v.contains(l)) {
+ v.addElement(l);
+ spatialFunctionPanelListeners = v;
+ }
+ }
+
+ protected void fireFunctionExecuted(SpatialFunctionPanelEvent e) {
+ if (spatialFunctionPanelListeners != null) {
+ Vector listeners = spatialFunctionPanelListeners;
+ int count = listeners.size();
+ for (int i = 0; i < count; i++) {
+ ((SpatialFunctionPanelListener) listeners.elementAt(i)).functionExecuted(e);
+ }
+ }
+ }
+
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/StatsPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/StatsPanel.java
new file mode 100644
index 0000000..10eb807
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/StatsPanel.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jtstest.testbuilder.geom.*;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+/**
+ * @version 1.7
+ */
+public class StatsPanel
+extends JPanel
+{
+ TestBuilderModel tbModel = null;
+
+ JScrollPane jScrollPane1 = new JScrollPane();
+ JTextArea txtStats = new JTextArea();
+ BorderLayout tabPanelLayout = new BorderLayout();
+
+ public StatsPanel() {
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ void jbInit() throws Exception {
+
+ this.setLayout(tabPanelLayout);
+
+ txtStats.setWrapStyleWord(true);
+ txtStats.setLineWrap(true);
+ txtStats.setBackground(SystemColor.control);
+
+ this.add(jScrollPane1, BorderLayout.CENTER);
+
+ jScrollPane1.setBorder(BorderFactory.createLoweredBevelBorder());
+ jScrollPane1.getViewport().add(txtStats, null);
+ }
+
+ public void setModel(TestBuilderModel tbModel)
+ {
+ this.tbModel = tbModel;
+ }
+
+ public void refresh()
+ {
+ StringBuffer buf = new StringBuffer();
+
+ writeGeomStats("A", tbModel.getCurrentCase().getGeometry(0), buf);
+ writeGeomStats("B", tbModel.getCurrentCase().getGeometry(1), buf);
+ writeGeomStats("Result", tbModel.getCurrentCase().getResult(), buf);
+
+ setString(buf.toString());
+ }
+
+ private void writeGeomStats(String label,
+ Geometry g, StringBuffer buf)
+ {
+ if (g == null) return;
+ buf.append(label + " : ");
+ buf.append(GeometryUtil.structureSummary(g));
+ buf.append("\n");
+ buf.append(" Length = " + g.getLength() + " Area = " + g.getArea() + "\n");
+ buf.append("\n");
+ }
+
+ private void setString(String s)
+ {
+ txtStats.setText(s);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestBuilderPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestBuilderPanel.java
new file mode 100644
index 0000000..c22e838
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestBuilderPanel.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder;
+
+import javax.swing.JPanel;
+
+import org.locationtech.jtstest.testbuilder.model.TestBuilderModel;
+
+
+public abstract class TestBuilderPanel extends JPanel
+{
+ protected TestBuilderModel tbModel;
+ //protected JTSTestBuilderFrame tbFrame;
+
+ TestBuilderPanel() {
+ /*
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ */
+ }
+
+ protected abstract void uiInit();
+
+ public void setModel(TestBuilderModel tbModel) {
+ this.tbModel = tbModel;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestCasePanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestCasePanel.java
new file mode 100644
index 0000000..4c77e22
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestCasePanel.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.FocusEvent;
+import java.awt.event.MouseEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextField;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingConstants;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
+import javax.swing.event.ChangeEvent;
+
+import org.locationtech.jtstest.testbuilder.event.ValidPanelEvent;
+import org.locationtech.jtstest.testbuilder.event.ValidPanelListener;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+
+/**
+ * @version 1.7
+ */
+public class TestCasePanel extends JPanel {
+ TestCaseEdit testCase;
+ //---------------------------------------------
+ BorderLayout borderLayout1 = new BorderLayout();
+ BorderLayout editFrameLayout = new BorderLayout();
+ JPanel editFramePanel = new JPanel();
+ GeometryEditPanel editPanel = new GeometryEditPanel();
+ ButtonGroup geometryType = new ButtonGroup();
+ ButtonGroup editMode = new ButtonGroup();
+ ButtonGroup partType = new ButtonGroup();
+ Border border4;
+ JPanel editGroupPanel = new JPanel();
+ JTabbedPane jTabbedPane1 = new JTabbedPane();
+ JPanel btnPanel = new JPanel();
+ JPanel relateTabPanel = new JPanel();
+ JButton btnRunTests = new JButton();
+ RelatePanel relatePanel = new RelatePanel();
+ BorderLayout borderLayout2 = new BorderLayout();
+ GeometryEditControlPanel editCtlPanel = new GeometryEditControlPanel();
+ BorderLayout borderLayout3 = new BorderLayout();
+ JPanel jPanel1 = new JPanel();
+ JTextField txtDesc = new JTextField();
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+ SpatialFunctionPanel spatialFunctionPanel = new SpatialFunctionPanel();
+ private int currentTestCaseIndex = 0;
+ private int maxTestCaseIndex = 0;
+ private boolean initialized = false;
+ JPanel casePrecisionModelPanel = new JPanel();
+ JPanel namePanel = new JPanel();
+ JLabel testCaseIndexLabel = new JLabel();
+ GridBagLayout gridBagLayout2 = new GridBagLayout();
+ GridBagLayout gridBagLayout3 = new GridBagLayout();
+ JLabel precisionModelLabel = new JLabel();
+ ValidPanel validPanel = new ValidPanel();
+ JPanel statusBarPanel = new JPanel();
+ JLabel lblMousePos = new JLabel();
+ JLabel lblPrecisionModel = new JLabel();
+ ScalarFunctionPanel scalarFunctionPanel = new ScalarFunctionPanel();
+
+ JPanel jPanelMagnify = new JPanel();
+ JSpinner spStretchDist = new JSpinner(new SpinnerNumberModel(5, 0, 99999, 1));
+ JCheckBox cbMagnifyTopo = new JCheckBox();
+
+ private TestBuilderModel tbModel;
+
+
+ /**
+ * Construct the frame
+ */
+ public TestCasePanel() {
+ try {
+ jbInit();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ initialized = true;
+ }
+
+ public void setModel(TestBuilderModel tbModel)
+ {
+ this.tbModel = tbModel;
+ editPanel.setModel(tbModel);
+ // hook up other beans
+ editCtlPanel.setModel(tbModel);
+
+ }
+
+ public void setCurrentTestCaseIndex(int currentTestCaseIndex) {
+ this.currentTestCaseIndex = currentTestCaseIndex;
+ updateTestCaseIndexLabel();
+ }
+
+ public void setMaxTestCaseIndex(int maxTestCaseIndex) {
+ this.maxTestCaseIndex = maxTestCaseIndex;
+ updateTestCaseIndexLabel();
+ }
+
+ public GeometryEditControlPanel getGeometryEditControlPanel() {
+ return editCtlPanel;
+ }
+
+ public GeometryEditPanel getGeometryEditPanel() {
+ return editPanel;
+ }
+
+ public SpatialFunctionPanel getSpatialFunctionPanel() {
+ return spatialFunctionPanel;
+ }
+
+ public ScalarFunctionPanel getScalarFunctionPanel() {
+ return scalarFunctionPanel;
+ }
+
+ void setTestCase(TestCaseEdit testCase) {
+ this.testCase = testCase;
+ tbModel.getGeometryEditModel().setTestCase(testCase);
+ relatePanel.setTestCase(testCase);
+// spatialFunctionPanel.setTestCase(testCase);
+ validPanel.setTestCase(testCase);
+// scalarFunctionPanel.setTestCase(testCase);
+ txtDesc.setText(testCase.getName());
+ }
+
+ void editPanel_mouseMoved(MouseEvent e) {
+ String cursorPos = editPanel.cursorLocationString(e.getPoint());
+ lblMousePos.setText(cursorPos);
+// System.out.println(cursorPos);
+ }
+
+ void btnRunTests_actionPerformed(ActionEvent e) {
+ relatePanel.runTests();
+ }
+
+ void editPanel_geometryChanged(GeometryEvent e) {
+ relatePanel.clearResults();
+// scalarFunctionPanel.clearResults();
+ }
+ void validPanel_setHighlightPerformed(ValidPanelEvent e) {
+ editPanel.setHighlightPoint(validPanel.getMarkPoint());
+ editPanel.forceRepaint();
+ }
+
+ void txtDesc_focusLost(FocusEvent e) {
+ testCase.setName(txtDesc.getText());
+ }
+
+ void jTabbedPane1_stateChanged(ChangeEvent e)
+ {
+ boolean isFunction = jTabbedPane1.getSelectedComponent() == spatialFunctionPanel;
+ boolean isEdit = jTabbedPane1.getSelectedComponent() == editCtlPanel;
+
+ editPanel.setShowingResult(isFunction);
+ editPanel.setShowingGeometryA(! isFunction
+ || spatialFunctionPanel.shouldShowGeometryA());
+ editPanel.setShowingGeometryB(! isFunction
+ || spatialFunctionPanel.shouldShowGeometryB());
+
+ editPanel.setHighlightPoint(null);
+ if (jTabbedPane1.getSelectedComponent() == validPanel
+ || jTabbedPane1.getSelectedComponent() == editCtlPanel) {
+ editPanel.setHighlightPoint(validPanel.getMarkPoint());
+ }
+ if (initialized) {
+ //avoid infinite loop
+ if (isEdit)
+ JTSTestBuilderFrame.instance().showGeomsTab();
+ if (isFunction)
+ JTSTestBuilderFrame.instance().showResultWKTTab();
+ }
+ }
+
+ public void setPrecisionModelDescription(String description) {
+ precisionModelLabel.setText(description);
+ lblPrecisionModel.setText(" PM: " + description);
+ }
+
+ /**
+ * Component initialization
+ */
+ private void jbInit() throws Exception {
+ //---------------------------------------------------
+ border4 = BorderFactory.createBevelBorder(BevelBorder.LOWERED, Color.white,
+ Color.white, new Color(93, 93, 93), new Color(134, 134, 134));
+ setLayout(borderLayout1);
+ editGroupPanel.setLayout(borderLayout3);
+ editPanel.addMouseMotionListener(
+ new java.awt.event.MouseMotionAdapter() {
+
+ public void mouseMoved(MouseEvent e) {
+ editPanel_mouseMoved(e);
+ }
+ public void mouseDragged(MouseEvent e) {
+ editPanel_mouseMoved(e);
+ }
+ });
+ relateTabPanel.setLayout(borderLayout2);
+ btnRunTests.setToolTipText("");
+ btnRunTests.setText("Run");
+ btnRunTests.addActionListener(
+ new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ btnRunTests_actionPerformed(e);
+ }
+ });
+ validPanel.addValidPanelListener(
+ new ValidPanelListener() {
+ public void setHighlightPerformed(ValidPanelEvent e) {
+ validPanel_setHighlightPerformed(e);
+ }
+ });
+ jPanel1.setLayout(gridBagLayout1);
+ txtDesc.addFocusListener(
+ new java.awt.event.FocusAdapter() {
+
+ public void focusLost(FocusEvent e) {
+ txtDesc_focusLost(e);
+ }
+ });
+ jTabbedPane1.addChangeListener(
+ new javax.swing.event.ChangeListener() {
+
+ public void stateChanged(ChangeEvent e) {
+ jTabbedPane1_stateChanged(e);
+ }
+ });
+ testCaseIndexLabel.setBorder(BorderFactory.createLoweredBevelBorder());
+ testCaseIndexLabel.setToolTipText("");
+ testCaseIndexLabel.setText("0 of 0");
+ casePrecisionModelPanel.setLayout(gridBagLayout2);
+ namePanel.setLayout(gridBagLayout3);
+ precisionModelLabel.setBorder(BorderFactory.createLoweredBevelBorder());
+ precisionModelLabel.setToolTipText("Precision Model");
+ precisionModelLabel.setText("");
+
+ txtDesc.setBackground(Color.white);
+ lblMousePos.setBackground(SystemColor.text);
+ lblMousePos.setBorder(BorderFactory.createLoweredBevelBorder());
+ lblMousePos.setPreferredSize(new Dimension(21, 21));
+ lblMousePos.setHorizontalAlignment(SwingConstants.RIGHT);
+ lblPrecisionModel.setBackground(SystemColor.text);
+ lblPrecisionModel.setBorder(BorderFactory.createLoweredBevelBorder());
+// txtSelectedPoint.setEditable(false);
+ lblPrecisionModel.setText("Sel Pt:");
+
+ editFramePanel.setLayout(editFrameLayout);
+ editFramePanel.add(editPanel, BorderLayout.CENTER);
+ editFramePanel.setBorder(BorderFactory.createBevelBorder(1));
+
+ add(editGroupPanel, BorderLayout.CENTER);
+ editGroupPanel.add(editFramePanel, BorderLayout.CENTER);
+ editGroupPanel.add(statusBarPanel, BorderLayout.SOUTH);
+
+ //cbMagnifyTopo.setText("Magnify");
+ cbMagnifyTopo.setToolTipText("Magnify Topology - Stretches geometries to reveal topological detail");
+ spStretchDist.setToolTipText("Stretch Distance (pixels)");
+ spStretchDist.setMaximumSize(new Dimension(20,20));
+ ((JSpinner.DefaultEditor) spStretchDist.getEditor()).getTextField().setColumns(2);
+ jPanelMagnify.setLayout(new BoxLayout(jPanelMagnify, BoxLayout.LINE_AXIS));
+ jPanelMagnify.add(Box.createHorizontalGlue());
+ jPanelMagnify.add(cbMagnifyTopo);
+ jPanelMagnify.add(spStretchDist);
+ jPanelMagnify.add(Box.createHorizontalGlue());
+ jPanelMagnify.setBorder(BorderFactory.createLoweredBevelBorder());
+
+ statusBarPanel.setLayout(new GridLayout(1,2));
+ statusBarPanel.add(testCaseIndexLabel);
+ statusBarPanel.add(jPanelMagnify);
+ statusBarPanel.add(lblPrecisionModel);
+ statusBarPanel.add(lblMousePos);
+
+ add(jTabbedPane1, BorderLayout.WEST);
+ //jTabbedPane1.add(editCtlPanel, "Edit");
+ jTabbedPane1.add(spatialFunctionPanel, "Geometry Functions");
+ jTabbedPane1.add(scalarFunctionPanel, "Scalar Functions");
+ jTabbedPane1.add(validPanel, "Valid / Mark");
+ jTabbedPane1.add(relateTabPanel, "Predicates");
+ relateTabPanel.add(relatePanel, BorderLayout.CENTER);
+ relateTabPanel.add(btnPanel, BorderLayout.NORTH);
+ btnPanel.add(btnRunTests, null);
+ }
+
+ private void updateTestCaseIndexLabel() {
+ testCaseIndexLabel.setText(AppStrings.LABEL_TEST_CASE + " " + currentTestCaseIndex + " of " + maxTestCaseIndex);
+ }
+
+ public double getStretchSize() {
+ return ((Integer) spStretchDist.getValue()).intValue();
+ }
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestCaseTextDialog.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestCaseTextDialog.java
new file mode 100644
index 0000000..6622e40
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestCaseTextDialog.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+
+import javax.swing.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.*;
+import org.locationtech.jts.io.gml2.*;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+
+/**
+ * @version 1.7
+ */
+public class TestCaseTextDialog extends JDialog {
+ private TestCaseEdit test;
+ //----------------------------------
+ JPanel dialogPanel = new JPanel();
+ BorderLayout borderLayout1 = new BorderLayout();
+ JScrollPane jScrollPane1 = new JScrollPane();
+ JTextArea txtGeomView = new JTextArea();
+ JPanel jPanel1 = new JPanel();
+ JPanel cmdButtonPanel = new JPanel();
+ BorderLayout borderLayout2 = new BorderLayout();
+ BorderLayout borderLayout3 = new BorderLayout();
+ JButton btnCopy = new JButton();
+ JButton btnOk = new JButton();
+ JPanel textFormatPanel = new JPanel();
+ JPanel allOptionsPanel = new JPanel();
+ JPanel functionsPanel = new JPanel();
+ BoxLayout boxLayout1 = new BoxLayout(functionsPanel, BoxLayout.Y_AXIS);
+ ButtonGroup textFormatGroup = new ButtonGroup();
+
+ JRadioButton rbSVG = new JRadioButton();
+ JRadioButton rbXML = new JRadioButton();
+ JRadioButton rbXMLWKB = new JRadioButton();
+ JRadioButton rbTestCaseJava = new JRadioButton();
+ JRadioButton rbJTSJava = new JRadioButton();
+ JRadioButton rbWKB = new JRadioButton();
+ JRadioButton rbWKT = new JRadioButton();
+ JRadioButton rbWKTFormatted = new JRadioButton();
+ JRadioButton rbGML = new JRadioButton();
+
+ JCheckBox intersectsCB = new JCheckBox();
+
+ public TestCaseTextDialog(Frame frame, String title, boolean modal) {
+ super(frame, title, modal);
+ try {
+ jbInit();
+ pack();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ public TestCaseTextDialog() {
+ this(null, "", false);
+ }
+
+ void jbInit() throws Exception {
+ dialogPanel.setLayout(borderLayout1);
+ jScrollPane1.setPreferredSize(new Dimension(500, 300));
+ txtGeomView.setLineWrap(true);
+ jPanel1.setLayout(borderLayout2);
+ btnCopy.setEnabled(true);
+ btnCopy.setText("Copy");
+ btnCopy.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ btnSelect_actionPerformed(e);
+ }
+ });
+ btnOk.setToolTipText("");
+ btnOk.setText("Close");
+ btnOk.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ btnOk_actionPerformed(e);
+ }
+ });
+ rbXML.setText("Test XML");
+ rbXML.setToolTipText("");
+ rbXML.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ rbXML_actionPerformed(e);
+ }
+ });
+ rbXMLWKB.setText("Test XML - WKB");
+ rbXMLWKB.setToolTipText("");
+ rbXMLWKB.addActionListener(new java.awt.event.ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ rbXMLWKB_actionPerformed(e);
+ }
+ });
+ rbSVG.setText("SVG");
+ rbSVG.setToolTipText("");
+ rbSVG.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbSVG_actionPerformed(e);
+ }
+ });
+
+ rbTestCaseJava.setText("TestCase Java");
+ rbTestCaseJava.setToolTipText("");
+ rbTestCaseJava.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbTestCaseJava_actionPerformed(e);
+ }
+ });
+ rbJTSJava.setEnabled(false);
+ rbJTSJava.setText("JTS Java ");
+
+ rbWKT.setText("WKT");
+ rbWKT.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbWKT_actionPerformed(e);
+ }
+ });
+
+ rbWKTFormatted.setText("WKT-Formatted");
+ rbWKTFormatted.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbWKTFormatted_actionPerformed(e);
+ }
+ });
+
+ rbWKB.setText("WKB");
+ rbWKB.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbWKB_actionPerformed(e);
+ }
+ });
+ rbGML.setText("GML");
+ rbGML.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ rbGML_actionPerformed(e);
+ }
+ });
+ getContentPane().add(dialogPanel);
+ dialogPanel.add(jScrollPane1, BorderLayout.CENTER);
+ dialogPanel.add(jPanel1, BorderLayout.SOUTH);
+ jPanel1.add(cmdButtonPanel, BorderLayout.SOUTH);
+ cmdButtonPanel.add(btnCopy, null);
+ cmdButtonPanel.add(btnOk, null);
+ textFormatPanel.add(rbWKT, null);
+ textFormatPanel.add(rbWKTFormatted, null);
+ textFormatPanel.add(rbWKB, null);
+ textFormatPanel.add(rbGML, null);
+ textFormatPanel.add(rbSVG, null);
+ textFormatPanel.add(rbTestCaseJava, null);
+ textFormatPanel.add(rbXML, null);
+ textFormatPanel.add(rbXMLWKB, null);
+ textFormatPanel.add(rbJTSJava, null);
+ jScrollPane1.getViewport().add(txtGeomView, null);
+
+ allOptionsPanel.setLayout(borderLayout3);
+ allOptionsPanel.add(textFormatPanel, BorderLayout.NORTH);
+ allOptionsPanel.add(functionsPanel, BorderLayout.CENTER);
+
+ jPanel1.add(allOptionsPanel, BorderLayout.CENTER);
+
+ textFormatGroup.add(rbJTSJava);
+ textFormatGroup.add(rbTestCaseJava);
+ textFormatGroup.add(rbXML);
+ textFormatGroup.add(rbXMLWKB);
+ textFormatGroup.add(rbWKT);
+ textFormatGroup.add(rbWKTFormatted);
+ textFormatGroup.add(rbWKB);
+ textFormatGroup.add(rbGML);
+ textFormatGroup.add(rbSVG);
+ }
+
+ public void setTestCase(TestCaseEdit test) {
+ this.test = test;
+ // choose default format
+ rbXML.setEnabled(true);
+ rbXML.doClick();
+ }
+
+ void btnOk_actionPerformed(ActionEvent e) {
+ setVisible(false);
+ }
+
+ void btnSelect_actionPerformed(ActionEvent e) {
+ txtGeomView.selectAll();
+ txtGeomView.copy();
+ }
+
+ void rbTestCaseJava_actionPerformed(ActionEvent e) {
+ txtGeomView.setText((new JavaTestWriter()).write(test));
+ }
+
+ void rbXML_actionPerformed(ActionEvent e) {
+ txtGeomView.setText((new XMLTestWriter()).getTestXML(test));
+ }
+
+ void rbXMLWKB_actionPerformed(ActionEvent e) {
+ txtGeomView.setText((new XMLTestWriter()).getTestXML(test, false));
+ }
+
+ void rbSVG_actionPerformed(ActionEvent e) {
+ txtGeomView.setText(SVGTestWriter.getTestSVG(test));
+ }
+
+ void rbWKB_actionPerformed(ActionEvent e) {
+ writeView(
+ convertToWKB(test.getGeometry(0)),
+ convertToWKB(test.getGeometry(1)),
+ convertToWKB(test.getResult())
+ );
+ }
+
+ void rbWKT_actionPerformed(ActionEvent e) {
+ writeView(
+ test.getGeometry(0) == null ? null : test.getGeometry(0).toString(),
+ test.getGeometry(1) == null ? null :test.getGeometry(1).toString(),
+ test.getResult() == null ? null :test.getResult().toString()
+ );
+ }
+
+ void rbWKTFormatted_actionPerformed(ActionEvent e) {
+ writeView(
+ convertToWKT(test.getGeometry(0), true),
+ convertToWKT(test.getGeometry(1), true),
+ convertToWKT(test.getResult(), true)
+ );
+ }
+
+ void rbGML_actionPerformed(ActionEvent e) {
+ writeView(
+ convertToGML(test.getGeometry(0)),
+ convertToGML(test.getGeometry(1)),
+ convertToGML(test.getResult())
+ );
+ }
+
+ private void writeView(String a, String b, String result)
+ {
+ txtGeomView.setText("");
+ writeViewGeometry("A", a);
+ writeViewGeometry("B", b);
+ writeViewGeometry("Result", result);
+ }
+
+ private void writeViewGeometry(String tag, String str)
+ {
+ if (str == null || str.length() <= 0) return;
+ txtGeomView.append(tag + ":\n\n");
+ txtGeomView.append(str);
+ txtGeomView.append("\n\n");
+ }
+
+ private String convertToWKT(Geometry g, boolean isFormatted)
+ {
+ if (g == null) return "";
+ if (! isFormatted)
+ return g.toString();
+ WKTWriter writer = new WKTWriter();
+ writer.setFormatted(isFormatted);
+ writer.setMaxCoordinatesPerLine(5);
+ return writer.write(g);
+ }
+
+ private String convertToWKB(Geometry g)
+ {
+ if (g == null) return "";
+ return WKBWriter.toHex((new WKBWriter().write(g)));
+ }
+
+ private String convertToGML(Geometry g)
+ {
+ if (g == null) return "";
+ return (new GMLWriter()).write(g);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestListPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestListPanel.java
new file mode 100644
index 0000000..add7b45
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/TestListPanel.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.util.Iterator;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.testbuilder.model.TestCaseEdit;
+
+
+
+/**
+ * @version 1.7
+ */
+public class TestListPanel extends JPanel {
+ BorderLayout borderLayout1 = new BorderLayout();
+ private DefaultListModel listModel = new DefaultListModel();
+ JScrollPane jScrollPane1 = new JScrollPane();
+ JList list = new JList(listModel);
+ BorderLayout borderLayout2 = new BorderLayout();
+
+ private class TestListCellRenderer extends JLabel implements ListCellRenderer {
+ private final ImageIcon tickIcon =
+ new ImageIcon(this.getClass().getResource("tickShaded.gif"));
+ private final ImageIcon crossIcon =
+ new ImageIcon(this.getClass().getResource("crossShaded.gif"));
+ private final ImageIcon clearIcon = new ImageIcon(this.getClass().getResource("clear.gif"));
+
+ public Component getListCellRendererComponent(
+ JList list,
+ Object value,
+ int index,
+ boolean isSelected,
+ boolean cellHasFocus) {
+ Testable testCase = (Testable) value;
+ setText(testName(testCase));
+ setOpaque(true);
+ if (isSelected) {
+ setBackground(list.getSelectionBackground());
+ setForeground(list.getSelectionForeground());
+ } else {
+ setBackground(list.getBackground());
+ setForeground(list.getForeground());
+ }
+ setEnabled(list.isEnabled());
+ setFont(list.getFont());
+ return this;
+ }
+
+ private String testName(Testable testCase)
+ {
+ String name = testCase.getName();
+ if ((name == null || name.length() == 0) && testCase instanceof TestCaseEdit) {
+ name = ((TestCaseEdit) testCase).getDescription();
+ }
+ if (name == null || name.length() == 0) {
+ name = "";
+ }
+ int testSkey = 1 + JTSTestBuilderFrame.instance().getModel().getCases().indexOf(testCase);
+ String nameFinal = "# " + testSkey + " - " + testCaseSignatureHTML(testCase);
+ if (name != "")
+ nameFinal = nameFinal + " --- " + name;
+ return "<html>" + nameFinal + "<html>";
+ }
+
+ private String testCaseSignatureHTML(Testable testCase)
+ {
+ return "<font color='blue'>" + geometrySignature(testCase.getGeometry(0)) + "</font>"
+ + " :: "
+ + "<font color='red'>" + geometrySignature(testCase.getGeometry(1)) + "</font>";
+ }
+
+ private String geometrySignature(Geometry geom)
+ {
+ // visual indication of null geometry
+ if (geom == null)
+ return "_";
+
+ String sig = geom.getGeometryType();
+ if (geom instanceof GeometryCollection) {
+ sig += "[" + geom.getNumGeometries() + "]";
+ }
+ else {
+ sig += "(" + geom.getNumPoints() + ")";
+ }
+ return sig;
+ }
+ }
+
+ public TestListPanel(JTSTestBuilderFrame testBuilderFrame) {
+ this();
+ }
+
+ public TestListPanel() {
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ list.setCellRenderer(new TestListCellRenderer());
+ registerListSelectionListener();
+ }
+
+ private void jbInit() throws Exception {
+ setSize(200, 250);
+ setLayout(borderLayout2);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.setSelectionBackground(Color.GRAY);
+ add(jScrollPane1, BorderLayout.CENTER);
+ jScrollPane1.getViewport().add(list, null);
+ }
+
+ private void registerListSelectionListener() {
+ list.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+
+ public void valueChanged(ListSelectionEvent e) {
+ if (list.getSelectedValue() == null)
+ return;
+ JTSTestBuilderFrame.instance().setCurrentTestCase(
+ (TestCaseEdit) list.getSelectedValue());
+ }
+ });
+ }
+
+ public void populateList() {
+ listModel.clear();
+ for (Iterator i = JTSTestBuilderFrame.instance().getModel().getCases().iterator();
+ i.hasNext();
+ ) {
+ Testable testCase = (Testable) i.next();
+ listModel.addElement(testCase);
+ }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ValidPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ValidPanel.java
new file mode 100644
index 0000000..8a7d6ab
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ValidPanel.java
@@ -0,0 +1,272 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.util.Vector;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.io.*;
+import org.locationtech.jts.operation.*;
+import org.locationtech.jts.operation.valid.IsValidOp;
+import org.locationtech.jts.operation.valid.TopologyValidationError;
+import org.locationtech.jtstest.testbuilder.event.ValidPanelEvent;
+import org.locationtech.jtstest.testbuilder.event.ValidPanelListener;
+import org.locationtech.jtstest.testbuilder.model.TestCaseEdit;
+
+
+
+/**
+ * @version 1.7
+ */
+public class ValidPanel extends JPanel {
+ TestCaseEdit testCase;
+ private Coordinate markPoint = null;
+//===========================================
+ JButton btnValidate = new JButton();
+ JButton btnSimple = new JButton();
+ JTextField txtIsValid = new JTextField();
+ JTextArea taInvalidMsg = new JTextArea();
+ JLabel lblValidSimple = new JLabel();
+ JPanel jPanel1 = new JPanel();
+ GridBagLayout gridBagLayout2 = new GridBagLayout();
+ private transient Vector validPanelListeners;
+ GridLayout gridLayout1 = new GridLayout();
+ JPanel markPanel = new JPanel();
+ JPanel markSquishPanel = new JPanel();
+ JPanel panelValidSimple = new JPanel();
+ JPanel markBtnPanel = new JPanel();
+ JTextField txtMarkLocation = new JTextField();
+ JTextField txtMarkLabel = new JTextField();
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+ JLabel lblMark = new JLabel();
+ JButton btnClearMark = new JButton();
+ JButton btnSetMark = new JButton();
+
+ public ValidPanel() {
+ try {
+ jbInit();
+ }
+ catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ void jbInit() throws Exception {
+ btnValidate.setText("Valid?");
+ btnValidate.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnValidate_actionPerformed(e);
+ }
+ });
+ btnSimple.setText("Simple?");
+ btnSimple.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnSimple_actionPerformed(e);
+ }
+ });
+ this.setLayout(gridLayout1);
+ gridLayout1.setRows(2);
+ txtIsValid.setBackground(SystemColor.control);
+ txtIsValid.setEditable(false);
+ txtIsValid.setText("Y");
+ txtIsValid.setHorizontalAlignment(SwingConstants.CENTER);
+ taInvalidMsg.setPreferredSize(new Dimension(70, 80));
+ taInvalidMsg.setLineWrap(true);
+ taInvalidMsg.setBorder(BorderFactory.createLoweredBevelBorder());
+ taInvalidMsg.setMinimumSize(new Dimension(70, 70));
+ taInvalidMsg.setToolTipText("");
+ taInvalidMsg.setBackground(SystemColor.control);
+ taInvalidMsg.setEditable(true);
+ taInvalidMsg.setFont(new java.awt.Font("SansSerif", 0, 12));
+ lblValidSimple.setToolTipText("");
+ lblValidSimple.setText("Valid / Simple ");
+ jPanel1.setLayout(gridBagLayout2);
+ lblMark.setToolTipText("");
+ lblMark.setText("Mark Point ( X Y ) ");
+ btnClearMark.setToolTipText("");
+ btnClearMark.setText("Clear Mark");
+ btnClearMark.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnClearMark_actionPerformed(e);
+ }
+ });
+ btnSetMark.setToolTipText("");
+ btnSetMark.setText("Set Mark");
+ btnSetMark.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ btnSetMark_actionPerformed(e);
+ }
+ });
+ panelValidSimple.add(btnValidate);
+ panelValidSimple.add(btnSimple);
+ jPanel1.add(panelValidSimple, new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(10, 5, 10, 5), 0, 0));
+ jPanel1.add(txtIsValid, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 4, 0), 10, 0));
+ jPanel1.add(taInvalidMsg, new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 4, 0, 4), 0, 0));
+ jPanel1.add(lblValidSimple, new GridBagConstraints(0, 3, 1, 1, 1.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 4, 0, 4), 0, 0));
+ this.add(jPanel1, null);
+ markPanel.setLayout(new BorderLayout());
+ /*
+ markPanel.setLayout(gridBagLayout1);
+ markPanel.add(jLabel2, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0
+ ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+// jPanel2.add(jLabel3, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0
+// ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ markPanel.add(txtMark, new GridBagConstraints(1, 1, 2, 1, 0.5, 0.0
+ ,GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 20), 0, 0));
+// jPanel2.add(txtX, new GridBagConstraints(1, 0, 2, 1, 0.5, 0.0
+// ,GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 20), 0, 0));
+ */
+
+ markBtnPanel.add(btnSetMark);
+ markBtnPanel.add(btnClearMark);
+ markPanel.add(lblMark, BorderLayout.NORTH);
+ markPanel.add(txtMarkLocation, BorderLayout.CENTER);
+ //markPanel.add(txtMarkLabel, BorderLayout.CENTER);
+ markPanel.add(markBtnPanel, BorderLayout.SOUTH);
+
+ markSquishPanel.setLayout(new BorderLayout());
+ markSquishPanel.add(markPanel, BorderLayout.NORTH);
+ /*
+ markPanel.add(btnSetMark, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 4, 10), 0, 0));
+ markPanel.add(btnClearMark, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0
+ ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 10, 4, 10), 0, 0));
+ */
+ this.add(markSquishPanel, null);
+ }
+
+ public void setTestCase(TestCaseEdit testCase) {
+ this.testCase = testCase;
+ }
+
+ public Coordinate getMarkPoint() { return markPoint; }
+
+ void btnValidate_actionPerformed(ActionEvent e)
+ {
+ TopologyValidationError err = null;
+ if (testCase.getGeometry(0) != null) {
+ IsValidOp validOp = new IsValidOp(testCase.getGeometry(0));
+ err = validOp.getValidationError();
+ }
+ String msg = "";
+ boolean isValid = true;
+ Coordinate invalidPoint = null;
+ if (err != null) {
+ isValid = false;
+ msg = err.toString();
+ invalidPoint = err.getCoordinate();
+ }
+ taInvalidMsg.setText(msg);
+ txtIsValid.setText(isValid ? "Y" : "N");
+ setMarkPoint(invalidPoint);
+ }
+ void btnSimple_actionPerformed(ActionEvent e)
+ {
+ boolean isSimple = true;
+ Coordinate nonSimpleLoc = null;
+ if (testCase.getGeometry(0) != null) {
+ IsSimpleOp simpleOp = new IsSimpleOp(testCase.getGeometry(0));
+ isSimple = simpleOp.isSimple();
+ nonSimpleLoc = simpleOp.getNonSimpleLocation();
+ }
+ String msg = isSimple ?
+ ""
+ : "Self-intersection at " + WKTWriter.toPoint(nonSimpleLoc);
+ taInvalidMsg.setText(msg);
+ txtIsValid.setText(isSimple ? "Y" : "N");
+ setMarkPoint(nonSimpleLoc);
+ }
+ private void setMarkPoint(Coordinate coord)
+ {
+ markPoint = coord;
+ String markText = "";
+ if (markPoint != null) {
+ markText = " " + coord.x + " " + coord.y + " ";
+ }
+ txtMarkLocation.setText(markText);
+ fireSetHighlightPerformed(new ValidPanelEvent(this));
+ }
+ public synchronized void removeValidPanelListener(ValidPanelListener l) {
+ if (validPanelListeners != null && validPanelListeners.contains(l)) {
+ Vector v = (Vector) validPanelListeners.clone();
+ v.removeElement(l);
+ validPanelListeners = v;
+ }
+ }
+ public synchronized void addValidPanelListener(ValidPanelListener l) {
+ Vector v = validPanelListeners == null ? new Vector(2) : (Vector) validPanelListeners.clone();
+ if (!v.contains(l)) {
+ v.addElement(l);
+ validPanelListeners = v;
+ }
+ }
+ protected void fireSetHighlightPerformed(ValidPanelEvent e) {
+ if (validPanelListeners != null) {
+ Vector listeners = validPanelListeners;
+ int count = listeners.size();
+ for (int i = 0; i < count; i++) {
+ ((ValidPanelListener) listeners.elementAt(i)).setHighlightPerformed(e);
+ }
+ }
+ }
+
+ void btnSetMark_actionPerformed(ActionEvent e) {
+ String xyStr = txtMarkLocation.getText();
+ setMarkPoint(parseXY(xyStr));
+ }
+
+ void btnClearMark_actionPerformed(ActionEvent e) {
+ setMarkPoint(null);
+ }
+
+ Coordinate parseXY(String xyStr)
+ {
+ String[] xy = xyStr.trim().split("\\s+");
+ double x = parseNumber(xy, 0);
+ double y = parseNumber(xy, 1);
+ return new Coordinate(x, y);
+ }
+
+ double parseNumber(String[] xy, int index)
+ {
+ if (xy.length <= index) return 0.0;
+ String s = xy[index];
+ try {
+ return Double.parseDouble(s);
+ }
+ catch (NumberFormatException ex)
+ {
+ // just eat it - not much we can do
+ }
+ return 0.0;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/WKTPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/WKTPanel.java
new file mode 100644
index 0000000..003c941
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/WKTPanel.java
@@ -0,0 +1,499 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+import org.locationtech.jtstest.testbuilder.model.DisplayParameters;
+import org.locationtech.jtstest.testbuilder.model.GeometryEditModel;
+import org.locationtech.jtstest.testbuilder.model.GeometryType;
+import org.locationtech.jtstest.testbuilder.model.TestBuilderModel;
+import org.locationtech.jtstest.testbuilder.ui.SwingUtil;
+import org.locationtech.jtstest.testbuilder.ui.dnd.FileDrop;
+import org.locationtech.jtstest.util.GeometryTextCleaner;
+import org.locationtech.jtstest.util.io.MultiFormatReader;
+
+
+/**
+ * @version 1.7
+ */
+public class WKTPanel extends JPanel
+{
+ TestBuilderModel tbModel;
+
+ GridBagLayout gridBagLayout1 = new GridBagLayout();
+ Box panelButtons = Box.createVerticalBox();
+ JPanel panelAB = new JPanel();
+ JButton loadButton = new JButton();
+ JButton inspectButton = new JButton();
+ JButton exchangeButton = new JButton();
+ TitledBorder titledBorder1;
+ JLabel bLabel = new JLabel();
+ GridBagLayout gridBagLayout2 = new GridBagLayout();
+ JLabel aLabel = new JLabel();
+
+ JPanel aPanel = new JPanel();
+ JButton aCopyButton = new JButton();
+ JButton aPasteButton = new JButton();
+ JButton aCutButton = new JButton();
+// JPanel aButtonPanel = new JPanel();
+ Box aLabelPanel = Box.createVerticalBox();
+ Box aButtonPanel = Box.createVerticalBox();
+ FlowLayout aButtonPanelLayout = new FlowLayout();
+ BorderLayout aPanelLayout = new BorderLayout();
+ JRadioButton aRB = new JRadioButton();
+
+ JPanel bPanel = new JPanel();
+ JButton bCopyButton = new JButton();
+ JButton bPasteButton = new JButton();
+ JButton bCutButton = new JButton();
+// JPanel bButtonPanel = new JPanel();
+ Box bLabelPanel = Box.createVerticalBox();
+ Box bButtonPanel = Box.createVerticalBox();
+ FlowLayout bButtonPanelLayout = new FlowLayout();
+ BorderLayout bPanelLayout = new BorderLayout();
+ JRadioButton bRB = new JRadioButton();
+
+ JScrollPane aScrollPane = new JScrollPane();
+ JTextArea aTextArea = new JTextArea();
+ JScrollPane bScrollPane = new JScrollPane();
+ JTextArea bTextArea = new JTextArea();
+ ButtonGroup editMode = new ButtonGroup();
+
+ private final ImageIcon copyIcon = new ImageIcon(this.getClass().getResource("Copy.png"));
+ private final ImageIcon pasteIcon = new ImageIcon(this.getClass().getResource("Paste.png"));
+ private final ImageIcon cutIcon = new ImageIcon(this.getClass().getResource("Delete_small.png"));
+ private final ImageIcon loadIcon = new ImageIcon(this.getClass().getResource("LoadWKTToTest.png"));
+ private final ImageIcon inspectIcon = new ImageIcon(this.getClass().getResource("InspectGeometry.png"));
+ private final ImageIcon exchangeGeomsIcon = new ImageIcon(this.getClass().getResource("ExchangeGeoms.png"));
+
+ protected JTSTestBuilderFrame tbFrame;
+
+ public WKTPanel(JTSTestBuilderFrame tbFrame) {
+ this.tbFrame = tbFrame;
+ try {
+ jbInit();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ initFileDrop(aTextArea, 0);
+ initFileDrop(bTextArea, 1);
+ }
+
+ public void setModel(TestBuilderModel tbModel) {
+ this.tbModel = tbModel;
+ setFocusGeometry(0);
+ }
+
+ void jbInit() throws Exception {
+ titledBorder1 = new TitledBorder("");
+ this.setLayout(gridBagLayout1);
+ this.setPreferredSize(new java.awt.Dimension(394, 176));
+
+ loadButton.setPreferredSize(new Dimension(38, 38));
+ loadButton.setMargin(new Insets(8, 8, 8, 8));
+// loadButton.setText("Load");
+ loadButton.setIcon(loadIcon);
+ loadButton.setToolTipText(AppStrings.TIP_WKT_PANEL_LOAD_GEOMETRY);
+
+ inspectButton.setPreferredSize(new Dimension(30, 38));
+ inspectButton.setToolTipText(AppStrings.TIP_INSPECT_GEOMETRY);
+ inspectButton.setIcon(inspectIcon);
+
+ exchangeButton.setPreferredSize(new Dimension(30, 38));
+ exchangeButton.setToolTipText(AppStrings.TIP_EXCHANGE_A_B);
+ exchangeButton.setIcon(exchangeGeomsIcon);
+
+ panelAB.setLayout(gridBagLayout2);
+
+ aLabel.setFont(new java.awt.Font("Dialog", 1, 16));
+ aLabel.setForeground(Color.blue);
+ aLabel.setText("A");
+ aLabel.setPreferredSize(new Dimension(20, 20));
+ aLabel.setHorizontalTextPosition(SwingConstants.LEFT);
+
+ bLabel.setFont(new java.awt.Font("Dialog", 1, 16));
+ bLabel.setForeground(Color.red);
+ bLabel.setText("B");
+ bLabel.setPreferredSize(new Dimension(20, 20));
+
+ aScrollPane.setBorder(BorderFactory.createLoweredBevelBorder());
+ aTextArea.setWrapStyleWord(true);
+ aTextArea.setLineWrap(true);
+ aTextArea.setBackground(Color.white);
+ aTextArea.setFont(new java.awt.Font("Monospaced", 0, 12));
+ aTextArea.setToolTipText(AppStrings.TIP_TEXT_ENTRY);
+ aTextArea.addMouseListener(new java.awt.event.MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+ setFocusGeometry(0);
+ }
+ });
+
+ bScrollPane.setBorder(BorderFactory.createLoweredBevelBorder());
+ bTextArea.setWrapStyleWord(true);
+ bTextArea.setLineWrap(true);
+ bTextArea.setBackground(Color.white);
+ bTextArea.setFont(new java.awt.Font("Monospaced", 0, 12));
+ bTextArea.setToolTipText(AppStrings.TIP_TEXT_ENTRY);
+ bTextArea.addMouseListener(new java.awt.event.MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+ setFocusGeometry(1);
+ }
+ });
+
+ aCopyButton.setToolTipText(AppStrings.TIP_COPY_DATA);
+ aCopyButton.setIcon(copyIcon);
+ aCopyButton.setMargin(new Insets(0, 0, 0, 0));
+
+ aPasteButton.setToolTipText(AppStrings.TIP_PASTE_DATA);
+ aPasteButton.setIcon(pasteIcon);
+ aPasteButton.setMargin(new Insets(0, 0, 0, 0));
+
+ aCutButton.setToolTipText("Clear");
+ aCutButton.setIcon(cutIcon);
+ aCutButton.setMargin(new Insets(0, 0, 0, 0));
+
+ aButtonPanelLayout.setVgap(1);
+ aButtonPanelLayout.setHgap(1);
+// aButtonPanel.setLayout(aButtonPanelLayout);
+ aButtonPanel.add(aPasteButton);
+ aButtonPanel.add(aCopyButton);
+ aButtonPanel.add(aCutButton);
+
+ aLabel.setAlignmentX(LEFT_ALIGNMENT);
+ aRB.setAlignmentX(LEFT_ALIGNMENT);
+ aRB.setSelected(true);
+ aRB.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ setFocusGeometry(0);
+ }
+ });
+ //aLabelPanel.add(aRB);
+ aLabelPanel.add(aLabel);
+ aLabelPanel.add(aButtonPanel);
+
+ aPanel.setLayout(aPanelLayout);
+ aPanel.add(aLabelPanel, BorderLayout.WEST);
+ aPanel.add(aScrollPane, BorderLayout.CENTER);
+ //aPanel.add(aButtonPanel, BorderLayout.EAST);
+
+ bCopyButton.setToolTipText(AppStrings.TIP_COPY_DATA);
+ bCopyButton.setIcon(copyIcon);
+ bCopyButton.setMargin(new Insets(0, 0, 0, 0));
+
+ bPasteButton.setToolTipText(AppStrings.TIP_PASTE_DATA);
+ bPasteButton.setIcon(pasteIcon);
+ bPasteButton.setMargin(new Insets(0, 0, 0, 0));
+
+ bCutButton.setToolTipText("Clear");
+ bCutButton.setIcon(cutIcon);
+ bCutButton.setMargin(new Insets(0, 0, 0, 0));
+
+ bButtonPanelLayout.setVgap(1);
+ bButtonPanelLayout.setHgap(1);
+// bButtonPanel.setLayout(bButtonPanelLayout);
+ bButtonPanel.add(bPasteButton);
+ bButtonPanel.add(bCopyButton);
+ bButtonPanel.add(bCutButton);
+
+ bLabel.setAlignmentX(LEFT_ALIGNMENT);
+ //bLabelPanel.add(bRB);
+ bRB.setAlignmentX(LEFT_ALIGNMENT);
+ bRB.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ setFocusGeometry(1);
+ }
+ });
+ bLabelPanel.add(bLabel);
+ bLabelPanel.add(bButtonPanel);
+
+ bPanel.setLayout(bPanelLayout);
+ bPanel.add(bLabelPanel, BorderLayout.WEST);
+ bPanel.add(bScrollPane, BorderLayout.CENTER);
+ //bPanel.add(bButtonPanel, BorderLayout.EAST);
+
+ this.add(
+ panelAB,
+ new GridBagConstraints(0, 1, 1, 2,
+ 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0),
+ 0, 0));
+ panelAB.add(
+ aPanel,
+ new GridBagConstraints(1, 0, 1, 1,
+ 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0),
+ 0, 0));
+ panelAB.add(
+ bPanel,
+ new GridBagConstraints(1, 1, 1, 1,
+ 1.0, 1.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0),
+ 0, 0));
+ bScrollPane.getViewport().add(bTextArea, null);
+ aScrollPane.getViewport().add(aTextArea, null);
+
+ panelButtons.add(loadButton);
+ panelButtons.add(Box.createVerticalStrut(20));
+ panelButtons.add(exchangeButton);
+ panelButtons.add(Box.createVerticalStrut(10));
+ panelButtons.add(inspectButton);
+
+ this.add(
+ panelButtons,
+ new GridBagConstraints( 1, 1, 1, 1,
+ 0.0, 0.0,
+ GridBagConstraints.NORTHWEST,
+ GridBagConstraints.NONE,
+ new Insets(2, 2, 0, 2),
+ 0, 0));
+
+ loadButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ loadButton_actionPerformed(e);
+ }
+ });
+ inspectButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.inspectGeometry();
+ }
+ });
+ exchangeButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JTSTestBuilderController.exchangeGeometry();
+ }
+ });
+ aCopyButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ aCopyButton_actionPerformed(e);
+ }
+ });
+ aPasteButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ aPasteButton_actionPerformed(e);
+ }
+ });
+ aCutButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ aCutButton_actionPerformed(e);
+ }
+ });
+ bCopyButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ bCopyButton_actionPerformed(e);
+ }
+ });
+ bPasteButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ bPasteButton_actionPerformed(e);
+ }
+ });
+ bCutButton.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ bCutButton_actionPerformed(e);
+ }
+ });
+ editMode.add(aRB);
+ editMode.add(bRB);
+ }
+
+ public void setText(Geometry g, int geomIndex)
+ {
+ String txt = null;
+ if (g == null)
+ txt = "";
+ else if (g.getNumPoints() > DisplayParameters.MAX_DISPLAY_POINTS)
+ txt = GeometryEditModel.toStringVeryLarge(g);
+ else
+ txt = GeometryEditModel.getText(g, GeometryType.WELLKNOWNTEXT);
+
+ switch (geomIndex) {
+ case 0: aTextArea.setText(txt); break;
+ case 1: bTextArea.setText(txt); break;
+ }
+ }
+
+ public String getGeometryTextA() {
+ return aTextArea.getText();
+ }
+
+ public String getGeometryTextB() {
+ return bTextArea.getText();
+ }
+
+ public String getGeometryText(int geomIndex)
+ {
+ if (geomIndex == 0) return aTextArea.getText();
+ return bTextArea.getText();
+ }
+
+ public String getGeometryTextClean(int geomIndex)
+ {
+ String text = getGeometryText(geomIndex);
+ String textTrim = text.trim();
+ if (textTrim.length() == 0) return textTrim;
+ String textClean = textTrim;
+ switch (MultiFormatReader.format(textTrim))
+ {
+ case MultiFormatReader.FORMAT_WKT:
+ textClean = GeometryTextCleaner.cleanWKT(textTrim);
+ break;
+ }
+ return textClean;
+ }
+
+ void aTextArea_keyTyped(KeyEvent e) {
+ loadButton.setEnabled(true);
+ }
+
+ void bTextArea_keyTyped(KeyEvent e) {
+ loadButton.setEnabled(true);
+ }
+
+ void loadButton_actionPerformed(ActionEvent e) {
+ try {
+ tbModel.loadGeometryText(
+ getGeometryTextClean(0),
+ getGeometryTextClean(1));
+ JTSTestBuilderController.zoomToInput();
+ }
+ catch (Exception ex) {
+ SwingUtil.reportException(this, ex);
+ }
+ }
+
+ void aCopyButton_actionPerformed(ActionEvent e) {
+ copy(e, 0);
+ }
+
+ void bCopyButton_actionPerformed(ActionEvent e) {
+ copy(e, 1);
+ }
+
+ void copy(ActionEvent e, int geomIndex)
+ {
+ boolean isFormatted = 0 != (e.getModifiers() & ActionEvent.CTRL_MASK);
+ Geometry g = tbModel.getCurrentCase().getGeometry(geomIndex);
+ if (g != null)
+ SwingUtil.copyToClipboard(g, isFormatted);
+ }
+
+ void aPasteButton_actionPerformed(ActionEvent e)
+ {
+ paste(0);
+ }
+ void bPasteButton_actionPerformed(ActionEvent e) {
+ paste(1);
+ }
+
+ void paste(int geomIndex) {
+ try {
+ tbModel.pasteGeometry(geomIndex);
+ JTSTestBuilderController.zoomToInput();
+ }
+ catch (Exception ex) {
+ JTSTestBuilderFrame.reportException(ex);
+ }
+ }
+
+ void aCutButton_actionPerformed(ActionEvent e) {
+ aTextArea.setText("");
+ tbModel.getGeometryEditModel().clear(0);
+ }
+ void bCutButton_actionPerformed(ActionEvent e) {
+ bTextArea.setText("");
+ tbModel.getGeometryEditModel().clear(1);
+ }
+
+ private void initFileDrop(Component comp, int index)
+ {
+ final int geomIndex = index;
+
+ new FileDrop(comp, new FileDrop.Listener() {
+ public void filesDropped(java.io.File[] files) {
+ try {
+ tbModel.loadMultipleGeometriesFromFile(geomIndex, files[0].getCanonicalPath());
+ //(textArea).setText(FileUtil.readText(files[0]));
+ JTSTestBuilderController.zoomToInput();
+ } catch (Exception ex) {
+ SwingUtil.reportException(null, ex);
+ }
+ }
+ });
+ }
+
+ Border focusBorder = BorderFactory.createMatteBorder(0, 2, 0, 0, Color.green);
+ //Border otherBorder = BorderFactory.createEmptyBorder();
+ Border otherBorder = BorderFactory.createMatteBorder(0, 2, 0, 0, Color.white);
+
+ private static Color focusBackgroundColor = Color.white; //new Color(240,255,250);
+ private static Color otherBackgroundColor = SystemColor.control;
+
+ private void setFocusGeometry(int index) {
+ JTSTestBuilderController.setFocusGeometry(index);
+
+ JTextArea focusTA = index == 0 ? aTextArea : bTextArea;
+ JTextArea otherTA = index == 0 ? bTextArea : aTextArea;
+ //focusTA.setBorder(focusBorder);
+ //otherTA.setBorder(otherBorder);
+
+ focusTA.setBackground(focusBackgroundColor);
+ otherTA.setBackground(otherBackgroundColor);
+ repaint();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/JTSTestBuilderController.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/JTSTestBuilderController.java
new file mode 100644
index 0000000..732585c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/JTSTestBuilderController.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.controller;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderToolBar;
+import org.locationtech.jtstest.testbuilder.model.DisplayParameters;
+import org.locationtech.jtstest.testbuilder.model.LayerList;
+import org.locationtech.jtstest.testbuilder.model.TestBuilderModel;
+import org.locationtech.jtstest.testbuilder.ui.SwingUtil;
+
+
+public class JTSTestBuilderController
+{
+ /*
+ private static boolean autoZoomOnNextChange = false;
+
+
+ public static void requestAutoZoom()
+ {
+ autoZoomOnNextChange = true;
+ }
+ */
+
+
+ public static void setShowingStructure(boolean showStructure) {
+ DisplayParameters.setShowingStructure(showStructure);
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+ public static void setShowingOrientations(boolean showingOrientations) {
+ DisplayParameters.setShowingOrientation(showingOrientations);
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+ public void setShowVertexIndices(boolean showVertexIndices) {
+ DisplayParameters.setShowingOrientation(showVertexIndices);
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+ public static void setShowingVertices(boolean showingVertices) {
+ DisplayParameters.setShowingVertices(showingVertices);
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+ public static void setShowingLabel(boolean showLabel) {
+ DisplayParameters.setShowingLabel(showLabel);
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+ public static void setFillType(int fillType) {
+ DisplayParameters.setFillType(fillType);
+ JTSTestBuilderController.geometryViewChanged();
+ }
+
+ public static void geometryViewChanged()
+ {
+ getGeometryEditPanel().updateView();
+ //TODO: provide autoZoom checkbox on Edit tab to control autozooming (default = on)
+ }
+
+ public static GeometryEditPanel getGeometryEditPanel()
+ {
+ return JTSTestBuilderFrame.getGeometryEditPanel();
+ }
+
+ public static Geometry getGeometryA() {
+ return JTSTestBuilder.model().getGeometryEditModel().getGeometry(0);
+ }
+
+ public static Geometry getGeometryB() {
+ return JTSTestBuilder.model().getGeometryEditModel().getGeometry(1);
+ }
+
+ public static void zoomToFullExtent()
+ {
+ getGeometryEditPanel().zoomToFullExtent();
+ }
+
+ public static void zoomToInput()
+ {
+ getGeometryEditPanel().zoomToInput();
+ }
+
+ public static void addTestCase(Geometry[] geom, String name)
+ {
+ model().addCase(geom, name);
+ JTSTestBuilderFrame.instance().updateTestCases();
+ }
+
+ public static void extractComponentsToTestCase(Coordinate pt)
+ {
+ double toleranceInModel = getGeometryEditPanel().getToleranceInModel();
+ LayerList lyrList = model().getLayers();
+ Geometry comp = lyrList.getComponent(pt, toleranceInModel);
+ if (comp == null)
+ return;
+ model().addCase(new Geometry[] { comp, null });
+ JTSTestBuilderFrame.instance().updateTestCases();
+ }
+
+ public static void extractComponentsToTestCase(Geometry aoi)
+ {
+ //double toleranceInModel = JTSTestBuilderFrame.getGeometryEditPanel().getToleranceInModel();
+ LayerList lyrList = model().getLayers();
+ Geometry[] comp = lyrList.getComponents(aoi);
+ if (comp == null)
+ return;
+ model().addCase(comp);
+ JTSTestBuilderFrame.instance().updateTestCases();
+ toolbar().clearToolButtons();
+ toolbar().unselectExtractComponentButton();
+ editPanel().setCurrentTool(null);
+ }
+
+ public static void copyComponentToClipboard(Coordinate pt)
+ {
+ double toleranceInModel = getGeometryEditPanel().getToleranceInModel();
+ LayerList lyrList = model().getLayers();
+ Geometry comp = lyrList.getComponent(pt, toleranceInModel);
+ if (comp == null)
+ return;
+ SwingUtil.copyToClipboard(comp, false);
+ }
+
+ public static void setFocusGeometry(int index) {
+ model().getGeometryEditModel().setEditGeomIndex(index);
+ toolbar().setFocusGeometry(index);
+ }
+
+ public static void inspectGeometry()
+ {
+ JTSTestBuilderFrame.instance().actionInspectGeometry();
+ }
+ public static void exchangeGeometry()
+ {
+ JTSTestBuilderFrame.instance().actionExchangeGeoms();
+ }
+ public static void inspectGeometryDialog()
+ {
+ JTSTestBuilderFrame.instance().actionInspectGeometryDialog();
+ }
+ public static void clearResult()
+ {
+ JTSTestBuilderFrame.instance().getResultWKTPanel().clearResult();
+ model().setResult(null);
+ editPanel().updateView();
+ }
+
+ private static TestBuilderModel model() {
+ return JTSTestBuilderFrame.instance().getModel();
+ }
+ private static GeometryEditPanel editPanel() {
+ return JTSTestBuilderFrame.instance().getGeometryEditPanel();
+ }
+
+ private static JTSTestBuilderToolBar toolbar() {
+ return JTSTestBuilderFrame.instance().getToolbar();
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/ResultController.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/ResultController.java
new file mode 100644
index 0000000..fcf7f21
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/ResultController.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.controller;
+
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.NumberFormat;
+
+import javax.swing.Timer;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.util.Stopwatch;
+import org.locationtech.jtstest.geomfunction.GeometryFunction;
+import org.locationtech.jtstest.geomfunction.GeometryFunctionInvocation;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+import org.locationtech.jtstest.testbuilder.SpatialFunctionPanel;
+import org.locationtech.jtstest.testbuilder.event.SpatialFunctionPanelEvent;
+import org.locationtech.jtstest.testbuilder.model.TestBuilderModel;
+import org.locationtech.jtstest.testbuilder.ui.SwingWorker;
+
+
+public class ResultController
+{
+ private static NumberFormat timeFmt;
+ static {
+ timeFmt = NumberFormat.getNumberInstance();
+ timeFmt.setMinimumFractionDigits(3);
+ }
+
+ JTSTestBuilderFrame frame;
+ TestBuilderModel model = null;
+
+ public ResultController(JTSTestBuilderFrame frame)
+ {
+ this.frame = frame;
+ model = JTSTestBuilder.model();
+ }
+
+ public void spatialFunctionPanel_functionExecuted(SpatialFunctionPanelEvent e)
+ {
+ SpatialFunctionPanel spatialPanel = frame.getTestCasePanel().getSpatialFunctionPanel();
+ GeometryFunctionInvocation functionDesc = new GeometryFunctionInvocation(
+ spatialPanel.getFunction(),
+ spatialPanel.getFunctionParams());
+ model.setOpName(functionDesc.getSignature());
+ frame.getResultWKTPanel().setOpName(model.getOpName());
+ // initialize UI view
+ clearResult();
+ // don't run anything if function is null
+ if (! frame.getTestCasePanel().getSpatialFunctionPanel().isFunctionSelected()) {
+ return;
+ }
+
+ frame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ frame.getTestCasePanel().getSpatialFunctionPanel().enableExecuteControl(false);
+ startFunctionMonitor();
+ runFunctionWorker(functionDesc, e.isCreateNew());
+ frame.showResultWKTTab();
+ }
+
+ private void clearResult()
+ {
+ frame.getResultWKTPanel().clearResult();
+ // for good measure do a GC
+ System.gc();
+ updateResult(null,null,null);
+ }
+
+ /**
+ * If result is null, clears result info.
+ *
+ * @param result
+ * @param object
+ * @param object
+ * @param timer
+ */
+ private void resetUI() {
+ frame.getTestCasePanel().getSpatialFunctionPanel()
+ .enableExecuteControl(true);
+ frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+ }
+ private void updateResult(GeometryFunctionInvocation functionDesc, Object result, Stopwatch timer) {
+ model.setResult(result);
+ String timeString = timer != null ? timer.getTimeString() : "";
+ frame.getResultWKTPanel().setExecutedTime(timeString);
+ frame.getResultWKTPanel().updateResult();
+ JTSTestBuilderController.geometryViewChanged();
+ // log it
+ if (result != null) {
+ JTSTestBuilderFrame.instance().displayInfo(
+ functionDesc.getSignature() + " : " + timeString, false);
+ }
+ }
+
+ private SwingWorker worker = null;
+
+ private void runFunctionWorker(final GeometryFunctionInvocation functionInvoc, final boolean createNew)
+ {
+ worker = new SwingWorker() {
+ Stopwatch timer;
+
+ public Object construct()
+ {
+ return computeResult();
+ }
+
+ private Object computeResult() {
+ Object result = null;
+ GeometryFunction currentFunc = functionInvoc.getFunction();
+ if (currentFunc == null)
+ return null;
+
+ try {
+ timer = new Stopwatch();
+ try {
+ result = currentFunc.invoke(model.getGeometryEditModel()
+ .getGeometry(0), functionInvoc.getArgs());
+ } finally {
+ timer.stop();
+ }
+ // result = currentState.getActualValue();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace(System.out);
+ result = ex;
+ }
+ return result;
+ }
+
+ public void finished() {
+ stopFunctionMonitor();
+ resetUI();
+ Object result = getValue();
+ if (createNew) {
+ String desc = "Result of " + functionInvoc.getSignature();
+ JTSTestBuilderController.addTestCase(new Geometry[] { (Geometry) result, null }, desc);
+ } else {
+ updateResult(functionInvoc, result, timer);
+ }
+ worker = null;
+ }
+ };
+ worker.start();
+ }
+
+ private void clearFunctionWorker()
+ {
+
+ }
+
+ private Timer funcTimer;
+ private long runMillis = 0;
+ private static final int TIMER_DELAY_IN_MILLIS = 10;
+
+ private void startFunctionMonitor()
+ {
+ runMillis = 0;
+ funcTimer = new Timer(TIMER_DELAY_IN_MILLIS, new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+// Stopwatch timer = testCasePanel.getSpatialFunctionPanel().getTimer();
+ runMillis += TIMER_DELAY_IN_MILLIS;
+ String timeStr = "";
+ if (runMillis < 10000) {
+ timeStr = runMillis + " ms";
+ }
+ else {
+ timeStr = timeFmt.format(runMillis/1000.0) + " s";
+ }
+ frame.getResultWKTPanel().setRunningTime(timeStr);
+ }
+ });
+ funcTimer.setInitialDelay(0);
+ funcTimer.start();
+ }
+
+ private void stopFunctionMonitor()
+ {
+ funcTimer.stop();
+ }
+
+ public void scalarFunctionPanel_functionExecuted(SpatialFunctionPanelEvent e)
+ {
+ /**
+ * For now scalar functions are executed on the calling thread.
+ * They are expected to be of short duration
+ */
+ String opName = frame.getTestCasePanel().getScalarFunctionPanel().getOpName();
+ // initialize UI view
+ frame.getResultValuePanel().setResult(opName, "", null);
+
+ frame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ Object result = frame.getTestCasePanel().getScalarFunctionPanel().getResult();
+ Stopwatch timer = frame.getTestCasePanel().getScalarFunctionPanel().getTimer();
+ frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+
+ frame.getResultValuePanel().setResult(opName, timer.getTimeString(), result);
+ frame.showResultValueTab();
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/GeometryFunctionEvent.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/GeometryFunctionEvent.java
new file mode 100644
index 0000000..cc826c3
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/GeometryFunctionEvent.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.event;
+
+import java.util.EventObject;
+
+import org.locationtech.jtstest.function.*;
+import org.locationtech.jtstest.geomfunction.GeometryFunction;
+
+/**
+ */
+public class GeometryFunctionEvent extends EventObject {
+
+ public GeometryFunctionEvent(GeometryFunction source) {
+ super(source);
+ }
+
+ public GeometryFunction getFunction() { return (GeometryFunction) getSource(); }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/GeometryFunctionListener.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/GeometryFunctionListener.java
new file mode 100644
index 0000000..7f534f4
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/GeometryFunctionListener.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.event;
+
+import java.util.EventListener;
+
+/**
+ */
+public interface GeometryFunctionListener extends EventListener {
+
+ public void functionSelected(GeometryFunctionEvent e);
+ public void functionInvoked(GeometryFunctionEvent e);
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/SpatialFunctionPanelEvent.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/SpatialFunctionPanelEvent.java
new file mode 100644
index 0000000..c896dc7
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/SpatialFunctionPanelEvent.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.event;
+
+import java.util.EventObject;
+
+/**
+ * Title:
+ * Description:
+ * Copyright: Copyright (c) 2001
+ * Company:
+ * @author
+ * @version 1.7
+ */
+public class SpatialFunctionPanelEvent extends EventObject {
+
+ private boolean createNew = false;
+
+ public SpatialFunctionPanelEvent(Object source) {
+ super(source);
+ }
+
+ public SpatialFunctionPanelEvent(Object source,
+ boolean createNew) {
+ super(source);
+ this. createNew = createNew;
+ }
+
+ public boolean isCreateNew()
+ {
+ return createNew;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/SpatialFunctionPanelListener.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/SpatialFunctionPanelListener.java
new file mode 100644
index 0000000..a0794c5
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/SpatialFunctionPanelListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.event;
+
+import java.util.EventListener;
+
+/**
+ * Title:
+ * Description:
+ * Copyright: Copyright (c) 2001
+ * Company:
+ * @author
+ * @version 1.7
+ */
+public interface SpatialFunctionPanelListener extends EventListener {
+
+ public void functionExecuted(SpatialFunctionPanelEvent e);
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/ValidPanelEvent.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/ValidPanelEvent.java
new file mode 100644
index 0000000..7e76309
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/ValidPanelEvent.java
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.event;
+
+import java.util.EventObject;
+
+/**
+ * Title:
+ * Description:
+ * Copyright: Copyright (c) 2001
+ * Company:
+ * @author
+ * @version 1.7
+ */
+public class ValidPanelEvent extends EventObject {
+
+ public ValidPanelEvent(Object source) {
+ super(source);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/ValidPanelListener.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/ValidPanelListener.java
new file mode 100644
index 0000000..9ad0532
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/event/ValidPanelListener.java
@@ -0,0 +1,27 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.event;
+
+import java.util.EventListener;
+
+/**
+ * Title:
+ * Description:
+ * Copyright: Copyright (c) 2001
+ * Company:
+ * @author
+ * @version 1.7
+ */
+public interface ValidPanelListener extends EventListener {
+ public void setHighlightPerformed(ValidPanelEvent e);
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/AdjacentVertexFinder.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/AdjacentVertexFinder.java
new file mode 100644
index 0000000..0fc0b70
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/AdjacentVertexFinder.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+
+
+/**
+ * Locates all vertices in a geometry which are adjacent
+ * to a given vertex.
+ *
+ * @author mbdavis
+ *
+ */
+public class AdjacentVertexFinder
+{
+ public static Coordinate[] findVertices(Geometry geom, Coordinate testPt)
+ {
+ AdjacentVertexFinder finder = new AdjacentVertexFinder(geom);
+ return finder.getVertices(testPt);
+ }
+
+ private Geometry geom;
+ private Coordinate vertexPt;
+ private int vertexIndex = -1;
+
+ public AdjacentVertexFinder(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public Coordinate[] getVertices(Coordinate testPt)
+ {
+ AdjacentVertexFilter filter = new AdjacentVertexFilter(testPt);
+ geom.apply(filter);
+ return filter.getVertices();
+ }
+
+ public int getIndex() { return vertexIndex; }
+
+ static class AdjacentVertexFilter implements CoordinateSequenceFilter
+ {
+ private Coordinate basePt;
+ private List adjVerts = new ArrayList();
+
+ public AdjacentVertexFilter(Coordinate basePt)
+ {
+ this.basePt = basePt;
+ }
+
+ public void filter(CoordinateSequence seq, int i)
+ {
+ Coordinate p = seq.getCoordinate(i);
+ if (! p.equals2D(basePt))
+ return;
+
+ if (i > 0) {
+ adjVerts.add(seq.getCoordinate(i - 1));
+ }
+ if (i < seq.size() - 1) {
+ adjVerts.add(seq.getCoordinate(i + 1));
+ }
+ }
+
+ public Coordinate[] getVertices()
+ {
+ return CoordinateArrays.toCoordinateArray(adjVerts);
+ }
+
+ public boolean isDone() { return false; }
+
+ public boolean isGeometryChanged() { return false; }
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/ComponentLocater.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/ComponentLocater.java
new file mode 100644
index 0000000..7ba0fe8
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/ComponentLocater.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+
+
+/**
+ * Locates the components of a Geometry
+ * which lie in a target area.
+ *
+ * @author Martin Davis
+ * @see FacetLocater
+ */
+public class ComponentLocater {
+
+ private Geometry parentGeom;
+ private List components = new ArrayList();
+ private Geometry aoi;
+
+ public ComponentLocater(Geometry parentGeom) {
+ this.parentGeom = parentGeom;
+ }
+
+ /**
+ *
+ * @param queryPt
+ * @param tolerance
+ * @return a List of the component Geometrys
+ */
+ public List getComponents(Coordinate queryPt, double tolerance)
+ {
+ //Coordinate queryPt = queryPt;
+ //this.tolerance = tolerance;
+ aoi = createAOI(queryPt, tolerance);
+ return getComponents(aoi);
+ }
+
+ public List getComponents(Geometry aoi)
+ {
+ //Coordinate queryPt = queryPt;
+ //this.tolerance = tolerance;
+ this.aoi = aoi;
+ findComponents(new Stack(), parentGeom, components);
+ return components;
+ }
+
+ private Geometry createAOI(Coordinate queryPt, double tolerance)
+ {
+ Envelope env = new Envelope(queryPt);
+ env.expandBy(2 * tolerance);
+ return parentGeom.getFactory().toGeometry(env);
+ }
+
+ private void findComponents(Stack path, Geometry geom, List components)
+ {
+ if (geom instanceof GeometryCollection) {
+ for (int i = 0; i < geom.getNumGeometries(); i++ ) {
+ Geometry subGeom = geom.getGeometryN(i);
+ path.push(new Integer(i));
+ findComponents(path, subGeom, components);
+ path.pop();
+ }
+ return;
+ }
+ // TODO: make this robust - do not use Geometry.intersects()
+ // atomic component - check for match
+ if (aoi.intersects(geom))
+ components.add(new GeometryLocation(parentGeom, geom,
+ FacetLocater.toIntArray(path)));
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/EnvelopeUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/EnvelopeUtil.java
new file mode 100644
index 0000000..1b7bec0
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/EnvelopeUtil.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.Envelope;
+
+public class EnvelopeUtil
+{
+ public static double minExtent(Envelope env)
+ {
+ double w = env.getWidth();
+ double h = env.getHeight();
+ if (w < h) return w;
+ return h;
+ }
+ public static double maxExtent(Envelope env)
+ {
+ double w = env.getWidth();
+ double h = env.getHeight();
+ if (w > h) return w;
+ return h;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/FacetLocater.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/FacetLocater.java
new file mode 100644
index 0000000..509d4ce
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/FacetLocater.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+
+/**
+ * Locates the paths to facets (vertices and segments) of
+ * a {@link Geometry} which are within a given tolerance
+ * of a query point.
+ *
+ *
+ * @author Martin Davis
+ *
+ */
+public class FacetLocater
+{
+ /**
+ * Creates a list containing all the vertex {@link GeometryLocation}s
+ * in the input collection.
+ *
+ * @param locations the source collection
+ * @return a list of the vertex locations, if any
+ */
+ public static List filterVertexLocations(Collection locations)
+ {
+ ArrayList vertexLocs = new ArrayList();
+ for (Iterator i = locations.iterator(); i.hasNext(); ) {
+ GeometryLocation loc = (GeometryLocation) i.next();
+ if (loc.isVertex()) vertexLocs.add(loc);
+ }
+ return vertexLocs;
+ }
+
+ private Geometry parentGeom;
+ private List locations = new ArrayList();
+ private Coordinate queryPt;
+ private double tolerance = 0.0;
+
+ public FacetLocater(Geometry parentGeom) {
+ this.parentGeom = parentGeom;
+ }
+
+ public List getLocations(Coordinate queryPt, double tolerance)
+ {
+ this.queryPt = queryPt;
+ this.tolerance = tolerance;
+ findLocations(parentGeom, locations);
+ return locations;
+ }
+
+ private void findLocations(Geometry geom, List locations)
+ {
+ findLocations(new Stack(), parentGeom, locations);
+ }
+
+ private void findLocations(Stack path, Geometry geom, List locations)
+ {
+ if (geom instanceof GeometryCollection) {
+ for (int i = 0; i < geom.getNumGeometries(); i++ ) {
+ Geometry subGeom = geom.getGeometryN(i);
+ path.push(new Integer(i));
+ findLocations(path, subGeom, locations);
+ path.pop();
+ }
+ }
+ else if (geom instanceof Polygon) {
+ findLocations(path, (Polygon) geom, locations);
+
+ }
+ else {
+ CoordinateSequence seq;
+
+ if (geom instanceof LineString) {
+ seq = ((LineString) geom).getCoordinateSequence();
+ }
+ else if (geom instanceof Point) {
+ seq = ((Point) geom).getCoordinateSequence();
+ }
+ else {
+ throw new IllegalStateException("Unknown geometry type: " + geom.getClass().getName());
+ }
+ findLocations(path, geom, seq, locations);
+ }
+ }
+
+ private void findLocations(Stack path, Polygon poly, List locations)
+ {
+ path.push(new Integer(0));
+ findLocations(path,
+ poly.getExteriorRing(),
+ poly.getExteriorRing().getCoordinateSequence(), locations);
+ path.pop();
+
+ for (int i = 0; i < poly.getNumInteriorRing(); i++ ) {
+ path.push(new Integer(i + 1));
+ findLocations(path,
+ poly.getInteriorRingN(i),
+ poly.getInteriorRingN(i).getCoordinateSequence(), locations);
+ path.pop();
+ }
+ }
+
+ private void findLocations(Stack path, Geometry compGeom, CoordinateSequence seq, List locations)
+ {
+ findVertexLocations(path, compGeom, seq, locations);
+ findSegmentLocations(path, compGeom, seq, locations);
+ }
+
+ private void findVertexLocations(Stack path, Geometry compGeom, CoordinateSequence seq, List locations)
+ {
+ for (int i = 0; i < seq.size(); i++) {
+ Coordinate p = seq.getCoordinate(i);
+ double dist = p.distance(queryPt);
+ if (dist <= tolerance)
+ locations.add(new GeometryLocation(parentGeom, compGeom, toIntArray(path), i, true, p));
+ }
+ }
+
+ private void findSegmentLocations(Stack path, Geometry compGeom, CoordinateSequence seq, List locations)
+ {
+ LineSegment seg = new LineSegment();
+ for (int i = 0; i < seq.size() - 1; i++) {
+ seg.p0 = seq.getCoordinate(i);
+ seg.p1 = seq.getCoordinate(i+1);
+ double dist = seg.distance(queryPt);
+ if (dist <= tolerance)
+ locations.add(new GeometryLocation(parentGeom, compGeom, toIntArray(path), i, false, seg.p0));
+ }
+ }
+
+ public static int[] toIntArray(Vector path)
+ {
+ int[] index = new int[path.size()];
+ int i = 0;
+ for (Iterator it = path.iterator(); it.hasNext(); ) {
+ Integer pathIndex = (Integer) it.next();
+ index[i++] = pathIndex.intValue();
+ }
+ return index;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryBoxDeleter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryBoxDeleter.java
new file mode 100644
index 0000000..ecd0c13
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryBoxDeleter.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.util.GeometryEditor;
+
+/**
+ * Deletes vertices or components from a geometry
+ * which lie inside a given box.
+ * If the box completely contains one or more components
+ * (including polygon holes), those components are deleted
+ * and the operation stops.
+ * Otherwise if the box contains a subset of vertices
+ * from a component, those vertices are deleted.
+ * When deleting vertices only <i>one</i> component of the geometry
+ * is modified (the first one found which has vertices in the box).
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryBoxDeleter
+{
+ public static Geometry delete(Geometry geom,
+ Envelope env)
+ {
+ Geometry gComp = deleteComponents(geom, env);
+ if (gComp != null) return gComp;
+
+ // otherwise, try and edit vertices
+ Geometry gVert = deleteVertices(geom, env);
+ if (gVert != null) return gVert;
+
+ // no edits - return original
+ return geom;
+ }
+
+ private static Geometry deleteComponents(Geometry geom, Envelope env)
+ {
+ GeometryEditor editor = new GeometryEditor();
+ BoxDeleteComponentOperation compOp = new BoxDeleteComponentOperation(env);
+ Geometry compEditGeom = editor.edit(geom, compOp);
+ if (compOp.isEdited()) return compEditGeom;
+ return null;
+ }
+
+ private static Geometry deleteVertices(Geometry geom, Envelope env)
+ {
+ GeometryEditor editor = new GeometryEditor();
+ BoxDeleteVertexOperation vertexOp = new BoxDeleteVertexOperation(env);
+ Geometry vertexEditGeom = editor.edit(geom, vertexOp);
+ if (vertexOp.isEdited()) return vertexEditGeom;
+ return null;
+ }
+
+ private static class BoxDeleteComponentOperation
+ implements GeometryEditor.GeometryEditorOperation
+ {
+ private Envelope env;
+ private boolean isEdited = false;
+
+ public BoxDeleteComponentOperation(Envelope env)
+ {
+ this.env = env;
+ }
+
+ public boolean isEdited() { return isEdited; }
+
+ public Geometry edit(Geometry geometry, GeometryFactory factory)
+ {
+ // Allow any number of components to be deleted
+ //if (isEdited) return geometry;
+ if (env.contains(geometry.getEnvelopeInternal())) {
+ isEdited = true;
+ return null;
+ }
+ return geometry;
+ }
+ }
+
+ private static class BoxDeleteVertexOperation
+ extends GeometryEditor.CoordinateOperation
+ {
+ private Envelope env;
+ private boolean isEdited = false;
+
+ public BoxDeleteVertexOperation(Envelope env)
+ {
+ this.env = env;
+ }
+
+ public boolean isEdited() { return isEdited; }
+
+ public Coordinate[] edit(Coordinate[] coords,
+ Geometry geometry)
+ {
+ if (isEdited) return coords;
+ if (! hasVertexInBox(coords))
+ return coords;
+ // only delete vertices of first component found
+
+ int minLen = 2;
+ if (geometry instanceof LinearRing) minLen = 4;
+
+ Coordinate[] newPts = new Coordinate[coords.length];
+ int newIndex = 0;
+ for (int i = 0; i < coords.length; i++) {
+ if (! env.contains(coords[i])) {
+ newPts[newIndex++] = coords[i];
+ }
+ }
+ Coordinate[] nonNullPts = CoordinateArrays.removeNull(newPts);
+ Coordinate[] finalPts = nonNullPts;
+
+ // close ring if required
+ if (geometry instanceof LinearRing) {
+ if (nonNullPts.length > 1 && ! nonNullPts[nonNullPts.length - 1].equals2D(nonNullPts[0])) {
+ Coordinate[] ringPts = new Coordinate[nonNullPts.length + 1];
+ CoordinateArrays.copyDeep(nonNullPts, 0, ringPts, 0, nonNullPts.length);
+ ringPts[ringPts.length-1] = new Coordinate(ringPts[0]);
+ finalPts = ringPts;
+ }
+ }
+
+ // don't change if would make geometry invalid
+ if (finalPts.length < minLen)
+ return coords;
+
+ isEdited = true;
+ return finalPts;
+ }
+
+ private boolean hasVertexInBox(Coordinate[] coords)
+ {
+ for (int i = 0; i < coords.length; i++) {
+ if (env.contains(coords[i])) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryCombiner.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryCombiner.java
new file mode 100644
index 0000000..cedb9ae
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryCombiner.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import java.util.*;
+
+import org.locationtech.jts.algorithm.*;
+import org.locationtech.jts.geom.*;
+
+public class GeometryCombiner
+{
+ private GeometryFactory geomFactory;
+
+ public GeometryCombiner(GeometryFactory geomFactory) {
+ this.geomFactory = geomFactory;
+ }
+
+ public Geometry addPolygonRing(Geometry orig, Coordinate[] pts)
+ {
+ LinearRing ring = geomFactory.createLinearRing(pts);
+
+ if (orig == null) {
+ return geomFactory.createPolygon(ring, null);
+ }
+ if (! (orig instanceof Polygonal)) {
+ return combine(orig,
+ geomFactory.createPolygon(ring, null));
+ }
+ // add the ring as either a hole or a shell
+ Polygon polyContaining = findPolygonContaining(orig, pts[0]);
+ if (polyContaining == null) {
+ return combine(orig, geomFactory.createPolygon(ring, null));
+ }
+
+ // add ring as hole
+ Polygon polyWithHole = addHole(polyContaining, ring);
+ return replace(orig, polyContaining, polyWithHole);
+ }
+
+ public Geometry addLineString(Geometry orig, Coordinate[] pts)
+ {
+ LineString line = geomFactory.createLineString(pts);
+ return combine(orig, line);
+ }
+
+ public Geometry addPoint(Geometry orig, Coordinate pt)
+ {
+ Point point = geomFactory.createPoint(pt);
+ return combine(orig, point);
+ }
+
+ private static Polygon findPolygonContaining(Geometry geom, Coordinate pt)
+ {
+ PointLocator locator = new PointLocator();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Polygon poly = (Polygon) geom.getGeometryN(i);
+ int loc = locator.locate(pt, poly);
+ if (loc == Location.INTERIOR)
+ return poly;
+ }
+ return null;
+ }
+
+ public Polygon addHole(Polygon poly, LinearRing hole)
+ {
+ int nOrigHoles = poly.getNumInteriorRing();
+ LinearRing[] newHoles = new LinearRing[nOrigHoles + 1];
+ for (int i = 0; i < nOrigHoles; i++) {
+ newHoles[i] = (LinearRing) poly.getInteriorRingN(i);
+ }
+ newHoles[nOrigHoles] = hole;
+ return geomFactory.createPolygon((LinearRing) poly.getExteriorRing(), newHoles);
+ }
+
+ public Geometry combine(Geometry orig, Geometry geom)
+ {
+ List origList = extractElements(orig, true);
+ List geomList = extractElements(geom, true);
+ origList.addAll(geomList);
+
+ if (origList.size() == 0) {
+ // return a clone of the orig geometry
+ return (Geometry) orig.clone();
+ }
+ // return the "simplest possible" geometry
+ return geomFactory.buildGeometry(origList);
+ }
+
+ public static List extractElements(Geometry geom, boolean skipEmpty)
+ {
+ List elem = new ArrayList();
+ if (geom == null)
+ return elem;
+
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry elemGeom = geom.getGeometryN(i);
+ if (skipEmpty && elemGeom.isEmpty())
+ continue;
+ elem.add(elemGeom);
+ }
+ return elem;
+ }
+
+ public static Geometry replace(Geometry parent, Geometry original, Geometry replacement)
+ {
+ List elem = extractElements(parent, false);
+ Collections.replaceAll(elem, original, replacement);
+ return parent.getFactory().buildGeometry(elem);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryLocation.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryLocation.java
new file mode 100644
index 0000000..0a45bba
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryLocation.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.*;
+
+/**
+ * Models the location of a point on a Geometry
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryLocation
+{
+ /**
+ * The top-level geometry containing the location
+ */
+ private Geometry parent;
+ /**
+ * The Geometry component containing the location
+ */
+ private Geometry component;
+
+ /**
+ * The path of indexes to the component containing the location
+ */
+ private int[] componentPath;
+
+ /**
+ * The index of the vertex or segment the location occurs on
+ */
+ private int index;
+
+ /**
+ * Indicates whether this location is a vertex of the geometry
+ */
+ private boolean isVertex = true;
+
+ /**
+ * The actual coordinate for the location
+ */
+ private Coordinate pt;
+
+ public GeometryLocation(Geometry parent, Geometry component, int[] componentPath)
+ {
+ this.parent = parent;
+ this.component = component;
+ this.componentPath = componentPath;
+ }
+
+ public GeometryLocation(Geometry parent, Geometry component, int index, Coordinate pt)
+ {
+ this.parent = parent;
+ this.component = component;
+ this.index = index;
+ this.pt = pt;
+ }
+
+ public GeometryLocation(Geometry parent, Geometry component, int segmentIndex, boolean isVertex,
+ Coordinate pt)
+ {
+ this.parent = parent;
+ this.component = component;
+ this.index = segmentIndex;
+ this.isVertex = isVertex;
+ this.pt = pt;
+ }
+
+ public GeometryLocation(Geometry parent, Geometry component, int[] componentPath, int segmentIndex, boolean isVertex,
+ Coordinate pt)
+ {
+ this.parent = parent;
+ this.component = component;
+ this.componentPath = componentPath;
+ this.index = segmentIndex;
+ this.isVertex = isVertex;
+ this.pt = pt;
+ }
+
+ public Geometry getComponent()
+ {
+ return component;
+ }
+
+ public Coordinate getCoordinate() { return pt; }
+
+ public boolean isVertex() { return isVertex; }
+
+ public Geometry insert()
+ {
+ return GeometryVertexInserter.insert(parent, (LineString) component, index, pt);
+ }
+
+ public Geometry delete()
+ {
+ return GeometryVertexDeleter.delete(parent, (LineString) component, index);
+ }
+
+ public double getLength()
+ {
+ if (isVertex()) return 0;
+ Coordinate p1 = component.getCoordinates()[index + 1];
+ return pt.distance(p1);
+ }
+ public String toString()
+ {
+ return pt.toString();
+ }
+
+ public String pathString()
+ {
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < componentPath.length; i++) {
+ if (i > 0) {
+ buf.append(":");
+ }
+ buf.append(componentPath[i]);
+ }
+ return buf.toString();
+ }
+
+ public String toFacetString()
+ {
+ StringBuffer buf = new StringBuffer();
+
+ // facet index
+ buf.append("[");
+ for (int i = 0; i < componentPath.length; i++) {
+ if (i > 0) {
+ buf.append(":");
+ }
+ buf.append(componentPath[i]);
+ }
+ buf.append(" ");
+ buf.append(index);
+ if (! isVertex()) {
+ buf.append("-" + (index + 1));
+ }
+ buf.append("] ");
+
+ // facet value
+ buf.append(isVertex() ? "POINT " : "LINESTRING ");
+
+ buf.append("( ");
+ buf.append(pt.x);
+ buf.append(" ");
+ buf.append(pt.y);
+ if (! isVertex()) {
+ Coordinate p1 = component.getCoordinates()[index + 1];
+ buf.append(", ");
+ buf.append(p1.x);
+ buf.append(" ");
+ buf.append(p1.y);
+ }
+ buf.append(" )");
+ return buf.toString();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryPointLocater.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryPointLocater.java
new file mode 100644
index 0000000..cf94eb5
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryPointLocater.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.*;
+
+/**
+ * Finds a vertex or a point on a segment of a Geometry
+ * which lies within a tolerance of a given point.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryPointLocater
+{
+ public static GeometryLocation locateNonVertexPoint(Geometry geom, Coordinate testPt, double tolerance)
+ {
+ GeometryPointLocater finder = new GeometryPointLocater(geom);
+ GeometryLocation geomLoc = finder.getLocation(testPt, false, tolerance);
+ if (geomLoc == null) return null;
+ if (geomLoc.isVertex()) return null;
+ return geomLoc;
+ }
+
+ public static GeometryLocation locateVertex(Geometry geom, Coordinate testPt, double tolerance)
+ {
+ GeometryPointLocater finder = new GeometryPointLocater(geom);
+ GeometryLocation geomLoc = finder.getLocation(testPt, true, tolerance);
+ if (geomLoc == null) return null;
+ if (geomLoc.isVertex()) return geomLoc;
+ return null;
+ }
+
+ private Geometry geom;
+ private Coordinate locationPt;
+ private int segIndex = -1;
+ private boolean isVertex = false;
+
+ public GeometryPointLocater(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public GeometryLocation getLocation(Coordinate testPt, boolean vertexOnly, double tolerance)
+ {
+ NearestSegmentLocationFilter filter = new NearestSegmentLocationFilter(testPt, vertexOnly, tolerance);
+ geom.apply(filter);
+
+ locationPt = filter.getCoordinate();
+ segIndex = filter.getIndex();
+ isVertex = filter.isVertex();
+
+ if (locationPt == null)
+ return null;
+
+ return new GeometryLocation(geom,
+ filter.getComponent(),
+ filter.getIndex(),
+ filter.isVertex(),
+ filter.getCoordinate());
+ }
+
+ public int getIndex() { return segIndex; }
+
+ public boolean isVertex() { return isVertex; }
+
+ static class NearestSegmentLocationFilter implements GeometryComponentFilter
+ {
+ private double tolerance = 0.0;
+ private Coordinate testPt;
+ private boolean vertexOnly = false;
+
+ private Geometry component = null;
+ private int segIndex = -1;
+ private Coordinate nearestPt = null;
+ private boolean isVertex = false;
+
+ private LineSegment seg = new LineSegment();
+
+ public NearestSegmentLocationFilter(Coordinate testPt, boolean vertexOnly, double tolerance)
+ {
+ this.testPt = testPt;
+ this.tolerance = tolerance;
+ this.vertexOnly = vertexOnly;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (! (geom instanceof LineString)) return;
+ if (nearestPt != null)
+ return;
+
+ LineString lineStr = (LineString) geom;
+ CoordinateSequence seq = lineStr.getCoordinateSequence();
+ for (int i = 0; i < seq.size(); i++) {
+ if (i != seq.size() - 1)
+ checkSegment(lineStr, seq, i);
+ else
+ checkVertex(lineStr, seq, i);
+
+ // check if done
+ if (nearestPt != null) {
+ // found matching location!
+ component = lineStr;
+ break;
+ }
+ }
+ }
+
+
+ private void checkSegment(LineString lineStr, CoordinateSequence seq, int i)
+ {
+ Coordinate p0 = seq.getCoordinate(i);
+ Coordinate p1 = seq.getCoordinate(i+1);
+
+ // if point matches endpoint ==> vertex match
+ double dist0 = p0.distance(testPt);
+ double dist1 = p1.distance(testPt);
+ if (dist0 < tolerance) {
+ nearestPt = p0;
+ segIndex = i;
+ isVertex = true;
+ return;
+ }
+ else if (dist1 < tolerance) {
+ nearestPt = p1;
+ segIndex = i + 1;
+ isVertex = true;
+ return;
+ }
+
+ // check closeness to segment (if allowing segments)
+ if (vertexOnly) return;
+
+ seg.p0 = p0;
+ seg.p1 = p1;
+ double segDist = seg.distance(testPt);
+ if (segDist < tolerance) {
+ nearestPt = seg.closestPoint(testPt);
+ segIndex = i;
+ isVertex = false;
+ }
+ }
+
+ private void checkVertex(LineString lineStr, CoordinateSequence seq, int i)
+ {
+ Coordinate p0 = seq.getCoordinate(i);
+
+ double dist0 = p0.distance(testPt);
+ if (dist0 < tolerance) {
+ nearestPt = p0;
+ segIndex = i;
+ isVertex = true;
+ }
+ }
+
+ public Geometry getComponent()
+ {
+ return component;
+ }
+ public Coordinate getCoordinate()
+ {
+ return nearestPt;
+ }
+ public int getIndex() { return segIndex; }
+
+ public boolean isVertex() { return isVertex; }
+
+ public boolean isDone() { return nearestPt != null; }
+
+ public boolean isGeometryChanged() { return false; }
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryUtil.java
new file mode 100644
index 0000000..ce9e46c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryUtil.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.*;
+
+public class GeometryUtil {
+
+ public static String structureSummary(Geometry g)
+ {
+ String structure = "";
+ if (g instanceof Polygon) {
+ structure = ((Polygon) g).getNumInteriorRing() + " holes" ;
+ }
+ else if (g instanceof GeometryCollection)
+ structure = g.getNumGeometries() + " elements";
+
+ return
+ g.getGeometryType().toUpperCase()
+ + " - " + structure
+ + (structure.length() > 0 ? ", " : "")
+ + g.getNumPoints() + " pts";
+ }
+
+ public static String metricsSummary(Geometry g)
+ {
+ String metrics = "Length = " + g.getLength() + " Area = " + g.getArea();
+ return metrics;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java
new file mode 100644
index 0000000..eb425a9
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+
+public class GeometryVertexDeleter
+{
+ public static Geometry delete(Geometry geom,
+ LineString line,
+ int vertexIndex)
+ {
+ GeometryEditor editor = new GeometryEditor();
+ editor.setCopyUserData(true);
+ return editor.edit(geom, new DeleteVertexOperation(line, vertexIndex));
+ }
+
+ private static class DeleteVertexOperation
+ extends GeometryEditor.CoordinateOperation
+ {
+ private LineString line;
+ private int vertexIndex;
+ private Coordinate newVertex;
+
+ public DeleteVertexOperation(LineString line, int vertexIndex)
+ {
+ this.line = line;
+ this.vertexIndex = vertexIndex;
+ }
+
+ public Coordinate[] edit(Coordinate[] coords,
+ Geometry geometry)
+ {
+ if (geometry != line) return coords;
+
+ int minLen = 2;
+ if (geometry instanceof LinearRing) minLen = 4;
+
+ // don't change if would make geometry invalid
+ if (coords.length <= minLen)
+ return coords;
+
+ int newLen = coords.length - 1;
+ Coordinate[] newPts = new Coordinate[newLen];
+ int newIndex = 0;
+ for (int i = 0; i < coords.length; i++) {
+ if (i != vertexIndex) {
+ newPts[newIndex] = coords[i];
+ newIndex++;
+ }
+ }
+
+ // close ring if required
+ if (geometry instanceof LinearRing) {
+ if (newPts[newLen - 1] == null
+ || ! newPts[newLen - 1].equals2D(newPts[0])) {
+ newPts[newLen - 1] = new Coordinate(newPts[0]);
+ }
+ }
+
+ return newPts;
+ }
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java
new file mode 100644
index 0000000..1ae419d
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+
+public class GeometryVertexInserter
+{
+ public static Geometry insert(Geometry geom,
+ LineString line,
+ int segIndex,
+ Coordinate newVertex)
+ {
+ GeometryEditor editor = new GeometryEditor();
+ editor.setCopyUserData(true);
+ return editor.edit(geom, new InsertVertexOperation(line, segIndex, newVertex));
+ }
+
+ private static class InsertVertexOperation
+ extends GeometryEditor.CoordinateOperation
+ {
+ private LineString line;
+ private int segIndex;
+ private Coordinate newVertex;
+
+ public InsertVertexOperation(LineString line, int segIndex, Coordinate newVertex)
+ {
+ this.line = line;
+ this.segIndex = segIndex;
+ this.newVertex = newVertex;
+ }
+
+ public Coordinate[] edit(Coordinate[] coords,
+ Geometry geometry)
+ {
+ if (geometry != line) return coords;
+
+ Coordinate[] newPts = new Coordinate[coords.length + 1];
+ for (int i = 0; i < coords.length; i++) {
+ int actualIndex = i > segIndex ? i + 1 : i;
+ newPts[actualIndex] = (Coordinate) coords[i].clone();
+ }
+ newPts[segIndex + 1] = (Coordinate) newVertex.clone();
+ return newPts;
+ }
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexMover.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexMover.java
new file mode 100644
index 0000000..9edf2b8
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexMover.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+
+public class GeometryVertexMover
+{
+
+ public static Geometry move(Geometry geom, Coordinate fromLoc, Coordinate toLoc)
+ {
+ GeometryEditor editor = new GeometryEditor();
+ editor.setCopyUserData(true);
+ return editor.edit(geom, new MoveVertexOperation(fromLoc, toLoc));
+ }
+
+ private static class MoveVertexOperation
+ extends GeometryEditor.CoordinateOperation
+ {
+ private Coordinate fromLoc;
+ private Coordinate toLoc;
+
+ public MoveVertexOperation(Coordinate fromLoc, Coordinate toLoc)
+ {
+ this.fromLoc = fromLoc;
+ this.toLoc = toLoc;
+ }
+
+ public Coordinate[] edit(Coordinate[] coords,
+ Geometry geometry)
+ {
+ Coordinate[] newPts = new Coordinate[coords.length];
+ for (int i = 0; i < coords.length; i++) {
+ newPts[i] =
+ (coords[i].equals2D(fromLoc))
+ ? (Coordinate) toLoc.clone()
+ : (Coordinate) coords[i].clone();
+
+ }
+ return newPts;
+ }
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/NearestPointFinder.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/NearestPointFinder.java
new file mode 100644
index 0000000..e714b8f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/NearestPointFinder.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import org.locationtech.jts.geom.*;
+
+public class NearestPointFinder
+{
+ public static Coordinate findNearestPoint(Geometry geom, Coordinate pt, double tolerance)
+ {
+ NearestPointFinder finder = new NearestPointFinder(geom);
+ return finder.getNearestPoint(pt, tolerance);
+ }
+
+ private Geometry geom;
+
+ public NearestPointFinder(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public Coordinate getNearestPoint(Coordinate pt, double tolerance)
+ {
+ NearestPointFilter filter = new NearestPointFilter(pt, tolerance);
+ geom.apply(filter);
+ return filter.getNearestPoint();
+ }
+
+ static class NearestPointFilter implements CoordinateSequenceFilter
+ {
+ private double tolerance = 0.0;
+ private Coordinate basePt;
+ private Coordinate nearestPt = null;
+ private double dist = Double.MAX_VALUE;
+
+ public NearestPointFilter(Coordinate basePt, double tolerance)
+ {
+ this.basePt = basePt;
+ this.tolerance = tolerance;
+ }
+
+ public void filter(CoordinateSequence seq, int i)
+ {
+ Coordinate p = seq.getCoordinate(i);
+ double dist = p.distance(basePt);
+ if (dist > tolerance) return;
+
+ if (nearestPt == null || basePt.distance(p) < dist) {
+ nearestPt = p;
+ dist = basePt.distance(nearestPt);
+ return;
+ }
+ }
+
+ public Coordinate getNearestPoint()
+ {
+ return nearestPt;
+ }
+ public boolean isDone() { return false; }
+
+ public boolean isGeometryChanged() { return false; }
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/VertexLocater.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/VertexLocater.java
new file mode 100644
index 0000000..43c3833
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/VertexLocater.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.geom;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+
+public class VertexLocater
+{
+ public static Coordinate locateVertex(Geometry geom, Coordinate testPt, double tolerance)
+ {
+ VertexLocater finder = new VertexLocater(geom);
+ return finder.getVertex(testPt, tolerance);
+ }
+
+ private Geometry geom;
+ private Coordinate vertexPt;
+ private int vertexIndex = -1;
+
+ public VertexLocater(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public Coordinate getVertex(Coordinate testPt, double tolerance)
+ {
+ NearestVertexFilter filter = new NearestVertexFilter(testPt, tolerance);
+ geom.apply(filter);
+ vertexPt = filter.getVertex();
+ vertexIndex = filter.getIndex();
+ return vertexPt;
+ }
+
+ public int getIndex() { return vertexIndex; }
+
+ public List getLocations(Coordinate testPt, double tolerance)
+ {
+ NearVerticesFilter filter = new NearVerticesFilter(testPt, tolerance);
+ geom.apply(filter);
+ return filter.getLocations();
+ }
+
+
+ static class NearestVertexFilter implements CoordinateSequenceFilter
+ {
+ private double tolerance = 0.0;
+ private Coordinate basePt;
+ private Coordinate nearestPt = null;
+ private int vertexIndex = -1;
+
+ public NearestVertexFilter(Coordinate basePt, double tolerance)
+ {
+ this.basePt = basePt;
+ this.tolerance = tolerance;
+ }
+
+ public void filter(CoordinateSequence seq, int i)
+ {
+ Coordinate p = seq.getCoordinate(i);
+ double dist = p.distance(basePt);
+ if (dist > tolerance) return;
+
+ nearestPt = p;
+ vertexIndex = i;
+
+ }
+
+ public Coordinate getVertex()
+ {
+ return nearestPt;
+ }
+ public int getIndex() { return vertexIndex; }
+
+ public boolean isDone() { return nearestPt != null; }
+
+ public boolean isGeometryChanged() { return false; }
+ }
+ static class NearVerticesFilter implements CoordinateSequenceFilter
+ {
+ private double tolerance = 0.0;
+ private Coordinate queryPt;
+ private List locations = new ArrayList();
+
+ public NearVerticesFilter(Coordinate queryPt, double tolerance)
+ {
+ this.queryPt = queryPt;
+ this.tolerance = tolerance;
+ }
+
+ public void filter(CoordinateSequence seq, int i)
+ {
+ Coordinate p = seq.getCoordinate(i);
+ double dist = p.distance(queryPt);
+ if (dist > tolerance) return;
+
+ locations.add(new Location(p, i));
+
+ }
+
+ public List getLocations()
+ {
+ return locations;
+ }
+
+ public boolean isDone()
+ {
+ // evaluate all points
+ return false;
+ }
+
+ public boolean isGeometryChanged() { return false; }
+ }
+
+ public static class Location
+ {
+ private Coordinate pt;
+ private int[] index;
+
+ Location(Coordinate pt, int index)
+ {
+ this.pt = pt;
+ this.index = new int[1];
+ this.index[0] = index;
+ }
+
+ public Coordinate getCoordinate()
+ {
+ return pt;
+ }
+
+ public int[] getIndices() { return index; }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/EndianDataInputStream.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/EndianDataInputStream.java
new file mode 100644
index 0000000..8f2a29f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/EndianDataInputStream.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.BufferedInputStream;
+
+/**
+ * A class that gives most of the functionality of DataInputStream, but is endian aware.
+ * Uses a real java.io.DataInputStream to actually do the writing.
+ */
+public class EndianDataInputStream {
+ private java.io.DataInputStream inputStream;
+ private byte[] workSpace = new byte[8]; //chars are 16 bits, so we always quash the 1st 8 bits
+
+ /** Creates new EndianDataInputStream */
+ public EndianDataInputStream(java.io.InputStream in) {
+ inputStream = new DataInputStream(new BufferedInputStream(in));
+ }
+
+ /** close the stream**/
+ public void close() throws IOException {
+ inputStream.close();
+ }
+
+ /** read a byte in BigEndian - the same as LE because its only 1 byte*/
+ public byte readByteBE() throws IOException {
+ return inputStream.readByte();
+ }
+
+ /** read a byte in LittleEndian - the same as BE because its only 1 byte*/
+ public byte readByteLE() throws IOException {
+ return inputStream.readByte();
+ }
+
+ /** read a byte in LittleEndian - the same as BE because its only 1 byte*/
+ public void readByteLEnum(byte[] b) throws IOException {
+ inputStream.readFully(b);
+ }
+
+
+ /** read a byte in BigEndian - the same as LE because its only 1 byte. returns int as per java.io.DataStream*/
+ public int readUnsignedByteBE() throws IOException {
+ return inputStream.readUnsignedByte();
+ }
+
+ /** read a byte in LittleEndian - the same as BE because its only 1 byte. returns int as per java.io.DataStream*/
+ public int readUnsignedByteLE() throws IOException {
+ return inputStream.readUnsignedByte();
+ }
+
+ /** read a 16bit short in BE*/
+ public short readShortBE() throws IOException {
+ return inputStream.readShort();
+ }
+
+ /** read a 16bit short in LE*/
+ public short readShortLE() throws IOException {
+ inputStream.readFully(workSpace, 0, 2);
+
+ return (short) (((workSpace[1] & 0xff) << 8) | (workSpace[0] & 0xff));
+ }
+
+ /** read a 32bit int in BE*/
+ public int readIntBE() throws IOException {
+ return inputStream.readInt();
+ }
+
+ /** read a 32bit int in LE*/
+ public int readIntLE() throws IOException {
+ inputStream.readFully(workSpace, 0, 4);
+
+ return ((workSpace[3] & 0xff) << 24) | ((workSpace[2] & 0xff) << 16) |
+ ((workSpace[1] & 0xff) << 8) | (workSpace[0] & 0xff);
+ }
+
+ /** read a 64bit long in BE*/
+ public long readLongBE() throws IOException {
+ return inputStream.readLong();
+ }
+
+ /** read a 64bit long in LE*/
+ public long readLongLE() throws IOException {
+ inputStream.readFully(workSpace, 0, 8);
+
+ return ((long) (workSpace[7] & 0xff) << 56) |
+ ((long) (workSpace[6] & 0xff) << 48) |
+ ((long) (workSpace[5] & 0xff) << 40) |
+ ((long) (workSpace[4] & 0xff) << 32) |
+ ((long) (workSpace[3] & 0xff) << 24) |
+ ((long) (workSpace[2] & 0xff) << 16) |
+ ((long) (workSpace[1] & 0xff) << 8) | ((long) (workSpace[0] & 0xff));
+ }
+
+ /** read a 64bit double in BE*/
+ public double readDoubleBE() throws IOException {
+ return inputStream.readDouble();
+ }
+
+ /** read a 64bit double in LE*/
+ public double readDoubleLE() throws IOException {
+ long l;
+
+ inputStream.readFully(workSpace, 0, 8);
+ l = ((long) (workSpace[7] & 0xff) << 56) |
+ ((long) (workSpace[6] & 0xff) << 48) |
+ ((long) (workSpace[5] & 0xff) << 40) |
+ ((long) (workSpace[4] & 0xff) << 32) |
+ ((long) (workSpace[3] & 0xff) << 24) |
+ ((long) (workSpace[2] & 0xff) << 16) |
+ ((long) (workSpace[1] & 0xff) << 8) |
+ ((long) (workSpace[0] & 0xff));
+
+ return Double.longBitsToDouble(l);
+ }
+
+ /** skip ahead in the stream
+ * @param num number of bytes to read ahead
+ */
+ public int skipBytes(int num) throws IOException {
+ return inputStream.skipBytes(num);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/InvalidShapefileException.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/InvalidShapefileException.java
new file mode 100644
index 0000000..a262a05
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/InvalidShapefileException.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+/**
+ * Thrown when an attempt is made to load a shapefile
+ * which contains an error such as an invlaid shape
+ */
+public class InvalidShapefileException extends ShapefileException{
+ public InvalidShapefileException(String s){
+ super(s);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java
new file mode 100644
index 0000000..7514eeb
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.*;
+
+
+/**
+ * Wrapper for a Shapefile arc.
+ */
+public class MultiLineHandler implements ShapeHandler{
+
+ int myShapeType= -1;
+
+ public MultiLineHandler()
+ {
+ myShapeType = 3;
+ }
+
+ public MultiLineHandler(int type) throws InvalidShapefileException
+ {
+ if ( (type != 3) && (type != 13) && (type != 23) )
+ throw new InvalidShapefileException("MultiLineHandler constructor - expected type to be 3,13 or 23");
+
+ myShapeType = type;
+ }
+
+
+ public Geometry read( EndianDataInputStream file , GeometryFactory geometryFactory, int contentLength) throws IOException,InvalidShapefileException
+ {
+
+ double junk;
+ int actualReadWords = 0; //actual number of words read (word = 16bits)
+
+
+ //file.setLittleEndianMode(true);
+
+ int shapeType = file.readIntLE();
+ actualReadWords += 2;
+
+ if (shapeType ==0)
+ {
+ return new MultiLineString(null,new PrecisionModel(),0); //null shape
+ }
+
+ if (shapeType != myShapeType)
+ {
+ throw new InvalidShapefileException("MultilineHandler.read() - file says its type "+shapeType+" but i'm expecting type "+myShapeType);
+ }
+
+ //read bounding box (not needed)
+ junk = file.readDoubleLE();
+ junk =file.readDoubleLE();
+ junk =file.readDoubleLE();
+ junk =file.readDoubleLE();
+ actualReadWords += 4*4;
+
+
+ int numParts = file.readIntLE();
+ int numPoints = file.readIntLE();//total number of points
+ actualReadWords += 4;
+
+
+ int[] partOffsets = new int[numParts];
+
+ //points = new Coordinate[numPoints];
+
+ for ( int i = 0; i < numParts; i++ ){
+ partOffsets[i]=file.readIntLE();
+ actualReadWords += 2;
+ }
+
+ LineString lines[] = new LineString[numParts];
+ Coordinate[] coords = new Coordinate[numPoints];
+
+ for (int t =0;t<numPoints; t++)
+ {
+ coords[t] = new Coordinate(file.readDoubleLE(),file.readDoubleLE());
+ actualReadWords += 8;
+ }
+
+
+
+ if (myShapeType ==13)
+ {
+ junk =file.readDoubleLE(); //z min, max
+ junk =file.readDoubleLE();
+ actualReadWords += 8;
+
+ for (int t =0;t<numPoints; t++)
+ {
+ coords[t].z = file.readDoubleLE(); //z value
+ actualReadWords += 4;
+ }
+ }
+
+ if (myShapeType >=13)
+ {
+ // int fullLength = 22 + 2*numParts + (numPoints * 8) + 4+4+4*numPoints+ 4+4+4*numPoints;
+ int fullLength;
+ if (myShapeType == 13)
+ {
+ //polylineZ (with M)
+ fullLength = 22 + 2*numParts + (numPoints * 8) + 4+4+4*numPoints+ 4+4+4*numPoints;
+ }
+ else
+ {
+ // polylineM (with M)
+ fullLength = 22 + 2*numParts + (numPoints * 8) + 4+4+4*numPoints;
+ }
+ if (contentLength >= fullLength) //are ms actually there?
+ {
+ junk =file.readDoubleLE(); //m min, max
+ junk =file.readDoubleLE();
+ actualReadWords += 8;
+
+ for (int t =0;t<numPoints; t++)
+ {
+ junk =file.readDoubleLE(); //m value
+ actualReadWords += 4;
+ }
+ }
+ }
+
+ //verify that we have read everything we need
+ while (actualReadWords < contentLength)
+ {
+ int junk2 = file.readShortBE();
+ actualReadWords += 1;
+ }
+
+
+ int offset = 0;
+ int start,finish,length;
+ for(int part=0;part<numParts;part++){
+ start = partOffsets[part];
+ if(part == numParts-1)
+ {
+ finish = numPoints;
+ }
+ else {
+ finish=partOffsets[part+1];
+ }
+ length = finish-start;
+ Coordinate points[] = new Coordinate[length];
+ for(int i=0;i<length;i++){
+ points[i]=coords[offset];
+ offset++;
+ }
+ lines[part] = geometryFactory.createLineString(points);
+
+ }
+ if (numParts ==1)
+ return lines[0];
+ else
+ return geometryFactory.createMultiLineString(lines);
+ }
+
+
+ /**
+ * Get the type of shape stored (Shapefile.ARC)
+ */
+ public int getShapeType(){
+ return myShapeType;
+ }
+
+ public int getLength(Geometry geometry){
+ MultiLineString multi = (MultiLineString) geometry;
+
+ int numlines, numpoints;
+
+ numlines = multi.getNumGeometries();
+ numpoints = multi.getNumPoints();
+
+ if (myShapeType == 3)
+ {
+ return 22 + 2*numlines + (numpoints * 8);
+ }
+ if (myShapeType == 23)
+ {
+ return 22 + 2*numlines + (numpoints * 8) + 4+4+4*numpoints;
+ }
+
+
+ return 22 + 2*numlines + (numpoints * 8) + 4+4+4*numpoints+ 4+4+4*numpoints;
+
+
+ // return 22 + 2*numlines + (numpoints * 8);
+
+ //return (44+(4*((GeometryCollection)geometry).getNumGeometries()));
+ }
+
+
+ double[] zMinMax(Geometry g)
+ {
+ double zmin,zmax;
+ boolean validZFound = false;
+ Coordinate[] cs = g.getCoordinates();
+ double[] result = new double[2];
+
+ zmin = Double.NaN;
+ zmax = Double.NaN;
+ double z;
+
+ for (int t=0;t<cs.length; t++)
+ {
+ z= cs[t].z ;
+ if (!(Double.isNaN( z ) ))
+ {
+ if (validZFound)
+ {
+ if (z < zmin)
+ zmin = z;
+ if (z > zmax)
+ zmax = z;
+ }
+ else
+ {
+ validZFound = true;
+ zmin = z ;
+ zmax = z ;
+ }
+ }
+
+ }
+
+ result[0] = (zmin);
+ result[1] = (zmax);
+ return result;
+
+ }
+
+
+}
+
+/*
+ * $Log: MultiLineHandler.java,v $
+ * Revision 1.1 2009/10/14 04:21:21 mbdavis
+ * added drag-n-drop for reading shp files
+ *
+ * Revision 1.4 2003/07/25 18:49:15 dblasby
+ * Allow "extra" data after the content. Fixes the ICI shapefile bug.
+ *
+ * Revision 1.3 2003/02/04 02:10:37 jaquino
+ * Feature: EditWMSQuery dialog
+ *
+ * Revision 1.2 2003/01/22 18:31:05 jaquino
+ * Enh: Make About Box configurable
+ *
+ * Revision 1.3 2002/10/30 22:36:11 dblasby
+ * Line reader now returns LINESTRING(..) if there is only one part to the arc
+ * polyline.
+ *
+ * Revision 1.2 2002/09/09 20:46:22 dblasby
+ * Removed LEDatastream refs and replaced with EndianData[in/out]putstream
+ *
+ * Revision 1.1 2002/08/27 21:04:58 dblasby
+ * orginal
+ *
+ * Revision 1.2 2002/03/05 10:23:59 jmacgill
+ * made sure geometries were created using the factory methods
+ *
+ * Revision 1.1 2002/02/28 00:38:50 jmacgill
+ * Renamed files to more intuitve names
+ *
+ * Revision 1.3 2002/02/13 00:23:53 jmacgill
+ * First semi working JTS version of Shapefile code
+ *
+ * Revision 1.2 2002/02/11 18:42:45 jmacgill
+ * changed read and write statements so that they produce and take Geometry objects instead of specific MultiLine objects
+ * changed parts[] array name to partOffsets[] for clarity and consistency with ShapePolygon
+ *
+ * Revision 1.1 2002/02/11 16:54:43 jmacgill
+ * added shapefile code and directories
+ *
+ */
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java
new file mode 100644
index 0000000..053bc61
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+/*
+ * MultiPointHandler.java
+ *
+ * Created on July 17, 2002, 4:13 PM
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.*;
+
+
+/**
+ *
+ * @author dblasby
+ */
+public class MultiPointHandler implements ShapeHandler {
+ int myShapeType= -1;
+
+ /** Creates new MultiPointHandler */
+ public MultiPointHandler() {
+ myShapeType = 8;
+ }
+
+ public MultiPointHandler(int type) throws InvalidShapefileException
+ {
+ if ( (type != 8) && (type != 18) && (type != 28) )
+ throw new InvalidShapefileException("Multipointhandler constructor - expected type to be 8, 18, or 28");
+
+ myShapeType = type;
+ }
+
+ public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory,int contentLength) throws IOException,InvalidShapefileException{
+ //file.setLittleEndianMode(true);
+
+ int actualReadWords = 0; //actual number of words read (word = 16bits)
+
+ int shapeType = file.readIntLE();
+ actualReadWords += 2;
+
+ if (shapeType ==0)
+ return new MultiPoint(null,new PrecisionModel(),0);
+ if (shapeType != myShapeType)
+ {
+ throw new InvalidShapefileException("Multipointhandler.read() - expected type code "+myShapeType+" but got "+shapeType);
+ }
+ //read bbox
+ file.readDoubleLE();
+ file.readDoubleLE();
+ file.readDoubleLE();
+ file.readDoubleLE();
+
+ actualReadWords += 4*4;
+
+ int numpoints = file.readIntLE();
+ actualReadWords += 2;
+
+ Coordinate[] coords = new Coordinate[numpoints];
+ for (int t=0;t<numpoints;t++)
+ {
+
+ double x = file.readDoubleLE();
+ double y = file.readDoubleLE();
+ actualReadWords += 8;
+ coords[t] = new Coordinate(x,y);
+ }
+ if (myShapeType == 18)
+ {
+ file.readDoubleLE(); //z min/max
+ file.readDoubleLE();
+ actualReadWords += 8;
+ for (int t=0;t<numpoints;t++)
+ {
+ double z = file.readDoubleLE();//z
+ actualReadWords += 4;
+ coords[t].z = z;
+ }
+ }
+
+
+ if (myShapeType >= 18)
+ {
+ // int fullLength = numpoints * 8 + 20 +8 +4*numpoints + 8 +4*numpoints;
+ int fullLength;
+ if (myShapeType == 18)
+ {
+ //multipoint Z (with m)
+ fullLength = 20 + (numpoints * 8) +8 +4*numpoints + 8 +4*numpoints;
+ }
+ else
+ {
+ //multipoint M (with M)
+ fullLength = 20 + (numpoints * 8) +8 +4*numpoints;
+ }
+
+ if (contentLength >= fullLength) //is the M portion actually there?
+ {
+ file.readDoubleLE(); //m min/max
+ file.readDoubleLE();
+ actualReadWords += 8;
+ for (int t=0;t<numpoints;t++)
+ {
+ file.readDoubleLE();//m
+ actualReadWords += 4;
+ }
+ }
+ }
+
+ //verify that we have read everything we need
+ while (actualReadWords < contentLength)
+ {
+ int junk2 = file.readShortBE();
+ actualReadWords += 1;
+ }
+
+ return geometryFactory.createMultiPoint(coords);
+ }
+
+ double[] zMinMax(Geometry g)
+ {
+ double zmin,zmax;
+ boolean validZFound = false;
+ Coordinate[] cs = g.getCoordinates();
+ double[] result = new double[2];
+
+ zmin = Double.NaN;
+ zmax = Double.NaN;
+ double z;
+
+ for (int t=0;t<cs.length; t++)
+ {
+ z= cs[t].z ;
+ if (!(Double.isNaN( z ) ))
+ {
+ if (validZFound)
+ {
+ if (z < zmin)
+ zmin = z;
+ if (z > zmax)
+ zmax = z;
+ }
+ else
+ {
+ validZFound = true;
+ zmin = z ;
+ zmax = z ;
+ }
+ }
+
+ }
+
+ result[0] = (zmin);
+ result[1] = (zmax);
+ return result;
+
+ }
+
+
+
+ /**
+ * Returns the shapefile shape type value for a point
+ * @return int Shapefile.POINT
+ */
+ public int getShapeType(){
+ return myShapeType;
+ }
+
+ /**
+ * Calcuates the record length of this object.
+ * @return int The length of the record that this shapepoint will take up in a shapefile
+ **/
+ public int getLength(Geometry geometry){
+ MultiPoint mp = (MultiPoint) geometry;
+
+ if (myShapeType == 8)
+ return mp.getNumGeometries() * 8 + 20;
+ if (myShapeType == 28)
+ return mp.getNumGeometries() * 8 + 20 +8 +4*mp.getNumGeometries();
+
+ return mp.getNumGeometries() * 8 + 20 +8 +4*mp.getNumGeometries() + 8 +4*mp.getNumGeometries() ;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java
new file mode 100644
index 0000000..1c0974d
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.*;
+
+
+/**
+ * Wrapper for a Shapefile point.
+ */
+public class PointHandler implements ShapeHandler{
+
+ int Ncoords=2; //2 = x,y ; 3= x,y,m ; 4 = x,y,z,m
+ int myShapeType = -1;
+
+ public PointHandler(int type) throws InvalidShapefileException
+ {
+ if ( (type != 1) && (type != 11) && (type != 21))// 2d, 2d+m, 3d+m
+ throw new InvalidShapefileException("PointHandler constructor: expected a type of 1, 11 or 21");
+ myShapeType = type;
+ }
+
+ public PointHandler()
+ {
+ myShapeType = 1; //2d
+ }
+
+ public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory,int contentLength) throws IOException,InvalidShapefileException
+ {
+ // file.setLittleEndianMode(true);
+ int actualReadWords = 0; //actual number of words read (word = 16bits)
+
+ int shapeType = file.readIntLE();
+ actualReadWords += 2;
+
+ if (shapeType != myShapeType)
+ throw new InvalidShapefileException("pointhandler.read() - handler's shapetype doesnt match file's");
+
+ double x = file.readDoubleLE();
+ double y = file.readDoubleLE();
+ double m , z = Double.NaN;
+ actualReadWords += 8;
+
+ if ( shapeType ==11 )
+ {
+ z= file.readDoubleLE();
+ actualReadWords += 4;
+ }
+ if ( shapeType >=11 )
+ {
+ m = file.readDoubleLE();
+ actualReadWords += 4;
+ }
+
+ //verify that we have read everything we need
+ while (actualReadWords < contentLength)
+ {
+ int junk2 = file.readShortBE();
+ actualReadWords += 1;
+ }
+
+ return geometryFactory.createPoint(new Coordinate(x,y,z));
+ }
+
+
+ /**
+ * Returns the shapefile shape type value for a point
+ * @return int Shapefile.POINT
+ */
+ public int getShapeType(){
+ return myShapeType;
+ }
+
+ /**
+ * Calcuates the record length of this object.
+ * @return int The length of the record that this shapepoint will take up in a shapefile
+ **/
+ public int getLength(Geometry geometry){
+ if (myShapeType == Shapefile.POINT)
+ return 10;
+ if (myShapeType == Shapefile.POINTM)
+ return 14;
+
+ return 18;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java
new file mode 100644
index 0000000..fc6b29c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java
@@ -0,0 +1,421 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+
+
+/**
+ * Wrapper for a Shapefile polygon.
+ */
+public class PolygonHandler implements ShapeHandler{
+ int myShapeType;
+
+ public PolygonHandler()
+ {
+ myShapeType = 5;
+ }
+
+ public PolygonHandler(int type) throws InvalidShapefileException
+ {
+ if ( (type != 5) && (type != 15) && (type != 25) )
+ throw new InvalidShapefileException("PolygonHandler constructor - expected type to be 5, 15, or 25.");
+
+ myShapeType = type;
+ }
+
+ //returns true if testPoint is a point in the pointList list.
+ boolean pointInList(Coordinate testPoint, Coordinate[] pointList)
+ {
+ int t, numpoints;
+ Coordinate p;
+
+ numpoints = Array.getLength( pointList) ;
+ for (t=0;t<numpoints; t++)
+ {
+ p = pointList[t];
+ if ( (testPoint.x == p.x) && (testPoint.y == p.y) &&
+ ((testPoint.z == p.z) || (!(testPoint.z == testPoint.z)) ) //nan test; x!=x iff x is nan
+ )
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public Geometry read( EndianDataInputStream file , GeometryFactory geometryFactory, int contentLength)
+ throws IOException, InvalidShapefileException
+ {
+
+ int actualReadWords = 0; //actual number of words read (word = 16bits)
+
+ // file.setLittleEndianMode(true);
+ int shapeType = file.readIntLE();
+ actualReadWords += 2;
+
+ if (shapeType ==0)
+ {
+ return new MultiPolygon(null,new PrecisionModel(),0); //null shape
+ }
+
+ if ( shapeType != myShapeType ) {
+ throw new InvalidShapefileException
+ ("PolygonHandler.read() - got shape type "+shapeType+" but was expecting "+myShapeType);
+ }
+
+ //bounds
+ file.readDoubleLE();
+ file.readDoubleLE();
+ file.readDoubleLE();
+ file.readDoubleLE();
+
+ actualReadWords += 4*4;
+
+
+ int partOffsets[];
+
+ int numParts = file.readIntLE();
+ int numPoints = file.readIntLE();
+ actualReadWords += 4;
+
+ partOffsets = new int[numParts];
+
+ for(int i = 0;i<numParts;i++){
+ partOffsets[i]=file.readIntLE();
+ actualReadWords += 2;
+ }
+
+ //LinearRing[] rings = new LinearRing[numParts];
+ ArrayList shells = new ArrayList();
+ ArrayList holes = new ArrayList();
+ Coordinate[] coords = new Coordinate[numPoints];
+
+ for(int t=0;t<numPoints;t++)
+ {
+ coords[t]= new Coordinate(file.readDoubleLE(),file.readDoubleLE());
+ actualReadWords += 8;
+ }
+
+ if (myShapeType == 15)
+ {
+ //z
+ file.readDoubleLE(); //zmin
+ file.readDoubleLE(); //zmax
+ actualReadWords += 8;
+ for(int t=0;t<numPoints;t++)
+ {
+ coords[t].z = file.readDoubleLE();
+ actualReadWords += 4;
+ }
+ }
+
+ if (myShapeType >= 15)
+ {
+ // int fullLength = 22 + (2*numParts) + (8*numPoints) + 8 + (4*numPoints)+ 8 + (4*numPoints);
+ int fullLength;
+ if (myShapeType == 15)
+ {
+ //polyZ (with M)
+ fullLength = 22 + (2*numParts) + (8*numPoints) + 8 + (4*numPoints)+ 8 + (4*numPoints);
+ }
+ else
+ {
+ //polyM (with M)
+ fullLength = 22 + (2*numParts) + (8*numPoints) + 8+ (4*numPoints) ;
+ }
+ if (contentLength >= fullLength)
+ {
+ file.readDoubleLE(); //mmin
+ file.readDoubleLE(); //mmax
+ actualReadWords += 8;
+ for(int t=0;t<numPoints;t++)
+ {
+ file.readDoubleLE();
+ actualReadWords += 4;
+ }
+ }
+ }
+
+
+ //verify that we have read everything we need
+ while (actualReadWords < contentLength)
+ {
+ int junk = file.readShortBE();
+ actualReadWords += 1;
+ }
+
+
+ int offset = 0;
+ int start,finish,length;
+ for(int part=0;part<numParts;part++){
+ start = partOffsets[part];
+ if(part == numParts-1){finish = numPoints;}
+ else {
+ finish=partOffsets[part+1];
+ }
+ length = finish-start;
+ Coordinate points[] = new Coordinate[length];
+ for(int i=0;i<length;i++){
+ points[i]=coords[offset];
+ offset++;
+ }
+ LinearRing ring = geometryFactory.createLinearRing(points);
+ if(Orientation.isCCW(points)){
+ holes.add(ring);
+ }
+ else{
+ shells.add(ring);
+ }
+ }
+
+ ArrayList holesForShells = assignHolesToShells(shells, holes);
+
+ Polygon[] polygons = new Polygon[shells.size()];
+ for (int i = 0; i < shells.size(); i++) {
+ polygons[i] = geometryFactory.createPolygon((LinearRing) shells.get(i),
+ (LinearRing[]) ((ArrayList) holesForShells.get(i))
+ .toArray(new LinearRing[0]));
+ }
+
+ if (polygons.length == 1) {
+ return polygons[0];
+ }
+
+ holesForShells = null;
+ shells = null;
+ holes = null;
+ // its a multi part
+
+ Geometry result = geometryFactory.createMultiPolygon(polygons);
+ // if (!(result.isValid() ))
+ // System.out.println("geom isnt valid");
+ return result;
+ }
+
+ private ArrayList assignHolesToShells(ArrayList shells, ArrayList holes)
+ {
+ // now we have a list of all shells and all holes
+ ArrayList holesForShells = new ArrayList(shells.size());
+ for (int i = 0; i < shells.size(); i++) {
+ holesForShells.add(new ArrayList());
+ }
+
+ // find homes
+ for (int i = 0; i < holes.size(); i++) {
+ LinearRing testHole = (LinearRing) holes.get(i);
+ LinearRing minShell = null;
+ Envelope minEnv = null;
+ Envelope testHoleEnv = testHole.getEnvelopeInternal();
+ Coordinate testHolePt = testHole.getCoordinateN(0);
+ LinearRing tryShell;
+ int nShells = shells.size();
+ for (int j = 0; j < nShells; j++) {
+ tryShell = (LinearRing) shells.get(j);
+ Envelope tryShellEnv = tryShell.getEnvelopeInternal();
+ if (! tryShellEnv.contains(testHoleEnv)) continue;
+
+ boolean isContained = false;
+ Coordinate[] coordList = tryShell.getCoordinates();
+
+ if (nShells <= 1
+ || PointLocation.isInRing(testHolePt, coordList)
+ || pointInList(testHolePt, coordList))
+ isContained = true;
+
+ // check if new containing ring is smaller than the current minimum ring
+ if (minShell != null)
+ minEnv = minShell.getEnvelopeInternal();
+ if (isContained) {
+ if (minShell == null || minEnv.contains(tryShellEnv)) {
+ minShell = tryShell;
+ }
+ }
+ }
+
+ if (minShell == null) {
+ System.err.println("Found polygon with a hole not inside a shell");
+ }
+ else {
+ // ((ArrayList)holesForShells.get(shells.indexOf(minShell))).add(testRing);
+ ((ArrayList) holesForShells.get(findIndex(shells, minShell)))
+ .add(testHole);
+ }
+ }
+ return holesForShells;
+ }
+
+ /**
+ * Finds a object in a list. Should be much faster than indexof
+ *
+ * @param list
+ * @param o
+ * @return
+ */
+ private static int findIndex(ArrayList list, Object o)
+ {
+ int n = list.size();
+ for (int i = 0; i < n; i++) {
+ if (list.get(i) == o)
+ return i;
+ }
+ return -1;
+ }
+
+
+ public int getShapeType(){
+ return myShapeType;
+ }
+ public int getLength(Geometry geometry){
+
+ MultiPolygon multi;
+ if(geometry instanceof MultiPolygon){
+ multi = (MultiPolygon)geometry;
+ }
+ else{
+ multi = new MultiPolygon(new Polygon[]{(Polygon)geometry},geometry.getPrecisionModel(),geometry.getSRID());
+ }
+
+ int nrings=0;
+
+ for (int t=0;t<multi.getNumGeometries();t++)
+ {
+ Polygon p;
+ p = (Polygon) multi.getGeometryN(t);
+ nrings = nrings + 1 + p.getNumInteriorRing();
+ }
+
+ int npoints = multi.getNumPoints();
+
+ if (myShapeType == 15)
+ {
+ return 22+(2*nrings)+8*npoints + 4*npoints+8 +4*npoints+8;
+ }
+ if (myShapeType==25)
+ {
+ return 22+(2*nrings)+8*npoints + 4*npoints+8 ;
+ }
+
+
+ return 22+(2*nrings)+8*npoints;
+ }
+
+
+ double[] zMinMax(Geometry g)
+ {
+ double zmin,zmax;
+ boolean validZFound = false;
+ Coordinate[] cs = g.getCoordinates();
+ double[] result = new double[2];
+
+ zmin = Double.NaN;
+ zmax = Double.NaN;
+ double z;
+
+ for (int t=0;t<cs.length; t++)
+ {
+ z= cs[t].z ;
+ if (!(Double.isNaN( z ) ))
+ {
+ if (validZFound)
+ {
+ if (z < zmin)
+ zmin = z;
+ if (z > zmax)
+ zmax = z;
+ }
+ else
+ {
+ validZFound = true;
+ zmin = z ;
+ zmax = z ;
+ }
+ }
+
+ }
+
+ result[0] = (zmin);
+ result[1] = (zmax);
+ return result;
+
+ }
+
+
+}
+
+/*
+ * $Log: PolygonHandler.java,v $
+ * Revision 1.1 2009/10/14 04:21:22 mbdavis
+ * added drag-n-drop for reading shp files
+ *
+ * Revision 1.5 2003/09/23 17:15:26 dblasby
+ * *** empty log message ***
+ *
+ * Revision 1.4 2003/07/25 18:49:15 dblasby
+ * Allow "extra" data after the content. Fixes the ICI shapefile bug.
+ *
+ * Revision 1.3 2003/02/04 02:10:37 jaquino
+ * Feature: EditWMSQuery dialog
+ *
+ * Revision 1.2 2003/01/22 18:31:05 jaquino
+ * Enh: Make About Box configurable
+ *
+ * Revision 1.2 2002/09/09 20:46:22 dblasby
+ * Removed LEDatastream refs and replaced with EndianData[in/out]putstream
+ *
+ * Revision 1.1 2002/08/27 21:04:58 dblasby
+ * orginal
+ *
+ * Revision 1.3 2002/03/05 10:51:01 andyt
+ * removed use of factory from write method
+ *
+ * Revision 1.2 2002/03/05 10:23:59 jmacgill
+ * made sure geometries were created using the factory methods
+ *
+ * Revision 1.1 2002/02/28 00:38:50 jmacgill
+ * Renamed files to more intuitve names
+ *
+ * Revision 1.4 2002/02/13 00:23:53 jmacgill
+ * First semi working JTS version of Shapefile code
+ *
+ * Revision 1.3 2002/02/11 18:44:22 jmacgill
+ * replaced geometry constructions with calls to geometryFactory.createX methods
+ *
+ * Revision 1.2 2002/02/11 18:28:41 jmacgill
+ * rewrote to have static read and write methods
+ *
+ * Revision 1.1 2002/02/11 16:54:43 jmacgill
+ * added shapefile code and directories
+ *
+ */
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapeHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapeHandler.java
new file mode 100644
index 0000000..1a94541
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapeHandler.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+
+
+public interface ShapeHandler {
+ public int getShapeType();
+ public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory,int contentLength) throws java.io.IOException,InvalidShapefileException;
+ public int getLength(Geometry geometry); //length in 16bit words
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapeTypeNotSupportedException.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapeTypeNotSupportedException.java
new file mode 100644
index 0000000..df65831
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapeTypeNotSupportedException.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+/**
+ * Thrown when an attempt is made to load a shapefile
+ * which contains a shape type that is not supported
+ * by the loader
+ */
+public class ShapeTypeNotSupportedException extends ShapefileException{
+ public ShapeTypeNotSupportedException(String s){
+ super(s);
+ }
+}
\ No newline at end of file
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/Shapefile.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/Shapefile.java
new file mode 100644
index 0000000..2f05c94
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/Shapefile.java
@@ -0,0 +1,334 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+
+import org.locationtech.jts.geom.*;
+
+
+
+
+
+public class Shapefile
+{
+
+
+ static final int SHAPEFILE_ID = 9994;
+ static final int VERSION = 1000;
+
+ public static final int NULL = 0;
+ public static final int POINT = 1;
+ public static final int POINTZ = 11;
+ public static final int POINTM = 21;
+ public static final int ARC = 3;
+ public static final int ARCM = 23;
+ public static final int ARCZ = 13;
+ public static final int POLYGON = 5;
+ public static final int POLYGONM = 25;
+ public static final int POLYGONZ = 15;
+ public static final int MULTIPOINT = 8;
+ public static final int MULTIPOINTM = 28;
+ public static final int MULTIPOINTZ = 18;
+ public static final int UNDEFINED = -1;
+ //Types 2,4,6,7 and 9 were undefined at time or writeing
+
+ public static final int XY = 2;
+ public static final int XYM = 3;
+ public static final int XYZM = 4;
+
+ private URL baseURL;
+ private InputStream myInputStream;
+ private GeometryFactory geomFactory;
+
+ /**
+ * Creates and initialises a shapefile from a url
+ * @param url The url of the shapefile
+ */
+ public Shapefile(URL url){
+ baseURL=url;
+ myInputStream= null;
+ try {
+ URLConnection uc = baseURL.openConnection();
+ myInputStream = new BufferedInputStream(uc.getInputStream());
+ }
+ catch (Exception e)
+ {
+ }
+ }
+
+ public Shapefile(InputStream IS){
+ myInputStream = IS;
+ }
+
+
+ private EndianDataInputStream getInputStream() throws IOException
+ {
+ if (myInputStream == null)
+ {
+ throw new IOException("Could not make a connection to the URL: " + baseURL);
+ }
+ EndianDataInputStream sfile = new EndianDataInputStream(myInputStream);
+ return sfile;
+ }
+
+
+ /**
+ * Initialises a shapefile from disk.
+ * Use Shapefile(String) if you don't want to use LEDataInputStream directly (recomened)
+ */
+ public GeometryCollection read(GeometryFactory geometryFactory) throws IOException,ShapefileException,Exception{
+ EndianDataInputStream file = getInputStream();
+ if(file==null) throw new IOException("Failed connection or no content for "+baseURL);
+ ShapefileHeader mainHeader = new ShapefileHeader(file);
+ if(mainHeader.getVersion() < VERSION){System.err.println("Sf-->Warning, Shapefile format ("+mainHeader.getVersion()+") older that supported ("+VERSION+"), attempting to read anyway");}
+ if(mainHeader.getVersion() > VERSION){System.err.println("Sf-->Warning, Shapefile format ("+mainHeader.getVersion()+") newer that supported ("+VERSION+"), attempting to read anyway");}
+
+ Geometry body;
+ ArrayList list = new ArrayList();
+ int type=mainHeader.getShapeType();
+ ShapeHandler handler = getShapeHandler(type);
+ if(handler==null)throw new ShapeTypeNotSupportedException("Unsuported shape type:"+type);
+
+ int recordNumber=0;
+ int contentLength=0;
+ try{
+ while(true){
+ // file.setLittleEndianMode(false);
+ recordNumber=file.readIntBE();
+ contentLength=file.readIntBE();
+ try{
+ body = handler.read(file,geometryFactory,contentLength);
+ list.add(body);
+ // System.out.println("Done record: " + recordNumber);
+ }catch(IllegalArgumentException r2d2){
+ //System.out.println("Record " +recordNumber+ " has is NULL Shape");
+ list.add(new GeometryCollection(null,null,-1));
+ }catch(Exception c3p0){
+ System.out.println("Error processing record (a):" +recordNumber);
+ System.out.println(c3p0.getMessage());
+ c3p0.printStackTrace();
+ list.add(new GeometryCollection(null,null,-1));
+ }
+ // System.out.println("processing:" +recordNumber);
+ }
+ }catch(EOFException e){
+
+ }
+ return geometryFactory.createGeometryCollection((Geometry[])list.toArray(new Geometry[]{}));
+ }
+
+ private EndianDataInputStream file;
+ private ShapefileHeader mainHeader;
+ private ShapeHandler handler;
+ private int recordNumber;
+
+ /**
+ * Initialises a shapefile from disk.
+ * Use Shapefile(String) if you don't want to use LEDataInputStream directly (recomened)
+ */
+ public void readStream(GeometryFactory geometryFactory)
+ throws IOException,ShapefileException,Exception
+ {
+ geomFactory = geometryFactory;
+ file = getInputStream();
+ if(file==null) throw new IOException("Failed connection or no content for "+baseURL);
+ mainHeader = new ShapefileHeader(file);
+ if(mainHeader.getVersion() < VERSION){System.err.println("Sf-->Warning, Shapefile format ("+mainHeader.getVersion()+") older that supported ("+VERSION+"), attempting to read anyway");}
+ if(mainHeader.getVersion() > VERSION){System.err.println("Sf-->Warning, Shapefile format ("+mainHeader.getVersion()+") newer that supported ("+VERSION+"), attempting to read anyway");}
+
+ //ArrayList list = new ArrayList();
+ int type=mainHeader.getShapeType();
+ handler = getShapeHandler(type);
+ if(handler==null)throw new ShapeTypeNotSupportedException("Unsuported shape type:"+type);
+
+ recordNumber=0;
+ }
+
+ /**
+ * Returns the next geometry in the shapefile stream
+ * @return null at EOF
+ * @throws IOException
+ */
+ public Geometry next()
+ throws IOException
+ {
+ Geometry geom = null;
+ try{
+ // file.setLittleEndianMode(false);
+ recordNumber=file.readIntBE();
+ int contentLength=file.readIntBE();
+ try{
+ geom = handler.read(file,geomFactory,contentLength);
+ // System.out.println("Done record: " + recordNumber);
+ }catch(IllegalArgumentException r2d2){
+ //System.out.println("Record " +recordNumber+ " has is NULL Shape");
+ geom = new GeometryCollection(null,null,-1);
+ }catch(Exception c3p0){
+ System.out.println("Error processing record (a):" +recordNumber);
+ System.out.println(c3p0.getMessage());
+ c3p0.printStackTrace();
+ geom = new GeometryCollection(null,null,-1);
+ }
+ // System.out.println("processing:" +recordNumber);
+ }
+ catch(EOFException e){
+ close();
+ }
+ return geom;
+ }
+
+ public void close()
+ throws IOException
+ {
+ file.close();
+ }
+
+ //ShapeFileDimentions => 2=x,y ; 3=x,y,m ; 4=x,y,z,m
+
+
+
+ /**
+ * Returns a string for the shape type of index.
+ * @param index An int coresponding to the shape type to be described
+ * @return A string descibing the shape type
+ */
+ public static String getShapeTypeDescription(int index){
+ switch(index){
+ case(NULL):return ("Null");
+ case(POINT):return ("Points");
+ case(POINTZ):return ("Points Z");
+ case(POINTM):return ("Points M");
+ case(ARC):return ("Arcs");
+ case(ARCM):return ("ArcsM");
+ case(ARCZ):return ("ArcsM");
+ case(POLYGON):return ("Polygon");
+ case(POLYGONM):return ("PolygonM");
+ case(POLYGONZ):return ("PolygonZ");
+ case(MULTIPOINT):return ("Multipoint");
+ case(MULTIPOINTM):return ("MultipointM");
+ case(MULTIPOINTZ):return ("MultipointZ");
+ default:return ("Undefined");
+ }
+ }
+
+ public static ShapeHandler getShapeHandler(Geometry geom, int ShapeFileDimentions ) throws Exception
+ {
+ return getShapeHandler(getShapeType(geom,ShapeFileDimentions));
+ }
+
+ public static ShapeHandler getShapeHandler(int type) throws Exception
+ {
+ switch(type){
+ case Shapefile.POINT: return new PointHandler();
+ case Shapefile.POINTZ: return new PointHandler(Shapefile.POINTZ);
+ case Shapefile.POINTM: return new PointHandler(Shapefile.POINTM);
+ case Shapefile.POLYGON: return new PolygonHandler();
+ case Shapefile.POLYGONM: return new PolygonHandler(Shapefile.POLYGONM);
+ case Shapefile.POLYGONZ: return new PolygonHandler(Shapefile.POLYGONZ);
+ case Shapefile.ARC: return new MultiLineHandler();
+ case Shapefile.ARCM: return new MultiLineHandler(Shapefile.ARCM);
+ case Shapefile.ARCZ: return new MultiLineHandler(Shapefile.ARCZ);
+ case Shapefile.MULTIPOINT: return new MultiPointHandler();
+ case Shapefile.MULTIPOINTM: return new MultiPointHandler(Shapefile.MULTIPOINTM);
+ case Shapefile.MULTIPOINTZ: return new MultiPointHandler(Shapefile.MULTIPOINTZ);
+ }
+ return null;
+ }
+
+ //ShapeFileDimentions => 2=x,y ; 3=x,y,m ; 4=x,y,z,m
+ public static int getShapeType(Geometry geom, int coordDimension ) throws ShapefileException
+ {
+
+ if ( (coordDimension !=2) && (coordDimension !=3) && (coordDimension !=4) )
+ {
+ throw new ShapefileException("invalid ShapeFileDimentions for getShapeType - expected 2,3,or 4 but got "+coordDimension+" (2=x,y ; 3=x,y,m ; 4=x,y,z,m)");
+ //ShapeFileDimentions = 2;
+ }
+
+
+ if(geom instanceof Point)
+ {
+ switch (coordDimension)
+ {
+ case 2: return Shapefile.POINT;
+ case 3: return Shapefile.POINTM;
+ case 4: return Shapefile.POINTZ;
+ }
+ }
+ if(geom instanceof MultiPoint)
+ {
+ switch (coordDimension)
+ {
+ case 2: return Shapefile.MULTIPOINT;
+ case 3: return Shapefile.MULTIPOINTM;
+ case 4: return Shapefile.MULTIPOINTZ;
+ }
+ }
+ if ( (geom instanceof Polygon) || (geom instanceof MultiPolygon) )
+ {
+ switch (coordDimension)
+ {
+ case 2: return Shapefile.POLYGON;
+ case 3: return Shapefile.POLYGONM;
+ case 4: return Shapefile.POLYGONZ;
+ }
+ }
+ if ( (geom instanceof LineString) || (geom instanceof MultiLineString) )
+ {
+ switch (coordDimension)
+ {
+ case 2: return Shapefile.ARC;
+ case 3: return Shapefile.ARCM;
+ case 4: return Shapefile.ARCZ;
+ }
+ }
+ return Shapefile.UNDEFINED;
+ }
+
+ public synchronized void readIndex(InputStream is) throws IOException {
+ EndianDataInputStream file = null;
+ try{
+ BufferedInputStream in = new BufferedInputStream(is);
+ file = new EndianDataInputStream(in);
+ }catch(Exception e){System.err.println(e);}
+ ShapefileHeader head = new ShapefileHeader(file);
+
+ int pos=0,len=0;
+ //file.setLittleEndianMode(false);
+ file.close();
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileException.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileException.java
new file mode 100644
index 0000000..f9a904d
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileException.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+/**
+ * Thrown when an error relating to the shapefile
+ * occures
+ */
+public class ShapefileException extends Exception{
+ public ShapefileException(){
+ super();
+ }
+ public ShapefileException(String s){
+ super(s);
+ }
+}
+
+
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileHeader.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileHeader.java
new file mode 100644
index 0000000..4707e05
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileHeader.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2003 Open Source Geospatial Foundation, All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms
+ * of the OSGeo BSD License v1.0 available at:
+ *
+ * https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+ */
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+/*
+ * Header.java
+ *
+ * Created on February 12, 2002, 3:29 PM
+ */
+
+package org.locationtech.jtstest.testbuilder.io.shapefile;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.GeometryCollection;
+
+
+/**
+ *
+ * @author jamesm
+ */
+public class ShapefileHeader{
+ private final static boolean DEBUG=false;
+ private int fileCode = -1;
+ public int fileLength = -1;
+ private int indexLength = -1;
+ private int version = -1;
+ private int shapeType = -1;
+ //private double[] bounds = new double[4];
+ private Envelope bounds;
+
+ public ShapefileHeader(EndianDataInputStream file) throws IOException {
+ // file.setLittleEndianMode(false);
+ fileCode = file.readIntBE();
+ // if(DEBUG)System.out.println("Sfh->Filecode "+fileCode);
+ if ( fileCode != Shapefile.SHAPEFILE_ID )
+ System.err.println("Sfh->WARNING filecode "+fileCode+" not a match for documented shapefile code "+Shapefile.SHAPEFILE_ID);
+
+ for(int i=0;i<5;i++){
+ int tmp = file.readIntBE();
+ // if(DEBUG)System.out.println("Sfh->blank "+tmp);
+ }
+ fileLength = file.readIntBE();
+
+ // file.setLittleEndianMode(true);
+ version=file.readIntLE();
+ shapeType=file.readIntLE();
+
+ //read in and for now ignore the bounding box
+ for(int i = 0;i<4;i++){
+ file.readDoubleLE();
+ }
+
+ //skip remaining unused bytes
+ // file.setLittleEndianMode(false);//well they may not be unused forever...
+ file.skipBytes(32);
+ }
+
+ public ShapefileHeader(GeometryCollection geometries,int dims) throws Exception
+ {
+ ShapeHandler handle;
+ if (geometries.getNumGeometries() == 0)
+ {
+ handle = new PointHandler(); //default
+ }
+ else
+ {
+ handle = Shapefile.getShapeHandler(geometries.getGeometryN(0),dims);
+ }
+ int numShapes = geometries.getNumGeometries();
+ shapeType = handle.getShapeType();
+ version = Shapefile.VERSION;
+ fileCode = Shapefile.SHAPEFILE_ID;
+ bounds = geometries.getEnvelopeInternal();
+ fileLength = 0;
+ for(int i=0;i<numShapes;i++){
+ fileLength+=handle.getLength(geometries.getGeometryN(i));
+ fileLength+=4;//for each header
+ }
+ fileLength+=50;//space used by this, the main header
+ indexLength = 50+(4*numShapes);
+ }
+
+ public void setFileLength(int fileLength){
+ this.fileLength = fileLength;
+ }
+
+ public int getShapeType(){
+ return shapeType;
+ }
+
+ public int getVersion(){
+ return version;
+ }
+
+ public Envelope getBounds(){
+ return bounds;
+ }
+
+ public String toString() {
+ String res = new String("Sf-->type "+fileCode+" size "+fileLength+" version "+ version + " Shape Type "+shapeType);
+ return res;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/DisplayParameters.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/DisplayParameters.java
new file mode 100644
index 0000000..22b6d89
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/DisplayParameters.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jtstest.testbuilder.AppConstants;
+
+public class DisplayParameters {
+
+ protected static boolean showingGrid = true;
+ protected static boolean showingStructure = false;
+ protected static boolean showingOrientation = false;
+ protected static boolean showingVertices = true;
+ protected static boolean showingLabel = true;
+ protected static boolean showingCoordinates = true;
+ protected static boolean isMagnifyingTopology = false;
+ protected static double topologyStretchSize = AppConstants.TOPO_STRETCH_VIEW_DIST;
+
+ public static boolean isShowingStructure() {
+ return showingStructure;
+ }
+
+ public static void setShowingStructure(boolean show) {
+ showingStructure = show;
+ }
+
+ public static boolean isShowingOrientation() {
+ return showingOrientation;
+ }
+
+ public static void setShowingOrientation(boolean show) {
+ showingOrientation = show;
+ }
+
+ public static boolean isShowingGrid() {
+ return showingGrid;
+ }
+
+ public static void setShowingGrid(boolean show) {
+ showingGrid = show;
+ }
+
+ public static boolean isShowingVertices() {
+ return showingVertices;
+ }
+
+ public static void setShowingVertices(boolean show) {
+ showingVertices = show;
+ }
+
+ public static void setShowingLabel(boolean show) {
+ showingLabel = show;
+ }
+
+ public static boolean isShowingLabel() {
+ return showingLabel;
+ }
+
+ public static boolean isMagnifyingTopology() {
+ return isMagnifyingTopology;
+ }
+
+ public static void setMagnifyingTopology(boolean show) {
+ isMagnifyingTopology = show;
+ }
+
+ public static void setTopologyStretchSize(double pixels) {
+ topologyStretchSize = pixels;
+ }
+
+ public static double getTopologyStretchSize() {
+ return topologyStretchSize;
+ }
+
+ public static int MAX_DISPLAY_POINTS = 2000;
+
+ public static final int FILL_BASIC = 1;
+ public static final int FILL_VARY = 2;
+ public static final int FILL_RAINBOW = 3;
+ public static final int FILL_RAINBOW_RANDOM = 4;
+
+ private static int fillType = FILL_BASIC;
+
+ public static int fillType() {
+ return fillType;
+ }
+
+ public static void setFillType(int type) {
+ fillType = type;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/DrawingGrid.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/DrawingGrid.java
new file mode 100644
index 0000000..8e626af
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/DrawingGrid.java
@@ -0,0 +1,88 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.awt.geom.Point2D;
+
+
+/**
+ * @version 1.7
+ */
+public class DrawingGrid
+{
+ public static int DEFAULT_GRID_SIZE = 10;
+
+ public static final int GRID_MAJOR_FACTOR = 1;
+
+ private double gridSize = DEFAULT_GRID_SIZE;
+ private int numGridUnits;
+
+ public DrawingGrid(int gridSize)
+ {
+ setGridSize(gridSize);
+ }
+
+ public DrawingGrid()
+ {
+ this(DEFAULT_GRID_SIZE);
+ }
+
+ public Point2D snapToGrid(Point2D modelPoint)
+ {
+ return snapToGrid(modelPoint, 1);
+ }
+
+ public Point2D snapToMajorGrid(Point2D modelPoint)
+ {
+ return snapToGrid(modelPoint, GRID_MAJOR_FACTOR);
+ }
+
+ public Point2D snapToGrid(Point2D modelPoint, int factor)
+ {
+ double rx, ry;
+ int numUnits = factor * numGridUnits;
+
+ if (isFractional()) {
+ rx = Math.floor(modelPoint.getX() * numUnits + .5) / numUnits;
+ ry = Math.floor(modelPoint.getY() * numUnits + .5) / numUnits;
+ }
+ else {
+ rx = Math.floor(modelPoint.getX()/numUnits + .5) * numUnits;
+ ry = Math.floor(modelPoint.getY()/numUnits + .5) * numUnits;
+ }
+ return new Point2D.Double(rx, ry);
+ }
+
+ public void setGridSize(double gridSize)
+ {
+ this.gridSize = gridSize;
+ numGridUnits = (int) Math.floor(gridSize);
+ if (isFractional()) {
+ numGridUnits = (int) Math.floor(1.0 / gridSize);
+ }
+ }
+
+ public boolean isFractional()
+ {
+ return gridSize < 1.0;
+ }
+
+ public double getGridSize () {
+ return gridSize;
+ }
+
+ public boolean isResolvable(Point2D p1, Point2D p2)
+ {
+ return p2.getX() - p1.getX() < getGridSize();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryContainer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryContainer.java
new file mode 100644
index 0000000..657bea2
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryContainer.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jts.geom.*;
+
+public interface GeometryContainer {
+ Geometry getGeometry();
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryDepiction.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryDepiction.java
new file mode 100644
index 0000000..1b0196a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryDepiction.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.awt.Color;
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryDepiction
+{
+
+ public static final Color GEOM_A_HIGHLIGHT_CLR = new Color(0, 0, 255);
+ public static final Color GEOM_A_LINE_CLR = new Color(0, 0, 255, 150);
+ public static final Color GEOM_A_FILL_CLR = new Color(200, 200, 255, 150);
+
+ public static final Color GEOM_B_HIGHLIGHT_CLR = new Color(255, 0, 0);
+ public static final Color GEOM_B_LINE_CLR = new Color(150, 0, 0, 150);
+ public static final Color GEOM_B_FILL_CLR = new Color(255, 200, 200, 150);
+
+ // YellowGreen
+ public static final Color GEOM_RESULT_LINE_CLR = new Color(120, 180, 0, 200);
+ // Yellow
+ public static final Color GEOM_RESULT_FILL_CLR = new Color(255, 255, 100, 100);
+
+ public static final GeometryDepiction RESULT = new GeometryDepiction(
+ new Color(154, 205, 0, 150),
+ new Color(255, 255, 100, 100),
+ // Yellow
+ null);
+
+ public static final GeometryDepiction GEOM_A = new GeometryDepiction(
+ new Color(0, 0, 255, 150),
+ new Color(200, 200, 255, 150),
+ Color.cyan);
+
+ public static final GeometryDepiction GEOM_B = new GeometryDepiction(
+ new Color(255, 0, 0, 150),
+ new Color(255, 200, 200, 150),
+ Color.pink);
+
+
+ private Color color;
+ private Color fillColor;
+ private Color bandColor;
+
+ public Color getColor() {
+ return color;
+ }
+
+ public Color getFillColor() {
+ return fillColor;
+ }
+
+ public Color getBandColor() {
+ return bandColor;
+ }
+
+ public GeometryDepiction(Color color, Color fillColor, Color bandColor) {
+ this.color = color;
+ this.fillColor = fillColor;
+ this.bandColor = bandColor;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryEditModel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryEditModel.java
new file mode 100644
index 0000000..a1a9309
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryEditModel.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+import org.locationtech.jtstest.testbuilder.geom.*;
+
+
+/**
+ * Holds the current {@link TestCaseEdit}.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryEditModel
+{
+ private static WKTWriter wktWriter = new WKTWriter();
+
+ private boolean readOnly = true;
+
+ private int editGeomIndex = 0; // the index of the currently selected geometry
+
+ private int geomType = GeometryType.POLYGON; // from GeometryType
+
+ private TestCaseEdit testCase;
+
+ private transient Vector geometryListeners;
+
+ public GeometryEditModel()
+ {
+
+ }
+
+ public Envelope getEnvelope()
+ {
+ Envelope env = new Envelope();
+
+ if (getGeometry(0) != null) {
+ env.expandToInclude(getGeometry(0).getEnvelopeInternal());
+ }
+ if (getGeometry(1) != null) {
+ env.expandToInclude(getGeometry(1).getEnvelopeInternal());
+ }
+ return env;
+ }
+
+ public Envelope getEnvelopeAll()
+ {
+ Envelope env = new Envelope();
+
+ if (getGeometry(0) != null) {
+ env.expandToInclude(getGeometry(0).getEnvelopeInternal());
+ }
+ if (getGeometry(1) != null) {
+ env.expandToInclude(getGeometry(1).getEnvelopeInternal());
+ }
+ if (getResult() != null) {
+ env.expandToInclude(getResult().getEnvelopeInternal());
+ }
+ return env;
+ }
+
+ public Envelope getEnvelopeResult()
+ {
+ Envelope env = new Envelope();
+
+ if (getResult() != null) {
+ env.expandToInclude(getResult().getEnvelopeInternal());
+ }
+ return env;
+ }
+
+ public int getGeomIndex() {
+ return editGeomIndex;
+ }
+
+ public void setEditGeomIndex(int index) {
+ editGeomIndex = index;
+ }
+
+ public boolean isReadOnly() {
+ return readOnly;
+ }
+
+ public void clear()
+ {
+ setGeometry(null);
+ geomChanged();
+ }
+
+ public int getGeometryType() {
+ return geomType;
+ }
+
+ public void setGeometryType(int geomType) { this.geomType = geomType; }
+
+ public void setReadOnly(boolean readOnly) {
+ this.readOnly = readOnly;
+ }
+
+ public String getText(int textType) {
+ String str = "";
+ if (getGeometry(0) != null) {
+ str += getText(getGeometry(0), textType);
+ str += "\n\n";
+ }
+ if (getGeometry(1) != null) {
+ str += getText(getGeometry(1), textType);
+ str += "\n\n";
+ }
+ return str;
+ }
+
+ public static String getText(Geometry geom, int textType) {
+ switch (textType) {
+ case GeometryType.WELLKNOWNTEXT:
+ String wkt = wktWriter.writeFormatted(geom);
+ return wkt;
+ }
+ Assert.shouldNeverReachHere();
+ return "";
+ }
+
+ public static String toStringVeryLarge(Geometry g)
+ {
+ return "[[ " + GeometryUtil.structureSummary(g) + " ]]";
+ }
+
+
+ //====================================
+
+ public Geometry getResult() {
+// return result;
+ return testCase.getResult();
+ }
+
+ public Geometry getGeometry()
+ {
+ return getGeometry(editGeomIndex);
+ }
+
+ public Geometry getGeometry(int i)
+ {
+ return testCase.getGeometry(i);
+ }
+
+ public void setTestCase(TestCaseEdit testCase)
+ {
+ this.testCase = testCase;
+ geomChanged();
+ }
+
+ public void setGeometry(Geometry g)
+ {
+ setGeometry(editGeomIndex, g);
+ geomChanged();
+ }
+
+ public void setGeometry(int i, Geometry g)
+ {
+ testCase.setGeometry(i, g);
+ geomChanged();
+ }
+
+ public void clear(int i)
+ {
+ setGeometry(i, null);
+ geomChanged();
+ }
+
+ /**
+ * Adds a geometry component of the currently selected type,
+ * to the currently selected geometry.
+ *
+ * @param coordList
+ */
+ public void addComponent(List coordList)
+ {
+ GeometryCombiner creator = new GeometryCombiner(JTSTestBuilder.getGeometryFactory());
+
+ Geometry newGeom = null;
+ switch(getGeometryType()) {
+ case GeometryType.POLYGON:
+ newGeom = creator.addPolygonRing(getGeometry(), getRing(coordList));
+ break;
+ case GeometryType.LINESTRING:
+ Coordinate[] pts = CoordinateArrays.toCoordinateArray(coordList);
+ newGeom = creator.addLineString(getGeometry(), pts);
+ break;
+ case GeometryType.POINT:
+ newGeom = creator.addPoint(getGeometry(), (Coordinate) coordList.get(0));
+ break;
+ }
+ setGeometry(newGeom);
+ }
+
+ private static Coordinate[] getRing(List coordList)
+ {
+ List closedPts = coordList;
+ Coordinate p0 = (Coordinate) coordList.get(0);
+ Coordinate pn = (Coordinate) coordList.get(coordList.size() - 1);
+ if (! p0.equals2D(pn)) {
+ closedPts = new ArrayList(coordList);
+ closedPts.add(p0.clone());
+ }
+ Coordinate[] pts = CoordinateArrays.toCoordinateArray(closedPts);
+ return pts;
+ }
+
+ public Coordinate[] findAdjacentVertices(Coordinate vertex)
+ {
+ Geometry geom = getGeometry();
+ if (geom == null) return null;
+ return AdjacentVertexFinder.findVertices(getGeometry(), vertex);
+ }
+
+ /**
+ * Locates a non-vertex point on a line segment of the current geometry
+ * within the given tolerance, if any.
+ *
+ * Returns the closest point on the segment.
+ *
+ * @param testPt
+ * @param tolerance
+ * @return the location found, or
+ * null if no non-vertex point was within tolerance
+ */
+ public GeometryLocation locateNonVertexPoint(Coordinate testPt, double tolerance)
+ {
+ Geometry geom = getGeometry();
+ if (geom == null) return null;
+ return GeometryPointLocater.locateNonVertexPoint(getGeometry(), testPt, tolerance);
+ }
+
+ /**
+ * Locates a vertex of the current geometry
+ * within the given tolerance, if any.
+ * Returns the closest point on the segment.
+ *
+ * @param testPt
+ * @param tolerance
+ * @return the location of the vertex found, or
+ * null if no vertex was within tolerance
+ */
+ public GeometryLocation locateVertex(Coordinate testPt, double tolerance)
+ {
+ Geometry geom = getGeometry();
+ if (geom == null) return null;
+ return GeometryPointLocater.locateVertex(getGeometry(), testPt, tolerance);
+ }
+
+ public Coordinate locateVertexPt(Coordinate testPt, double tolerance)
+ {
+ Geometry geom = getGeometry();
+ if (geom == null) return null;
+ GeometryLocation loc = locateVertex(testPt, tolerance);
+ if (loc == null) return null;
+ return loc.getCoordinate();
+ }
+
+ public void moveVertex(Coordinate fromLoc, Coordinate toLoc)
+ {
+ Geometry modGeom = GeometryVertexMover.move(getGeometry(), fromLoc, toLoc);
+ setGeometry(modGeom);
+ }
+
+ public void geomChanged()
+ {
+ fireGeometryChanged(new GeometryEvent(this));
+ }
+
+ //============================================
+
+ public synchronized void removeGeometryListener(GeometryListener l) {
+ if (geometryListeners != null && geometryListeners.contains(l)) {
+ Vector v = (Vector) geometryListeners.clone();
+ v.removeElement(l);
+ geometryListeners = v;
+ }
+ }
+
+ public synchronized void addGeometryListener(GeometryListener l) {
+ Vector v = geometryListeners == null ? new Vector(2)
+ : (Vector) geometryListeners.clone();
+ if (!v.contains(l)) {
+ v.addElement(l);
+ geometryListeners = v;
+ }
+ }
+
+ public void fireGeometryChanged(GeometryEvent e) {
+ if (geometryListeners != null) {
+ Vector listeners = geometryListeners;
+ int count = listeners.size();
+ for (int i = 0; i < count; i++) {
+ ((GeometryListener) listeners.elementAt(i)).geometryChanged(e);
+ }
+ }
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryEvent.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryEvent.java
new file mode 100644
index 0000000..06e8238
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryEvent.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.util.EventObject;
+
+/**
+ * Title:
+ * Description:
+ * Copyright: Copyright (c) 2001
+ * Company:
+ * @author
+ * @version 1.7
+ */
+public class GeometryEvent extends EventObject {
+
+ public GeometryEvent(Object source) {
+ super(source);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryListener.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryListener.java
new file mode 100644
index 0000000..02d15cd
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryListener.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.util.EventListener;
+
+
+
+/**
+ * @version 1.7
+ */
+public interface GeometryListener extends EventListener {
+
+ public void geometryChanged(GeometryEvent e);
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryStretcherView.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryStretcherView.java
new file mode 100644
index 0000000..6020553
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryStretcherView.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.topostretch.TopologyStretcher;
+
+
+public class GeometryStretcherView
+{
+ /**
+ * The maximum number of vertices which can be shown.
+ * This is chosen to ensure reasonable performance for rendering.
+ */
+ private static final int MAX_VERTICES_IN_MASK = 500;
+
+ /**
+ * The nearness tolerance in view pixels.
+ * This is chosen to be as large as possible
+ * (which minimizes change to geometries)
+ * but small enough that points which appear
+ * to be coincident on the screen at a given zoom level
+ * will be magnified.
+ *
+ */
+ public static final double NEARNESS_TOL_IN_VIEW = 1;
+
+ private GeometryEditModel geomModel;
+ private Geometry[] stretchGeom = new Geometry[2];
+ private List[] stretchCoords;
+ private boolean isViewPerformant = true;
+ private Envelope maskEnv = null;
+ private double stretchSize = 5.0;
+ private double nearnessTol = 0.5;
+
+ public GeometryStretcherView(GeometryEditModel geomEditModel)
+ {
+ this.geomModel = geomEditModel;
+ }
+
+ public GeometryContainer getContainer(int i)
+ {
+ return new StretchedGeometryContainer(i);
+ }
+
+ /**
+ * Sets the amount by which vertices will be stretched
+ * (in geometry units).
+ *
+ * @param stretchSize
+ */
+ public void setStretchSize(double stretchSize)
+ {
+ this.stretchSize = stretchSize;
+ }
+
+ public void setNearnessTolerance(double nearnessTol)
+ {
+ this.nearnessTol = nearnessTol;
+ }
+ public void setEnvelope(Envelope maskEnv)
+ {
+ this.maskEnv = maskEnv;
+ // clear cache
+ stretchGeom = null;
+ }
+
+ public boolean isViewPerformant()
+ {
+ updateCache();
+ return isViewPerformant;
+
+ }
+ public Geometry getStretchedGeometry(int index)
+ {
+ updateCache();
+ return stretchGeom[index];
+ }
+
+ public List getStretchedVertices(int index)
+ {
+ updateCache();
+ return stretchCoords[index];
+ }
+
+ private synchronized void updateCache()
+ {
+ if (! isCacheValid()) {
+ Geometry g0 = geomModel.getGeometry(0);
+ Geometry g1 = geomModel.getGeometry(1);
+
+ TopologyStretcher stretcher = new TopologyStretcher(g0, g1);
+
+ // check if view is valid (performant enough) to render
+ if (maskEnv != null) {
+ isViewPerformant = stretcher.numVerticesInMask(maskEnv) < MAX_VERTICES_IN_MASK;
+ }
+ if (! isViewPerformant)
+ return;
+
+ stretchGeom = stretcher.stretch(nearnessTol, stretchSize, maskEnv);
+ stretchCoords = stretcher.getModifiedCoordinates();
+ }
+ }
+
+ private boolean isCacheValid()
+ {
+ if (stretchGeom == null) {
+ stretchGeom = new Geometry[2];
+ return false;
+ }
+ // don't bother checking this any more, since stretchView is always created new
+ //if (geomModel.getGeometry(0) != stretchGeom[0]) return false;
+ //if (geomModel.getGeometry(1) != stretchGeom[1]) return false;
+ return true;
+ }
+
+ private class StretchedGeometryContainer implements GeometryContainer
+ {
+ private int index;
+
+ public StretchedGeometryContainer(int index)
+ {
+ this.index = index;
+ }
+
+ public Geometry getGeometry()
+ {
+ return getStretchedGeometry(index);
+ }
+
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryTransferable.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryTransferable.java
new file mode 100644
index 0000000..d4f26f5
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryTransferable.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.*;
+
+public class GeometryTransferable implements Transferable
+{
+ public static final DataFlavor GEOMETRY_FLAVOR =
+ new DataFlavor(Geometry.class, "Geometry");
+
+ private Geometry geom;
+ private boolean isFormatted;
+
+ private static final DataFlavor[] flavors = {
+ DataFlavor.stringFlavor,
+ GEOMETRY_FLAVOR };
+
+ public GeometryTransferable(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public GeometryTransferable(Geometry geom, boolean isFormatted) {
+ this.geom = geom;
+ this.isFormatted = isFormatted;
+ }
+
+ public DataFlavor[] getTransferDataFlavors() {
+ return flavors;
+ }
+
+ public boolean isDataFlavorSupported(DataFlavor flavor) {
+ for (int i = 0; i < flavors.length; i++) {
+ if (flavor.equals(flavors[i])) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public Object getTransferData(DataFlavor flavor)
+ throws UnsupportedFlavorException, IOException
+ {
+ if (flavor.equals(GEOMETRY_FLAVOR)) {
+ return geom;
+ }
+ if (flavor.equals(DataFlavor.stringFlavor)) {
+ if (isFormatted) {
+ WKTWriter writer = new WKTWriter();
+ writer.setFormatted(true);
+ writer.setMaxCoordinatesPerLine(5);
+ String wkt = writer.writeFormatted(geom);
+ return wkt;
+ }
+ return geom.toString();
+ }
+ throw new UnsupportedFlavorException(flavor);
+
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryType.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryType.java
new file mode 100644
index 0000000..d42b8df
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/GeometryType.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+public interface GeometryType {
+ public final static int WELLKNOWNTEXT = 1;
+
+ public final static int GEOMETRYCOLLECTION = 1;
+ public final static int MULTIPOLYGON = 2;
+ public final static int MULTILINESTRING = 3;
+ public final static int MULTIPOINT = 4;
+ public final static int POLYGON = 5;
+ public final static int LINESTRING = 6;
+ public final static int POINT = 7;
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/HtmlWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/HtmlWriter.java
new file mode 100644
index 0000000..531c283
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/HtmlWriter.java
@@ -0,0 +1,544 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.test.TestCaseList;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.testbuilder.AppStrings;
+import org.locationtech.jtstest.testbuilder.BusyDialog;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testrunner.BooleanResult;
+import org.locationtech.jtstest.testrunner.Test;
+import org.locationtech.jtstest.util.FileUtil;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+/**
+ * An object that creates an .html file describing the test cases. .gif files
+ * are also created.
+ *
+ * @version 1.7
+ */
+public class HtmlWriter {
+ private final static int IMAGE_WIDTH = 200;
+ private final static int IMAGE_HEIGHT = 200;
+ private final static int STACK_TRACE_DEPTH = 1;
+
+ private boolean showingABwithSpatialFunction = true;
+ private GeometryEditPanel geometryEditPanel = new GeometryEditPanel();
+ private JFrame frame = new JFrame();
+ private File outputDirectory;
+ private BusyDialog busyDialog = null;
+
+ public HtmlWriter() {
+ geometryEditPanel.setSize(IMAGE_WIDTH, IMAGE_HEIGHT);
+ geometryEditPanel.setGridEnabled(false);
+ geometryEditPanel.setBorder(BorderFactory.createEmptyBorder());
+ frame.getContentPane().add(geometryEditPanel);
+ }
+
+ public void setShowingABwithSpatialFunction(boolean showingABwithSpatialFunction) {
+ this.showingABwithSpatialFunction = showingABwithSpatialFunction;
+ }
+
+ public void setBusyDialog(BusyDialog busyDialog) {
+ this.busyDialog = busyDialog;
+ }
+
+ private static class MapAndList {
+ public Map map;
+ public List list;
+ }
+
+ public void write(File outputDirectory, TestCaseList testCaseList, PrecisionModel precisionModel) throws IOException {
+ if (busyDialog != null) {
+ busyDialog.setDescription("Saving .html and .gif files");
+ }
+ Assert.isTrue(outputDirectory.isDirectory());
+ this.outputDirectory = outputDirectory;
+ MapAndList runMapAndRuns = runMapAndRuns(testCaseList);
+ Map runMap = runMapAndRuns.map;
+ List runs = runMapAndRuns.list;
+ createHtmlFile("contents-frame.html", indexHtml(runs, runMap, precisionModel));
+ createHtmlFile("index.html", testTopHtml());
+ int runSkey = 0;
+ for (Iterator i = runs.iterator(); i.hasNext(); ) {
+ String runDescription = (String) i.next();
+ runSkey++;
+ List testables = (List) runMap.get(runDescription);
+ int caseSkey = 0;
+ for (Iterator m = testables.iterator(); m.hasNext(); ) {
+ Testable testable = (Testable) m.next();
+ caseSkey++;
+ if (busyDialog != null) {
+ busyDialog.setDescription("Saving .html and .gif files: " + caseSkey
+ + " of " + testCaseList.getList().size() + " tests");
+ }
+ createHtmlFile("Run" + runSkey + AppStrings.LABEL_TEST_CASE + caseSkey + ".html", html(testable, runSkey, caseSkey));
+ }
+ }
+ }
+
+ private String html(Testable testable, int runSkey, int caseSkey) throws IOException {
+ TestCaseEdit testCaseEdit = (TestCaseEdit) testable;
+ String html =
+ "<HTML>" + StringUtil.newLine
+ + "<HEAD>" + StringUtil.newLine
+ + "<TITLE>" + StringUtil.escapeHTML(testName(testCaseEdit, caseSkey)) + "</TITLE>" + StringUtil.newLine
+ + "<link REL='STYLESHEET' HREF='../jts.css' TYPE='Text/css'>" + StringUtil.newLine
+ + "</HEAD>" + StringUtil.newLine
+ + "<BODY>" + StringUtil.newLine
+ + "<div class='testTitle'>" + StringUtil.escapeHTML(testName(testCaseEdit, caseSkey)) + "</div>" + StringUtil.newLine
+ + "<P>" + StringUtil.newLine;
+ html += htmlForAB(testCaseEdit, runSkey, caseSkey);
+ html += htmlForTests(testCaseEdit, runSkey, caseSkey);
+ html += "</BODY>" + StringUtil.newLine + "</HTML>";
+ return html;
+ }
+
+ private String deleteLastTag(String html) {
+ if (html.lastIndexOf("<") == -1) {
+ return html;
+ }
+ return html.substring(0, html.lastIndexOf("<"));
+ }
+
+ private String deleteFirstTag(String html) {
+ if (html.lastIndexOf(">") == -1) {
+ return html;
+ }
+ return html.substring(html.indexOf(">") + 1);
+ }
+
+ private String htmlForTests(TestCaseEdit testCaseEdit, int runSkey, int caseSkey) throws IOException {
+ String html = htmlForBinaryPredicates(testCaseEdit, caseSkey);
+ return html;
+ }
+
+ private String htmlForSpatialFunctionTest(TestCaseEdit testCaseEdit, int runSkey, int caseSkey,
+ String geometryOpName, String first, String second) {
+ String actualResultString = " ";
+ try {
+ Geometry actualResult = (Geometry) actualResult(testCaseEdit, geometryOpName,
+ first, second);
+ String filenameNoPath = "Run" + runSkey + AppStrings.LABEL_TEST_CASE + caseSkey + geometryOpName + "Actual";
+ if (first != null) {
+ filenameNoPath += first;
+ }
+ if (second != null) {
+ filenameNoPath += second;
+ }
+ filenameNoPath += ".gif";
+ actualResultString = htmlImageHtmlTextTable(filenameNoPath, "<SPAN class=wktR>" + actualResult.toText() + "</SPAN>",
+ 0);
+ createGifFile(filenameNoPath, testCaseEdit.getGeometry(0),
+ testCaseEdit.getGeometry(1), actualResult,
+ showingABwithSpatialFunction, IMAGE_WIDTH, IMAGE_HEIGHT);
+ }
+ catch (Exception e) {
+ actualResultString = "<TD>" + StringUtil.replace(StringUtil.getStackTrace(e, STACK_TRACE_DEPTH),
+ "\n", "<BR>", true) + "</TD>";
+ e.printStackTrace(System.out);
+ }
+ String html
+ = " <TR>" + StringUtil.newLine
+ + " <TD class=methodTitle>" + geometryOpName + "</TD>" + StringUtil.newLine
+ + actualResultString + StringUtil.newLine
+ + " </TR>" + StringUtil.newLine;
+ return html;
+ }
+
+ private String htmlForRelateTest(TestCaseEdit testCaseEdit, int caseSkey) {
+ String actualValue;
+ try {
+ actualValue = insertParagraphs(testCaseEdit.getGeometry(0).relate(testCaseEdit.getGeometry(1)).toString());
+ }
+ catch (Exception e) {
+ actualValue = StringUtil.replace(StringUtil.getStackTrace(e, STACK_TRACE_DEPTH),
+ "\n", "<BR>", true);
+ e.printStackTrace(System.out);
+ }
+ String html
+ = " <TR>" + StringUtil.newLine
+ + " <TD class=methodTitle rowspan=9>relate</TD>" + StringUtil.newLine
+ + " <TD rowspan=9>" + actualValue + "</TD>" + StringUtil.newLine
+ + " </TR>" + StringUtil.newLine;
+ return html;
+ }
+
+ private String insertParagraphs(String intersectionMatrix) {
+ StringBuffer buffer = new StringBuffer(intersectionMatrix);
+ buffer.insert(6, "<BR>");
+ buffer.insert(3, "<BR>");
+ return buffer.toString();
+ }
+
+ private String htmlForPredicateTest(TestCaseEdit testCaseEdit, int caseSkey,
+ String opName, String first, String second) {
+ String actualResultString;
+ try {
+ actualResultString = actualResult(testCaseEdit, opName, first, second).toString();
+ }
+ catch (Exception e) {
+ actualResultString = StringUtil.replace(StringUtil.getStackTrace(e, STACK_TRACE_DEPTH),
+ "\n", "<BR>", true);
+ e.printStackTrace(System.out);
+ }
+ String html
+ = " <TR>" + StringUtil.newLine
+ + " <TD class=methodTitle>" + opName + "</TD>" + StringUtil.newLine
+ + " <TD class=resultFalse>" + actualResultString + "</TD>" + StringUtil.newLine
+ + " </TR>" + StringUtil.newLine;
+ return html;
+ }
+
+ private Object actualResult(TestCaseEdit testCaseEdit, String opName, String first,
+ String second) throws Exception {
+ try {
+ Assert.isTrue((first.equalsIgnoreCase("A")) || (first.equalsIgnoreCase("B")));
+ Class geometryClass = Class.forName("com.vividsolutions.jts.geom.Geometry");
+ Geometry source = testCaseEdit.getGeometry(first.equalsIgnoreCase("A") ? 0 : 1);
+ Object[] target;
+ Class[] targetClasses;
+ if (second == null) {
+ target = new Object[]{};
+ targetClasses = new Class[]{};
+ }
+ else {
+ target = new Object[]{
+ testCaseEdit.getGeometry(second.equalsIgnoreCase("A") ? 0 : 1)
+ };
+ targetClasses = new Class[]{
+ geometryClass
+ };
+ }
+ Method op = geometryClass.getMethod(opName, targetClasses);
+ return op.invoke(source, target);
+ }
+ catch (InvocationTargetException e) {
+ throw (Exception) e.getTargetException();
+ }
+ }
+
+ private BooleanResult expectedPredicateResult(TestCaseEdit testCaseEdit,
+ String opName, String first, String second) {
+ if (!(testCaseEdit.getTestable() instanceof TestRunnerTestCaseAdapter)) {
+ return null;
+ }
+ TestRunnerTestCaseAdapter adapter = (TestRunnerTestCaseAdapter) testCaseEdit.getTestable();
+ org.locationtech.jtstest.testrunner.TestCase trTestCase = adapter.getTestRunnerTestCase();
+ for (Iterator i = trTestCase.getTests().iterator(); i.hasNext(); ) {
+ Test test = (Test) i.next();
+ if (test.getOperation().equalsIgnoreCase(opName)
+ && test.getGeometryIndex().equalsIgnoreCase(first)
+ && (test.getArgumentCount() == 0
+ || ((test.getArgument(0) != null && test.getArgument(0).equalsIgnoreCase(second))
+ || (test.getArgument(0) == null && second.equalsIgnoreCase("null"))))) {
+ return (BooleanResult) test.getExpectedResult();
+ }
+ }
+ return null;
+ }
+
+ private String htmlForAB(TestCaseEdit testCaseEdit, int runSkey, int caseSkey) throws IOException {
+ String wktHtml
+ = "<span class=wktA>"
+ + (testCaseEdit.getGeometry(0) == null ? " " : testCaseEdit.getGeometry(0).toText())
+ + "</span>"
+ + "<P>"
+ + "<span class=wktB>"
+ + (testCaseEdit.getGeometry(1) == null ? " " : testCaseEdit.getGeometry(1).toText())
+ + "</span>";
+ String html = StringUtil.newLine
+ + "<TABLE BORDER=0>" + StringUtil.newLine
+ + " <TR>" + StringUtil.newLine
+ + htmlImageHtmlTextTable("Run" + runSkey + AppStrings.LABEL_TEST_CASE + caseSkey + ".gif", wktHtml, 0)
+ + " </TR>" + StringUtil.newLine
+ + "</TABLE>" + StringUtil.newLine;
+ createGifFile("Run" + runSkey + AppStrings.LABEL_TEST_CASE + caseSkey + ".gif", testCaseEdit.getGeometry(0),
+ testCaseEdit.getGeometry(1), null, true, IMAGE_WIDTH, IMAGE_HEIGHT, true);
+ return html;
+ }
+
+ private String htmlImageTextTable(String imageFilename, String text, int border) {
+ return htmlImageHtmlTextTable(imageFilename, StringUtil.escapeHTML(text), border);
+ }
+
+ private String htmlImageHtmlTextTable(String imageFilename, String html, int border) {
+ return
+ " <TD>" + StringUtil.newLine
+ + " <IMG BORDER=\"1\" SRC=\"" + imageFilename + "\" WIDTH=" + IMAGE_WIDTH + " HEIGHT=" + IMAGE_HEIGHT + ">" + StringUtil.newLine
+ + " </TD>" + StringUtil.newLine
+ + " <TD>" + StringUtil.newLine
+ + html + StringUtil.newLine
+ + " </TD>" + StringUtil.newLine;
+ }
+
+ private String testName(Testable testable, int caseSkey) {
+ String name = testable.getName();
+ if ((name == null || name.length() == 0) && testable instanceof TestCaseEdit) {
+ name = ((TestCaseEdit) testable).getDescription();
+ }
+ String testTag = AppStrings.LABEL_TEST_CASE + " ";
+ if (name == null || name.length() == 0) {
+ name = testTag + caseSkey;
+ }
+ else {
+ name = testTag + caseSkey + ": " + name;
+ }
+ return name;
+ }
+
+ private String runName(String runDescription, int runSkey) {
+ return "Run " + runSkey + ": " + runDescription;
+ }
+
+ private String htmlTitle(PrecisionModel precisionModel) {
+ String html = "Precision Model: scale=" + precisionModel.getScale()
+ + StringUtil.newLine;
+ html = "<div class='precisionModel'>" + html + "</div>";
+ return html;
+ }
+
+ private void createGifFile(String filenameNoPath, Geometry a, Geometry b,
+ Geometry spatialFunction, boolean showingAB,
+ int imageWidth, int imageHeight) throws FileNotFoundException, IOException {
+ createGifFile(filenameNoPath, a, b, spatialFunction, showingAB, imageWidth, imageHeight, false);
+ }
+
+ /*
+ private void createGifFile(String filenameNoPath, Geometry a, Geometry b,
+ Geometry spatialFunction, boolean showingAB,
+ int imageWidth, int imageHeight, boolean zoomToFullExtent) throws FileNotFoundException,
+ IOException {
+ GeometryBuilder builderA = a != null ? GeometryBuilder.create(a) : null;
+ GeometryBuilder builderB = b != null ? GeometryBuilder.create(b) : null;
+ GeometryBuilder builderSpatialFunction = spatialFunction != null ? GeometryBuilder.create(spatialFunction) : null;
+ createGifFile(filenameNoPath, builderA, builderB, builderSpatialFunction,
+ showingAB, imageWidth, imageHeight, zoomToFullExtent);
+ }
+*/
+
+ private void createGifFile(String filenameNoPath, Geometry a,
+ Geometry b,
+ Geometry result,
+ boolean showingAB,
+ int imageWidth, int imageHeight, boolean zoomToFullExtent) throws FileNotFoundException,
+ IOException {
+ TestBuilderModel tbModel = new TestBuilderModel();
+ TestCaseEdit tc = new TestCaseEdit(new Geometry[]{ a, b });
+ tc.setResult(result);
+ tbModel.getGeometryEditModel().setTestCase(tc);
+ geometryEditPanel.setModel(tbModel);
+ if (zoomToFullExtent) {
+ geometryEditPanel.zoomToFullExtent();
+ }
+ geometryEditPanel.setShowingResult(result != null);
+ geometryEditPanel.setShowingGeometryA(a != null && showingAB);
+ geometryEditPanel.setShowingGeometryB(b != null && showingAB);
+ String filenameWithPath = outputDirectory.getPath() + "\\" + filenameNoPath;
+ Image image = new BufferedImage(imageWidth, imageHeight, BufferedImage.TYPE_4BYTE_ABGR);
+ geometryEditPanel.paint(image.getGraphics());
+ /*
+ // disabled - should be replaced with PNG output
+ FileOutputStream outputStream = new FileOutputStream(filenameWithPath,
+ false);
+ GifEncoder gifEncoder = new GifEncoder(image, outputStream);
+ gifEncoder.setDimensions(imageWidth, imageHeight);
+ gifEncoder.encode();
+ outputStream.flush();
+ outputStream.close();
+ */
+ }
+
+ private void createHtmlFile(String filename, String html) throws IOException {
+ String pathname = outputDirectory.getPath() + "\\" + filename;
+ FileUtil.setContents(pathname, html);
+ }
+
+ private MapAndList runMapAndRuns(TestCaseList testCaseList) {
+ Map runMap = new TreeMap();
+ List runs = new ArrayList();
+ for (Iterator i = testCaseList.getList().iterator(); i.hasNext(); ) {
+ TestCaseEdit testCaseEdit = (TestCaseEdit) i.next();
+ Testable testable = testCaseEdit.getTestable();
+ if (testable instanceof TestRunnerTestCaseAdapter) {
+ org.locationtech.jtstest.testrunner.TestCase testRunnerTestCase = ((TestRunnerTestCaseAdapter) testable).getTestRunnerTestCase();
+ String runDescription = testRunnerTestCase.getTestRun().getTestFile().getName();
+ runDescription = runDescription.indexOf(".") > -1 ? runDescription.substring(0, runDescription.indexOf(".")) : runDescription;
+ addToListMapAndList(runDescription, testCaseEdit, runMap, runs);
+ }
+ else {
+ addToListMapAndList("Other", testCaseEdit, runMap, runs);
+ }
+ }
+ MapAndList runMapAndRuns = new MapAndList();
+ runMapAndRuns.map = runMap;
+ runMapAndRuns.list = runs;
+ return runMapAndRuns;
+ }
+
+ private void addToListMapAndList(String key, Object valueItem, Map stringToList, List keyList) {
+ if (stringToList.containsKey(key)) {
+ List value = (List) stringToList.get(key);
+ value.add(valueItem);
+ }
+ else {
+ List value = new ArrayList();
+ value.add(valueItem);
+ stringToList.put(key, value);
+ keyList.add(key);
+ }
+ }
+
+ private String indexHtml(List runs, Map runMap, PrecisionModel precisionModel) {
+ String html
+ = "<HTML>" + StringUtil.newLine
+ + "<HEAD>" + StringUtil.newLine
+ + "<TITLE>JTS Test Suite Index</TITLE>" + StringUtil.newLine
+ + "<link REL='STYLESHEET' HREF='../jts.css' TYPE='Text/css'>" + StringUtil.newLine
+ + "<script LANGUAGE=\"JavaScript\">" + StringUtil.newLine
+ + " function LoadDetailFrame() {" + StringUtil.newLine
+ + " testNumber = document.main_form.test_combo.selectedIndex;" + StringUtil.newLine
+ + " testHtmlFile = document.main_form.test_combo.options[testNumber].value;" + StringUtil.newLine
+ + " parent.detail.location.href=testHtmlFile;" + StringUtil.newLine
+ + " document.main_form.test_combo.blur();" + StringUtil.newLine
+ + " }" + StringUtil.newLine
+ + " function onRunChange() {" + StringUtil.newLine
+ + " selectedIndex = document.main_form.run_combo.selectedIndex;" + StringUtil.newLine
+ + " selectedCode = document.main_form.run_combo.options[selectedIndex].value;" + StringUtil.newLine;
+ int runSkey = 0;
+ for (Iterator i = runs.iterator(); i.hasNext(); ) {
+ String runDescription = (String) i.next();
+ runSkey++;
+ html += " if (selectedCode == 'Run" + runSkey + "') {" + StringUtil.newLine;
+ List testables = (List) runMap.get(runDescription);
+ int caseSkey = 0;
+ for (Iterator m = testables.iterator(); m.hasNext(); ) {
+ Testable testable = (Testable) m.next();
+ caseSkey++;
+ html += " document.main_form.test_combo.length = " + caseSkey + ";" + StringUtil.newLine;
+ html += " document.main_form.test_combo.options[" + (caseSkey - 1) + "].text = \"" + StringUtil.escapeHTML(testName(testable, caseSkey)) + "\";" + StringUtil.newLine;
+ html += " document.main_form.test_combo.options[" + (caseSkey - 1) + "].value = 'Run" + runSkey + "Case" + caseSkey + ".html';" + StringUtil.newLine;
+ }
+ html += " LoadDetailFrame();";
+ html += " }";
+ }
+ html += " }" + StringUtil.newLine
+ + "</script>" + StringUtil.newLine
+ + "</HEAD>" + StringUtil.newLine
+ + "<BODY>" + StringUtil.newLine
+ + "<h1>JTS Validation Suite</h1>" + StringUtil.newLine
+ + htmlTitle(precisionModel)
+ + "<p>" + StringUtil.newLine
+ + "<FORM id=\"main_form\" name=\"main_form\">" + StringUtil.newLine;
+
+ html += "<select id=run_combo name=run_combo size='1' style='width:30%' onChange='onRunChange()'>" + StringUtil.newLine;
+ runSkey = 0;
+ for (Iterator j = runs.iterator(); j.hasNext(); ) {
+ String runDescription = (String) j.next();
+ runSkey++;
+ html += "<OPTION VALUE='Run" + runSkey + "'>"
+ + StringUtil.escapeHTML(runName(runDescription, runSkey))
+ + "</OPTION>" + StringUtil.newLine;
+ }
+ html += "</select>" + StringUtil.newLine;
+
+ html += "<select id=test_combo name=test_combo size='1' style='width:60%' onChange='LoadDetailFrame()'>" + StringUtil.newLine;
+ String runDescription = (String) runs.iterator().next();
+ List testables = (List) runMap.get(runDescription);
+ int caseSkey = 0;
+ for (Iterator m = testables.iterator(); m.hasNext(); ) {
+ Testable testable = (Testable) m.next();
+ caseSkey++;
+ html += "<OPTION VALUE='Run1Case" + caseSkey + ".html'>"
+ + StringUtil.escapeHTML(testName(testable, caseSkey))
+ + "</OPTION>" + StringUtil.newLine;
+ }
+ html += "</select>" + StringUtil.newLine;
+
+ html += "</FORM>" + StringUtil.newLine
+ + "</BODY>" + StringUtil.newLine
+ + "</HTML>" + StringUtil.newLine
+ + "" + StringUtil.newLine;
+ return html;
+ }
+
+ private String testTopHtml() {
+ return
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Frameset//EN\"\"http://www.w3.org/TR/REC-html40/frameset.dtd\">" + StringUtil.newLine
+ + "<HTML>" + StringUtil.newLine
+ + "<HEAD>" + StringUtil.newLine
+ + "<TITLE>" + StringUtil.newLine
+ + "JTS Validation Suite" + StringUtil.newLine
+ + "</TITLE>" + StringUtil.newLine
+ + "</HEAD>" + StringUtil.newLine
+ + "<FRAMESET rows=\"120px,*\" framespacing=0 frameborder=0>" + StringUtil.newLine
+ + "<FRAME id=contents name=\"contents\" FRAMEBORDER=0 src=\"contents-frame.html\" scrolling=no>" + StringUtil.newLine
+ + "<FRAME id=detail name=\"detail\" FRAMEBORDER=0 src=\"Run1Case1.html\" >" + StringUtil.newLine
+ + "</FRAMESET>" + StringUtil.newLine
+ + "<NOFRAMES>" + StringUtil.newLine
+ + "<H2>" + StringUtil.newLine
+ + "Frame Alert</H2>" + StringUtil.newLine
+ + "" + StringUtil.newLine
+ + "<P>" + StringUtil.newLine
+ + "This site is designed to be viewed using frames. " + StringUtil.newLine
+ + "If you see this message, you are using a non-frame-capable web client." + StringUtil.newLine
+ + "</HTML>" + StringUtil.newLine;
+ }
+
+ private String htmlForBinaryPredicates(TestCaseEdit testCaseEdit, int caseSkey) {
+ String html = "";
+ if (testCaseEdit.getGeometry(1) != null) {
+ html += htmlForRelateTest(testCaseEdit, caseSkey);
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "equals", "A", "B");
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "disjoint", "A", "B");
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "intersects", "A", "B");
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "touches", "A", "B");
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "crosses", "A", "B");
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "within", "A", "B");
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "contains", "A", "B");
+ html += htmlForPredicateTest(testCaseEdit, caseSkey, "overlaps", "A", "B");
+
+ html = "<h2>Binary Predicates</h2>" + StringUtil.newLine
+ + "<TABLE WIDTH=50% BORDER=1>" + StringUtil.newLine
+ + html
+ + "</TABLE>" + StringUtil.newLine;
+ }
+ return html;
+ }
+
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/IndexedGeometryContainer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/IndexedGeometryContainer.java
new file mode 100644
index 0000000..e9de3eb
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/IndexedGeometryContainer.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.geom.*;
+
+
+public class IndexedGeometryContainer
+implements GeometryContainer
+{
+ private GeometryEditModel geomModel;
+ private int index;
+
+ public IndexedGeometryContainer(GeometryEditModel geomModel, int index) {
+ this.geomModel = geomModel;
+ this.index = index;
+ }
+
+ public Geometry getGeometry()
+ {
+ return geomModel.getGeometry(index);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/JavaTestWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/JavaTestWriter.java
new file mode 100644
index 0000000..4e61ed6
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/JavaTestWriter.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jtstest.test.TestCaseList;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+
+/**
+ * @version 1.7
+ */
+public class JavaTestWriter {
+ public static String getRunJava(String className, TestBuilderModel tbModel) {
+ return
+ "package com.vividsolutions.jtstest.testsuite;" + StringUtil.newLine
+ + "" + StringUtil.newLine
+ + "import com.vividsolutions.jtstest.test.*;" + StringUtil.newLine
+ + "" + StringUtil.newLine
+ + "public class " + className + " extends TestCaseList {" + StringUtil.newLine
+ + " public static void main(String[] args) {" + StringUtil.newLine
+ + " " + className + " test = new " + className + "();" + StringUtil.newLine
+ + " test.run();" + StringUtil.newLine
+ + " }" + StringUtil.newLine
+ + "" + StringUtil.newLine
+ + " public " + className + "() {" + StringUtil.newLine
+ + getTestJava(tbModel.getCases())
+ + " }" + StringUtil.newLine
+ + "}";
+ }
+
+ public static String getTestJava(List testCases) {
+ StringBuffer java = new StringBuffer();
+ for (int i = 0; i < testCases.size(); i++) {
+ java.append((new JavaTestWriter()).write((Testable) testCases.get(i)));
+ }
+ return java.toString();
+ }
+
+
+ private WKTWriter writer = new WKTWriter();
+
+ public JavaTestWriter() {}
+
+ public String write(Testable testable) {
+ StringBuffer text = new StringBuffer();
+ text.append(" add(new TestCase(\n");
+ String name = testable.getName() == null ? "" : testable.getName();
+ String description = testable.getDescription() == null ? "" : testable.getDescription();
+ String a = testable.getGeometry(0) == null ? null : writer.write(testable.getGeometry(0));
+ String b = testable.getGeometry(1) == null ? null : writer.write(testable.getGeometry(1));
+
+ text.append(" \"" + name + "\",\n");
+ text.append(" \"" + description + "\",\n");
+ text.append(" " + (a == null ? "null" : "\"" + a + "\"") + ",\n");
+ text.append(" " + (b == null ? "null" : "\"" + b + "\"") + ",\n");
+
+ return text.toString();
+ }
+
+ private String write(Geometry geometry) {
+ if (geometry == null) {
+ return "null";
+ }
+ return "\"" + writer.write(geometry) + "\"";
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/Layer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/Layer.java
new file mode 100644
index 0000000..4eeb181
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/Layer.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.awt.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+import org.locationtech.jtstest.testbuilder.ui.render.*;
+import org.locationtech.jtstest.testbuilder.ui.style.*;
+
+
+
+public class Layer
+{
+ private String name = "";
+ private GeometryContainer geomCont;
+ private boolean isEnabled = true;
+
+ private BasicStyle geomStyle = new BasicStyle();
+
+ private StyleList.StyleFilter vertexFilter = new StyleList.StyleFilter() {
+ public boolean isFiltered(Style style) {
+ return ! DisplayParameters.isShowingVertices();
+ }
+ };
+
+ private StyleList.StyleFilter decorationFilter = new StyleList.StyleFilter() {
+ public boolean isFiltered(Style style) {
+ return ! DisplayParameters.isShowingOrientation();
+ }
+ };
+
+ private StyleList.StyleFilter structureFilter = new StyleList.StyleFilter() {
+ public boolean isFiltered(Style style) {
+ return ! DisplayParameters.isShowingStructure();
+ }
+ };
+
+ private StyleList.StyleFilter labelFilter = new StyleList.StyleFilter() {
+ public boolean isFiltered(Style style) {
+ return ! DisplayParameters.isShowingLabel();
+ }
+ };
+ private LayerStyle layerStyle;
+
+ public Layer(String name) {
+ this.name = name;
+ }
+
+ public String getName() { return name; }
+
+ public String getNameInfo() {
+ if (geomCont.getGeometry() == null) return getName();
+ return getName()
+ + " " + GeometryUtil.structureSummary(geomCont.getGeometry())
+ + " -- " + GeometryUtil.metricsSummary(geomCont.getGeometry());
+ }
+
+ public void setEnabled(boolean isEnabled)
+ {
+ this.isEnabled = isEnabled;
+ }
+
+ public void setSource(GeometryContainer geomCont)
+ {
+ this.geomCont = geomCont;
+ }
+
+ public GeometryContainer getSource()
+ {
+ return geomCont;
+ }
+
+ public boolean isEnabled()
+ {
+ return isEnabled;
+ }
+ public LayerStyle getLayerStyle()
+ {
+ return layerStyle;
+ }
+ public BasicStyle getGeometryStyle()
+ {
+ return geomStyle;
+ }
+ public void setGeometryStyle(BasicStyle style)
+ {
+ this.geomStyle = style;
+ VertexStyle vertexStyle = new VertexStyle(style.getLineColor());
+ ArrowLineStyle segArrowStyle = new ArrowLineStyle(ColorUtil.lighter(style.getLineColor(), 0.8));
+ ArrowEndpointStyle lineArrowStyle = new ArrowEndpointStyle(ColorUtil.lighter(style.getLineColor(),0.5), false, true);
+ CircleEndpointStyle lineCircleStyle = new CircleEndpointStyle(style.getLineColor(), 6, true, true);
+ PolygonStructureStyle polyStyle = new PolygonStructureStyle(ColorUtil.opaque(style.getLineColor()));
+ SegmentIndexStyle indexStyle = new SegmentIndexStyle(ColorUtil.opaque(style.getLineColor().darker()));
+ DataLabelStyle dataLabelStyle = new DataLabelStyle(ColorUtil.opaque(style.getLineColor().darker()));
+
+ // order is important here
+ StyleList styleList = new StyleList();
+ styleList.add(vertexStyle, vertexFilter);
+ styleList.add(segArrowStyle, decorationFilter);
+ styleList.add(lineArrowStyle, decorationFilter);
+ styleList.add(lineCircleStyle, decorationFilter);
+ //styleList.add(style);
+ styleList.add(polyStyle, structureFilter);
+ styleList.add(indexStyle, structureFilter);
+ styleList.add(dataLabelStyle, labelFilter);
+
+ layerStyle = new LayerStyle(style, styleList);
+ }
+
+ public Geometry getGeometry()
+ {
+ if (geomCont == null) return null;
+ return geomCont.getGeometry();
+ }
+
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/LayerList.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/LayerList.java
new file mode 100644
index 0000000..b507d86
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/LayerList.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jtstest.testbuilder.geom.ComponentLocater;
+import org.locationtech.jtstest.testbuilder.geom.GeometryLocation;
+
+
+public class LayerList
+{
+ public static final int LYR_A = 0;
+ public static final int LYR_B = 1;
+ public static final int LYR_RESULT = 2;
+
+ private Layer[] layer = new Layer[3];
+
+ public LayerList()
+ {
+ layer[0] = new Layer("A");
+ layer[1] = new Layer("B");
+ layer[2] = new Layer("Result");
+ }
+
+ public int size() { return layer.length; }
+
+ public Layer getLayer(int i)
+ {
+ return layer[i];
+ }
+
+ /**
+ *
+ * @param pt
+ * @param tolerance
+ * @return component found, or null
+ */
+ public Geometry getComponent(Coordinate pt, double tolerance)
+ {
+ for (int i = 0; i < size(); i++) {
+
+ Layer lyr = getLayer(i);
+ Geometry geom = lyr.getGeometry();
+ if (geom == null) continue;
+ ComponentLocater locater = new ComponentLocater(geom);
+ List locs = locater.getComponents(pt, tolerance);
+ if (locs.size() > 0) {
+ GeometryLocation loc = (GeometryLocation) locs.get(0);
+ return loc.getComponent();
+ }
+ }
+ return null;
+ }
+
+ public Geometry[] getComponents(Geometry aoi)
+ {
+ Geometry comp[] = new Geometry[2];
+ for (int i = 0; i < 2; i++) {
+ Layer lyr = getLayer(i);
+ Geometry geom = lyr.getGeometry();
+ if (geom == null) continue;
+ comp[i] = extractComponents(geom, aoi);
+ }
+ return comp;
+ }
+
+ private Geometry extractComponents(Geometry parentGeom, Geometry aoi)
+ {
+ ComponentLocater locater = new ComponentLocater(parentGeom);
+ List locs = locater.getComponents(aoi);
+ List geoms = extractLocationGeometry(locs);
+ if (geoms.size() <= 0)
+ return null;
+ if (geoms.size() == 1)
+ return (Geometry) geoms.get(0);
+ // if parent was a GC, ensure returning a GC
+ if (parentGeom.getGeometryType().equals("GeometryCollection"))
+ return parentGeom.getFactory().createGeometryCollection(GeometryFactory.toGeometryArray(geoms));
+ // otherwise return MultiGeom
+ return parentGeom.getFactory().buildGeometry(geoms);
+ }
+
+ private List extractLocationGeometry(List locs)
+ {
+ List geoms = new ArrayList();
+ for (Iterator i = locs.iterator(); i.hasNext();) {
+ GeometryLocation loc = (GeometryLocation) i.next();
+ geoms.add(loc.getComponent());
+ }
+ return geoms;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/PNGWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/PNGWriter.java
new file mode 100644
index 0000000..147d4d2
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/PNGWriter.java
@@ -0,0 +1,100 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.awt.Image;
+import java.awt.image.*;
+import javax.imageio.ImageIO;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.test.TestCaseList;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.testbuilder.BusyDialog;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testrunner.BooleanResult;
+import org.locationtech.jtstest.testrunner.Test;
+import org.locationtech.jtstest.util.FileUtil;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+/**
+ * Creates an .PNG file for a test case.
+ *
+ * @version 1.7
+ */
+public class PNGWriter {
+ private final static int IMAGE_WIDTH = 200;
+ private final static int IMAGE_HEIGHT = 200;
+ private final static int STACK_TRACE_DEPTH = 1;
+
+ private GeometryEditPanel geometryEditPanel = new GeometryEditPanel();
+ private JFrame frame = new JFrame();
+ private File outputDirectory;
+
+ public PNGWriter() {
+ geometryEditPanel.setSize(IMAGE_WIDTH, IMAGE_HEIGHT);
+ geometryEditPanel.setGridEnabled(false);
+ geometryEditPanel.setBorder(BorderFactory.createEmptyBorder());
+ frame.getContentPane().add(geometryEditPanel);
+ }
+
+ public void write(File outputDirectory, TestCaseEdit testCase, PrecisionModel precisionModel) throws IOException {
+ Assert.isTrue(outputDirectory.isDirectory());
+ this.outputDirectory = outputDirectory;
+ createPNGFile("geoms", testCase.getGeometry(0),
+ testCase.getGeometry(1), testCase.getResult(),
+ IMAGE_WIDTH, IMAGE_HEIGHT);
+ }
+
+ private void createPNGFile(String filenameNoPath, Geometry a,
+ Geometry b,
+ Geometry result,
+ int imageWidth, int imageHeight) throws FileNotFoundException,
+ IOException {
+ TestBuilderModel tbModel = new TestBuilderModel();
+ TestCaseEdit tc = new TestCaseEdit(new Geometry[]{ a, b });
+ tc.setResult(result);
+ tbModel.getGeometryEditModel().setTestCase(tc);
+ geometryEditPanel.setModel(tbModel);
+ geometryEditPanel.zoomToFullExtent();
+ geometryEditPanel.setShowingResult(result != null);
+ geometryEditPanel.setShowingGeometryA(a != null);
+ geometryEditPanel.setShowingGeometryB(b != null);
+ String filenameWithPath = outputDirectory.getPath() + "\\" + filenameNoPath;
+ Image image = new BufferedImage(imageWidth, imageHeight, BufferedImage.TYPE_4BYTE_ABGR);
+ geometryEditPanel.paint(image.getGraphics());
+
+ ImageIO.write((RenderedImage) image, "png",
+ new File(filenameWithPath + ".png"));
+ }
+
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/ResultGeometryContainer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/ResultGeometryContainer.java
new file mode 100644
index 0000000..e1ad072
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/ResultGeometryContainer.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.geom.*;
+
+
+public class ResultGeometryContainer
+implements GeometryContainer
+{
+ private GeometryEditModel geomModel;
+
+ public ResultGeometryContainer(GeometryEditModel geomModel) {
+ this.geomModel = geomModel;
+ }
+
+ public Geometry getGeometry()
+ {
+ return geomModel.getResult();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/SVGTestWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/SVGTestWriter.java
new file mode 100644
index 0000000..f3a175a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/SVGTestWriter.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jtstest.test.TestCaseList;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.util.StringUtil;
+import org.locationtech.jtstest.util.io.SVGWriter;
+
+
+
+/**
+ * @version 1.7
+ */
+public class SVGTestWriter {
+
+ public static String getTestSVG(Testable test) {
+ SVGTestWriter writer = new SVGTestWriter();
+ return writer.write(test);
+ }
+
+
+ private SVGWriter writer = new SVGWriter();
+
+ public SVGTestWriter() {}
+
+ public String write(Testable testable) {
+ StringBuffer text = new StringBuffer();
+
+ Geometry ga = testable.getGeometry(0);
+ Geometry gb = testable.getGeometry(1);
+
+ Envelope env = new Envelope();
+ if (ga != null) env.expandToInclude(ga.getEnvelopeInternal());
+ if (gb != null) env.expandToInclude(gb.getEnvelopeInternal());
+
+ String viewBox = env.getMinX() + " " + env.getMinY() + " " + env.getMaxX() + " " + env.getMaxY();
+
+ text.append("<?xml version='1.0' standalone='no'?>\n");
+ text.append("<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>\n");
+ text.append("<svg width='400' height='400' viewBox='" + viewBox + "' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'>\n");
+ String name = testable.getName() == null ? "" : testable.getName();
+ String description = testable.getDescription() == null ? "" : testable.getDescription();
+ //text.append(" \"" + name + "\",\n");
+ text.append(" <desc>" + description + "</desc>\n");
+
+ String a = writeGeometryStyled(ga, "#bbbbff", "#0000ff");
+ String b = writeGeometryStyled(gb, "#ffbbbb", "#ff0000");
+ text.append(a + "\n");
+ text.append("\n");
+ text.append(b + "\n");
+ text.append("</svg>\n");
+ return text.toString();
+ }
+
+ private String writeGeometryStyled(Geometry g, String fillClr, String strokeClr ) {
+ String s = "<g fill='" + fillClr + "' stroke='" + strokeClr + "' >\n";
+ s += write(g);
+ s += "</g>";
+ return s;
+ }
+ private String write(Geometry geometry) {
+ if (geometry == null) {
+ return "";
+ }
+ return writer.write(geometry);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/StaticGeometryContainer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/StaticGeometryContainer.java
new file mode 100644
index 0000000..5ae3356
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/StaticGeometryContainer.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jts.geom.Geometry;
+
+public class StaticGeometryContainer implements GeometryContainer {
+
+ private Geometry geometry;
+
+ public StaticGeometryContainer(Geometry geometry)
+ {
+ this.geometry = geometry;
+ }
+
+ public Geometry getGeometry() {
+ return geometry;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestBuilderModel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestBuilderModel.java
new file mode 100644
index 0000000..f842216
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestBuilderModel.java
@@ -0,0 +1,552 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.io.*;
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.*;
+import org.locationtech.jts.math.MathUtil;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.test.TestCaseList;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.ui.*;
+import org.locationtech.jtstest.testbuilder.ui.style.BasicStyle;
+import org.locationtech.jtstest.testrunner.TestReader;
+import org.locationtech.jtstest.testrunner.TestRun;
+import org.locationtech.jtstest.util.*;
+import org.locationtech.jtstest.util.io.IOUtil;
+import org.locationtech.jtstest.util.io.MultiFormatReader;
+
+
+public class TestBuilderModel
+{
+ private PrecisionModel precisionModel = new PrecisionModel();
+ private GeometryFactory geometryFactory = null;
+ private GeometryEditModel geomEditModel;
+ private LayerList layerList = new LayerList();
+ private WKTWriter writer = new WKTWriter();
+ private Object currResult = null;
+ private String opName = "";
+
+ public TestBuilderModel()
+ {
+ geomEditModel = new GeometryEditModel();
+ initLayers();
+ caseList.init();
+ }
+
+ public GeometryEditModel getGeometryEditModel() { return geomEditModel; }
+
+ public PrecisionModel getPrecisionModel() { return precisionModel; }
+
+ public void setPrecisionModel(PrecisionModel precisionModel)
+ {
+ this.precisionModel = precisionModel;
+ geometryFactory = null;
+ }
+
+ public GeometryFactory getGeometryFactory()
+ {
+ if (geometryFactory == null)
+ geometryFactory = new GeometryFactory(getPrecisionModel());
+ return geometryFactory;
+ }
+
+
+ public String getResultDisplayString(Geometry g)
+ {
+ if (g == null)
+ return "";
+ if (g.getNumPoints() > DisplayParameters.MAX_DISPLAY_POINTS)
+ return GeometryEditModel.toStringVeryLarge(g);
+ return writer.writeFormatted(g);
+ }
+
+ public LayerList getLayers() { return layerList; }
+
+ private void initLayers()
+ {
+ GeometryContainer geomCont0 = new IndexedGeometryContainer(geomEditModel, 0);
+ GeometryContainer geomCont1 = new IndexedGeometryContainer(geomEditModel, 1);
+
+ layerList.getLayer(LayerList.LYR_A).setSource(geomCont0);
+ layerList.getLayer(LayerList.LYR_B).setSource(geomCont1);
+
+ if (geomEditModel != null)
+ layerList.getLayer(LayerList.LYR_RESULT).setSource(
+ new ResultGeometryContainer(geomEditModel));
+
+ Layer lyrA = layerList.getLayer(LayerList.LYR_A);
+ lyrA.setGeometryStyle(new BasicStyle(GeometryDepiction.GEOM_A_LINE_CLR,
+ GeometryDepiction.GEOM_A_FILL_CLR));
+
+ Layer lyrB = layerList.getLayer(LayerList.LYR_B);
+ lyrB.setGeometryStyle(new BasicStyle(GeometryDepiction.GEOM_B_LINE_CLR,
+ GeometryDepiction.GEOM_B_FILL_CLR));
+
+ Layer lyrR = layerList.getLayer(LayerList.LYR_RESULT);
+ lyrR.setGeometryStyle(new BasicStyle(GeometryDepiction.GEOM_RESULT_LINE_CLR,
+ GeometryDepiction.GEOM_RESULT_FILL_CLR));
+ }
+
+ public void pasteGeometry(int geomIndex)
+ throws Exception
+ {
+ Object obj = SwingUtil.getFromClipboard();
+ Geometry g = null;
+ if (obj instanceof String) {
+ g = readGeometryText((String) obj);
+ }
+ else
+ g = (Geometry) obj;
+
+ TestCaseEdit testCaseEdit = getCurrentCase();
+ testCaseEdit.setGeometry(geomIndex, g);
+ getGeometryEditModel().setTestCase(testCaseEdit);
+ }
+
+ private Geometry readGeometryText(String geomStr)
+ throws Exception
+ {
+ Geometry g = null;
+ if (geomStr.length() > 0) {
+ try {
+ MultiFormatReader reader = new MultiFormatReader(getGeometryFactory());
+ g = reader.read(geomStr);
+ } catch (ParseException ex) {
+ String msg = "Unable to parse data: '" + condense(geomStr) + "'";
+ throw new IllegalArgumentException(msg);
+ }
+ }
+ return g;
+ }
+
+ private String condense(String str) {
+ final int N_START = 10;
+ final int N_END = 10;
+ int len = str.length();
+ if (len <= N_START + N_END + 10) return str;
+ return str.substring(0, N_START)
+ + "..."
+ + str.substring(len - N_START, len);
+ }
+
+ public void loadMultipleGeometriesFromFile(int geomIndex, String filename)
+ throws Exception
+ {
+ Geometry g = IOUtil.readFile(filename, getGeometryFactory());
+ TestCaseEdit testCaseEdit = getCurrentCase();
+ testCaseEdit.setGeometry(geomIndex, g);
+ testCaseEdit.setName(filename);
+ getGeometryEditModel().setTestCase(testCaseEdit);
+ }
+
+ public void loadGeometryText(String wktA, String wktB) throws ParseException, IOException {
+ MultiFormatReader reader = new MultiFormatReader(new GeometryFactory(getPrecisionModel(),0));
+
+ // read geom A
+ Geometry g0 = null;
+ if (wktA.length() > 0) {
+ g0 = reader.read(wktA);
+ }
+
+ // read geom B
+ Geometry g1 = null;
+ if (wktB.length() > 0) {
+ g1 = reader.read(wktB);
+ }
+
+ TestCaseEdit testCaseEdit = getCurrentCase();
+ testCaseEdit.setGeometry(0, g0);
+ testCaseEdit.setGeometry(1, g1);
+ getGeometryEditModel().setTestCase(testCaseEdit);
+ }
+
+
+
+ /*
+ public Geometry readMultipleGeometriesFromFile(String filename)
+ throws Exception, IOException
+ {
+ String ext = FileUtil.extension(filename);
+ if (ext.equalsIgnoreCase("shp"))
+ return readMultipleGeometriesFromShapefile(filename);
+ return readMultipleGeometryFromWKT(filename);
+ }
+
+ private Geometry readMultipleGeometriesFromShapefile(String filename)
+ throws Exception
+ {
+ Shapefile shpfile = new Shapefile(new FileInputStream(filename));
+ GeometryFactory geomFact = getGeometryFactory();
+ shpfile.readStream(geomFact);
+ List geomList = new ArrayList();
+ do {
+ Geometry geom = shpfile.next();
+ if (geom == null)
+ break;
+ geomList.add(geom);
+ } while (true);
+
+ return geomFact.createGeometryCollection(GeometryFactory.toGeometryArray(geomList));
+ }
+
+ private Geometry readMultipleGeometryFromWKT(String filename)
+ throws ParseException, IOException
+ {
+ return readMultipleGeometryFromWKTString(FileUtil.readText(filename));
+ }
+
+ private Geometry readMultipleGeometryFromWKTString(String geoms)
+ throws ParseException, IOException
+ {
+ GeometryFactory geomFact = getGeometryFactory();
+ WKTReader reader = new WKTReader(geomFact);
+ WKTFileReader fileReader = new WKTFileReader(new StringReader(geoms), reader);
+ List geomList = fileReader.read();
+
+ if (geomList.size() == 1)
+ return (Geometry) geomList.get(0);
+
+ // TODO: turn polygons into a GC
+ return geomFact.buildGeometry(geomList);
+ }
+
+ */
+
+ //=============================================================
+
+ private CaseList caseList = new CaseList(new CaseList.CaseFactory() {
+ public TestCaseEdit create() {
+ return new TestCaseEdit(precisionModel);
+ }
+ });
+
+ public CaseList cases() {
+ return caseList;
+ }
+ public TestCaseEdit getCurrentCase() {
+ return caseList.getCurrentCase();
+ }
+ public int getCurrentCaseIndex() {
+ return caseList.getCurrentTestIndex();
+ }
+ public int getCasesSize() {
+ return caseList.getSize();
+ }
+ public List getCases() {
+ return caseList.getCases();
+ }
+ public TestCaseList getTestCaseList() {
+ return caseList.tcList;
+ }
+ public void addCase(Geometry[] geoms) {
+ addCase(geoms, null);
+ }
+
+ public void addCase(Geometry[] geoms, String name) {
+ TestCaseEdit tc = new TestCaseEdit(geoms, name);
+ caseList.addCase(tc);
+ }
+
+ //=================================================================
+
+ public void openXmlFilesAndDirectories(File[] files) throws Exception {
+ TestCaseList testCaseList = createTestCaseList(files);
+ PrecisionModel precisionModel = new PrecisionModel();
+ if (!testCaseList.getList().isEmpty()) {
+ TestRunnerTestCaseAdapter a = (TestRunnerTestCaseAdapter) testCaseList.getList().get(0);
+ precisionModel = a.getTestRunnerTestCase().getTestRun().getPrecisionModel();
+ }
+ if (getCases().size() == 1
+ && ((Testable) getCases().get(0)).getGeometry(0) == null
+ && ((Testable) getCases().get(0)).getGeometry(1) == null) {
+ loadTestCaseList(testCaseList, precisionModel);
+ }
+ else {
+ TestCaseList newList = new TestCaseList();
+ newList.add(getTestCaseList());
+ int firstIndex = newList.size();
+ newList.add(testCaseList);
+ loadTestCaseList(newList, precisionModel);
+ caseList.setCurrentTestIndex(firstIndex);
+ }
+ }
+
+ void loadTestCaseList(TestCaseList tcl, PrecisionModel precisionModel) throws Exception {
+ setPrecisionModel(precisionModel);
+ if (tcl != null) {
+ loadEditList(tcl);
+ }
+ }
+
+ public void loadEditList(TestCaseList tcl) throws ParseException {
+ TestCaseList newTcl = new TestCaseList();
+ for (Iterator i = tcl.getList().iterator(); i.hasNext();) {
+ Testable tc = (Testable) i.next();
+
+ if (tc instanceof TestCaseEdit) {
+ newTcl.add((TestCaseEdit) tc);
+ } else {
+ newTcl.add(new TestCaseEdit(tc));
+ }
+ }
+ caseList.init(newTcl);
+ }
+
+ private TestCaseList createTestCaseList(File[] filesAndDirectories) {
+ TestCaseList testCaseList = new TestCaseList();
+ for (int i = 0; i < filesAndDirectories.length; i++) {
+ File fileOrDirectory = filesAndDirectories[i];
+ if (fileOrDirectory.isFile()) {
+ testCaseList.add(createTestCaseList(fileOrDirectory));
+ }
+ else if (fileOrDirectory.isDirectory()) {
+ testCaseList.add(createTestCaseListFromDirectory(fileOrDirectory));
+ }
+ }
+ return testCaseList;
+ }
+
+ private TestCaseList createTestCaseListFromDirectory(File directory) {
+ Assert.isTrue(directory.isDirectory());
+ TestCaseList testCaseList = new TestCaseList();
+ List files = Arrays.asList(directory.listFiles());
+ for (Iterator i = files.iterator(); i.hasNext(); ) {
+ File file = (File) i.next();
+ testCaseList.add(createTestCaseList(file));
+ }
+ return testCaseList;
+ }
+
+ private TestCaseList createTestCaseList(File xmlTestFile)
+ {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(xmlTestFile, 1);
+ parseErrors = testReader.getParsingProblems();
+
+ TestCaseList tcl = new TestCaseList();
+ if (hasParseErrors()) {
+ return tcl;
+ }
+ for (Iterator i = testRun.getTestCases().iterator(); i.hasNext(); ) {
+ org.locationtech.jtstest.testrunner.TestCase testCase = (org.locationtech.jtstest.testrunner.TestCase) i.next();
+ tcl.add(new TestRunnerTestCaseAdapter(testCase));
+ }
+ return tcl;
+ }
+
+ private List parseErrors = null;
+
+ /**
+ *
+ * @return empy list if no errors
+ */
+ public List getParsingProblems()
+ {
+ return parseErrors;
+ }
+
+ public boolean hasParseErrors()
+ {
+ if (parseErrors == null) return false;
+ return parseErrors.size() > 0;
+ }
+
+ public void setResult(Object result)
+ {
+ currResult = result;
+ if (result == null || result instanceof Geometry) {
+ getCurrentCase().setResult((Geometry) result);
+ }
+ }
+
+ public Object getResult()
+ {
+ return currResult;
+ }
+ public void setOpName(String opName)
+ {
+ if (opName == null) {
+ this.opName = "";
+ }
+ else {
+ this.opName = StringUtil.capitalize(opName);
+ }
+ }
+
+ public String getOpName()
+ {
+ return opName;
+ }
+
+ public void copyResult(boolean isFormatted)
+ {
+ SwingUtil.copyToClipboard(currResult, isFormatted);
+ }
+
+ private ArrayList wktABeforePMChange = new ArrayList();
+ private ArrayList wktBBeforePMChange = new ArrayList();
+
+ public void changePrecisionModel(PrecisionModel precisionModel)
+ throws ParseException
+ {
+ saveWKTBeforePMChange();
+ setPrecisionModel(precisionModel);
+ loadWKTAfterPMChange();
+ }
+
+ private void saveWKTBeforePMChange() {
+ wktABeforePMChange.clear();
+ wktBBeforePMChange.clear();
+ for (Iterator i = getCases().iterator(); i.hasNext(); ) {
+ Testable testable = (Testable) i.next();
+ Geometry a = testable.getGeometry(0);
+ Geometry b = testable.getGeometry(1);
+ wktABeforePMChange.add(a != null ? a.toText() : null);
+ wktBBeforePMChange.add(b != null ? b.toText() : null);
+ }
+ }
+
+ private void loadWKTAfterPMChange() throws ParseException {
+ WKTReader reader = new WKTReader(new GeometryFactory(getPrecisionModel(), 0));
+ for (int i = 0; i < getCases().size(); i++) {
+ Testable testable = (Testable) getCases().get(i);
+ String wktA = (String) wktABeforePMChange.get(i);
+ String wktB = (String) wktBBeforePMChange.get(i);
+ testable.setGeometry(0, wktA != null ? reader.read(wktA) : null);
+ testable.setGeometry(1, wktB != null ? reader.read(wktB) : null);
+ }
+ }
+
+ /**
+ * Encapsulates test case cursor logic.
+ * @author Martin Davis
+ *
+ */
+ public static class CaseList {
+
+ public static interface CaseFactory {
+ TestCaseEdit create();
+ }
+
+ private TestCaseList tcList = new TestCaseList();
+ private int tcIndex = -1;
+ private CaseFactory caseFactory;
+
+ public CaseList(CaseFactory caseFactory) {
+ this.caseFactory = caseFactory;
+ }
+ public void init()
+ {
+ tcList = new TestCaseList();
+ // ensure that there is always a valid TestCase in the list
+ createNew();
+ }
+
+ public void init(TestCaseList tcl) {
+ tcList = tcl;
+ if (tcList.size() > 0) {
+ tcIndex = 0;
+ }
+ else {
+ createNew();
+ }
+ }
+
+ public List getCases() {
+ return Collections.unmodifiableList(tcList.getList());
+ }
+
+ public void setCurrent(TestCaseEdit testCase) {
+ for (int i = 0; i < tcList.size(); i++) {
+ if (tcList.get(i) == testCase) {
+ tcIndex = i;
+ return;
+ }
+ }
+ }
+
+ public TestCaseEdit getCurrentCase()
+ {
+ return (TestCaseEdit) getCurrentTestable();
+ }
+
+ public Testable getCurrentTestable() {
+ return (TestCaseEdit) tcList.get(tcIndex);
+ }
+
+ public int getCurrentTestIndex()
+ {
+ return tcIndex;
+ }
+ public void setCurrentTestIndex(int i) {
+ tcIndex = MathUtil.clamp(i, 0, getSize() -1 );
+ }
+ public TestCaseList getTestList()
+ {
+ return tcList;
+ }
+
+ public int getSize()
+ {
+ return tcList.getList().size();
+ }
+ public void prevCase() {
+ if (tcIndex > 0)
+ tcIndex--;
+ }
+
+ public void nextCase() {
+ if (tcIndex < tcList.size() - 1)
+ tcIndex++;
+ }
+
+ public void copyCase() {
+ TestCaseEdit copy = null;
+ copy = new TestCaseEdit(getCurrentCase());
+ addCase(copy);
+ }
+
+ public void createNew() {
+ addCase( caseFactory.create());
+ }
+
+ private void addCase(TestCaseEdit testcase) {
+ if (tcIndex < 0) {
+ tcList.add(testcase);
+ }
+ else {
+ tcList.add(testcase, tcIndex+1);
+ }
+ tcIndex++;
+ }
+
+ public void deleteCase() {
+ tcList.remove(tcIndex);
+ if (tcList.size() == 0) {
+ createNew();
+ }
+ if (tcIndex >= tcList.size())
+ tcIndex = tcList.size() - 1;
+ }
+
+ }
+
+
+}
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestCaseEdit.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestCaseEdit.java
new file mode 100644
index 0000000..969d7c4
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestCaseEdit.java
@@ -0,0 +1,156 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jtstest.test.TestCase;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+
+
+
+/**
+ * @version 1.7
+ */
+public class TestCaseEdit implements Testable {
+ private Geometry[] geom = new Geometry[2];
+ private Testable testable;
+
+ private String opName = "";
+ private Geometry resultGeom = null;
+
+
+ public TestCaseEdit(PrecisionModel pm) {
+ TestCase testCase = new TestCase();
+ testCase.setPrecisionModel(pm);
+ testable = testCase;
+ }
+
+ public TestCaseEdit(Testable tc) throws ParseException {
+ this.testable = tc;
+ testable.initGeometry();
+ setGeometry(0, testable.getGeometry(0));
+ setGeometry(1, testable.getGeometry(1));
+ }
+
+ public TestCaseEdit(TestCaseEdit tce) {
+ this.testable = new TestCase();
+ setGeometry(0, tce.getGeometry(0));
+ setGeometry(1, tce.getGeometry(1));
+ }
+
+ public TestCaseEdit(Geometry[] geom) {
+ this.testable = new TestCase();
+ setGeometry(0, geom[0]);
+ setGeometry(1, geom[1]);
+ }
+
+ public TestCaseEdit(Geometry[] geom, String name) {
+ this.testable = new TestCase();
+ setGeometry(0, geom[0]);
+ setGeometry(1, geom[1]);
+ testable.setName(name);
+ }
+
+ private static Geometry cloneGeometry(Geometry geom)
+ {
+ if (geom == null) return null;
+ return (Geometry) geom.clone();
+ }
+
+ public void setGeometry(int i, Geometry geom) {
+ testable.setGeometry(i, geom);
+ }
+
+ public void setName(String name) {
+ testable.setName(name);
+ }
+
+ public Geometry getResult()
+ {
+ return resultGeom;
+ }
+
+ public void setResult(Geometry geom)
+ {
+ resultGeom = geom;
+ }
+
+ public String getOpName() { return opName; }
+
+ public void setOpName(String name) { opName = name; }
+
+ public Geometry getGeometry(int i) {
+// return geom[i];
+ return testable.getGeometry(i);
+ }
+
+
+ public Testable getTestable() {
+ return testable;
+ }
+
+
+ public String getName() {
+ return testable.getName();
+ }
+
+ public IntersectionMatrix getIntersectionMatrix() {
+ return testable.getIntersectionMatrix();
+ }
+
+ public void setIntersectionMatrix(IntersectionMatrix im) {
+ testable.setIntersectionMatrix(im);
+ }
+ public String getDescription() {
+ return testable.getDescription();
+ }
+
+ public String getWellKnownText(int i) {
+ return testable.getWellKnownText(i);
+ }
+
+ public void exchange()
+ {
+ Geometry temp = testable.getGeometry(0);
+ testable.setGeometry(0, testable.getGeometry(1));
+ testable.setGeometry(1, temp);
+ }
+
+ public void initGeometry() throws ParseException {
+ testable.initGeometry();
+ }
+
+ public Geometry[] getGeometries() {
+ return new Geometry[] {
+ testable.getGeometry(0), testable.getGeometry(1)
+ };
+ }
+
+ public IntersectionMatrix getIM() {
+ runRelate();
+ return testable.getIntersectionMatrix();
+ }
+
+ void runRelate() {
+ Geometry[] geom = getGeometries();
+ if (geom[0] == null || geom[1] == null) {
+ return;
+ }
+ testable.setIntersectionMatrix(geom[0].relate(geom[1]));
+ }
+}
+
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestModel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestModel.java
new file mode 100644
index 0000000..86ea5cd
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestModel.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+/**
+ * Contains the Geometry objects which the JTS Test Builder
+ * operates on
+ *
+ * @version 1.7
+ */
+public class TestModel {
+
+ public TestModel() {}
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestRunnerTestCaseAdapter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestRunnerTestCaseAdapter.java
new file mode 100644
index 0000000..837d565
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestRunnerTestCaseAdapter.java
@@ -0,0 +1,286 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+import java.util.Arrays;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.geomop.*;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.testrunner.BooleanResult;
+import org.locationtech.jtstest.testrunner.GeometryResult;
+import org.locationtech.jtstest.testrunner.Result;
+import org.locationtech.jtstest.testrunner.SimpleReportWriter;
+import org.locationtech.jtstest.testrunner.Test;
+import org.locationtech.jtstest.testrunner.TestCase;
+
+
+/**
+ * @version 1.7
+ */
+public class TestRunnerTestCaseAdapter
+ implements Testable {
+ private TestCase testCase;
+ private boolean ranAtLeastOnce = false;
+ private WKTWriter wktWriter = new WKTWriter();
+
+ public TestRunnerTestCaseAdapter(org.locationtech.jtstest.testrunner.TestCase testCase) {
+ this.testCase = testCase;
+ }
+
+ public void setGeometry(int index, Geometry g) {
+ if (index == 0) {
+ testCase.setGeometryA(g);
+ }
+ else if (index == 1) {
+ testCase.setGeometryB(g);
+ }
+ else {
+ Assert.shouldNeverReachHere();
+ }
+ }
+
+ public void setIntersectionMatrix(IntersectionMatrix im) { }
+
+ public void setName(String name) {
+ testCase.setDescription(name);
+ }
+
+ public void setExpectedIntersectionMatrix(String expectedIntersectionMatrix) {
+ getOrCreateABTest("relate").setArgument(1, expectedIntersectionMatrix);
+ }
+
+ public void setExpectedConvexHull(Geometry expectedConvexHull) {
+ setExpectedSpatialFunction("convexhull", expectedConvexHull);
+ }
+
+ public void setExpectedBoundary(Geometry expectedBoundary) {
+ setExpectedSpatialFunction("getboundary", expectedBoundary);
+ }
+
+ public void setExpectedIntersection(Geometry expectedIntersection) {
+ setExpectedSpatialFunction("intersection", expectedIntersection);
+ }
+
+ public void setExpectedUnion(Geometry expectedUnion) {
+ setExpectedSpatialFunction("union", expectedUnion);
+ }
+
+ public void setExpectedDifference(Geometry expectedDifference) {
+ setExpectedSpatialFunction("difference", expectedDifference);
+ }
+
+ public void setExpectedSymDifference(Geometry expectedSymDifference) {
+ setExpectedSpatialFunction("symdifference", expectedSymDifference);
+ }
+
+ public void setExpectedCentroid(Geometry expected) {
+ setExpectedSpatialFunction("centroid", expected);
+ }
+
+ public boolean isFailed() {
+ if (!ranAtLeastOnce) {
+ return false;
+ }
+ for (Iterator i = testCase.getTests().iterator(); i.hasNext(); ) {
+ org.locationtech.jtstest.testrunner.Test test = (org.locationtech.jtstest.testrunner.Test) i.next();
+ if (!test.isPassed()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String getFailedMsg() {
+ if (!ranAtLeastOnce) {
+ return "";
+ }
+ for (Iterator i = testCase.getTests().iterator(); i.hasNext(); ) {
+ org.locationtech.jtstest.testrunner.Test test = (org.locationtech.jtstest.testrunner.Test) i.next();
+ if (!test.isPassed()) {
+ SimpleReportWriter reportWriter = new SimpleReportWriter(false);
+ return reportWriter.write(test);
+ }
+ }
+ return "";
+ }
+
+ public String getName() {
+ return testCase.getDescription();
+ }
+
+ public Geometry getGeometry(int index) {
+ if (index == 0) {
+ return testCase.getGeometryA();
+ }
+ else if (index == 1) {
+ return testCase.getGeometryB();
+ }
+ Assert.shouldNeverReachHere();
+ return null;
+ }
+
+ public IntersectionMatrix getIntersectionMatrix() {
+ return testCase.getGeometryA().relate(testCase.getGeometryB());
+ }
+
+ public String getDescription() {
+ return testCase.getDescription();
+ }
+
+ public boolean isPassed() {
+ if (!ranAtLeastOnce) {
+ return false;
+ }
+ for (Iterator i = testCase.getTests().iterator(); i.hasNext(); ) {
+ org.locationtech.jtstest.testrunner.Test test = (org.locationtech.jtstest.testrunner.Test) i.next();
+ if (!test.isPassed()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public String getWellKnownText(int index) {
+ if (index == 0) {
+ if (testCase.getGeometryA() == null) {
+ return null;
+ }
+ return wktWriter.write(testCase.getGeometryA());
+ }
+ else if (index == 1) {
+ if (testCase.getGeometryB() == null) {
+ return null;
+ }
+ return wktWriter.write(testCase.getGeometryB());
+ }
+ Assert.shouldNeverReachHere();
+ return null;
+ }
+
+ public TestCase getTestRunnerTestCase() {
+ return testCase;
+ }
+
+ public String getExpectedIntersectionMatrix() {
+ Test test = getABTest("relate");
+ if (test == null) {
+ return null;
+ }
+ return test.getArgument(1);
+ }
+
+ public Geometry getExpectedConvexHull() {
+ return toGeometry(getABTest("convexhull"));
+ }
+
+ public Geometry getExpectedBoundary() {
+ return toGeometry(getABTest("getboundary"));
+ }
+
+ public Geometry getExpectedIntersection() {
+ return toGeometry(getABTest("intersection"));
+ }
+
+ public Geometry getExpectedUnion() {
+ return toGeometry(getABTest("union"));
+ }
+
+ public Geometry getExpectedDifference() {
+ return toGeometry(getABTest("difference"));
+ }
+
+ public Geometry getExpectedSymDifference() {
+ return toGeometry(getABTest("symdifference"));
+ }
+
+ public void runTest() throws ParseException {
+ ranAtLeastOnce = true;
+ testCase.run();
+ }
+
+ public void initGeometry() throws ParseException { }
+
+ public Geometry toGeometry(Test test) {
+ if (test == null) {
+ return null;
+ }
+ Assert.isTrue(test.getExpectedResult() instanceof GeometryResult);
+ return ((GeometryResult) test.getExpectedResult()).getGeometry();
+ }
+
+ private void setExpectedSpatialFunction(String opName, Geometry expectedGeometry) {
+ if (expectedGeometry == null) {
+ getOrCreateABTest(opName).getTestCase().remove(getOrCreateABTest(opName));
+ return;
+ }
+ getOrCreateABTest(opName).setResult(new GeometryResult(expectedGeometry));
+ }
+
+ private Test getOrCreateABTest(String opName) {
+ Test testToReturn = getABTest(opName);
+ if (testToReturn == null) {
+ testToReturn = new Test(testCase, maxTestIndex(testCase) + 1, null, opName, "A",
+ Arrays.asList(new String[]{"B"}),
+ getDefaultResult(opName),
+ 0);
+ testCase.add(testToReturn);
+ }
+ return testToReturn;
+ }
+
+ private Result getDefaultResult(String opName) {
+ if (GeometryMethodOperation.isBooleanFunction(opName)) {
+ return new BooleanResult(true);
+ }
+ if (GeometryMethodOperation.isGeometryFunction(opName)) {
+ return new GeometryResult(
+ new GeometryFactory(testCase.getTestRun().getPrecisionModel(),
+ 0).createGeometryCollection(null));
+ }
+ Assert.shouldNeverReachHere();
+ return null;
+ }
+
+ private Test getABTest(String opName) {
+ Assert.isTrue(GeometryMethodOperation.isBooleanFunction(opName)
+ || GeometryMethodOperation.isGeometryFunction(opName));
+ for (Iterator i = testCase.getTests().iterator(); i.hasNext(); ) {
+ Test test = (Test) i.next();
+ if (test.getOperation().equalsIgnoreCase(opName)
+ && ((!opName.equalsIgnoreCase("relate"))
+ || test.getExpectedResult().equals(new BooleanResult(true)))
+ && (test.getGeometryIndex().equalsIgnoreCase("A"))
+ && ((test.getArgumentCount() == 0) || (
+ test.getArgument(0) != null
+ && (test.getArgument(0).equalsIgnoreCase("B"))))) {
+ return test;
+ }
+ }
+ return null;
+ }
+
+ private int maxTestIndex(TestCase testCase) {
+ int maxTestIndex = -1;
+ for (Iterator i = testCase.getTests().iterator(); i.hasNext(); ) {
+ Test test = (Test) i.next();
+ maxTestIndex = Math.max(maxTestIndex, test.getTestIndex());
+ }
+ return maxTestIndex;
+ }
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestWriter.java
new file mode 100644
index 0000000..0f2b08f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/TestWriter.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import org.locationtech.jtstest.test.Testable;
+
+
+/**
+ * @version 1.7
+ */
+public interface TestWriter {
+
+ String write(Testable testable);
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/XMLTestWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/XMLTestWriter.java
new file mode 100644
index 0000000..2ad42b2
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/XMLTestWriter.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.model;
+
+import java.io.File;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.WKBWriter;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.test.TestCase;
+import org.locationtech.jtstest.test.TestCaseList;
+import org.locationtech.jtstest.test.Testable;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+
+/**
+ * @version 1.7
+ */
+public class XMLTestWriter
+{
+ public static String toXML(PrecisionModel precisionModel) {
+ if (precisionModel.isFloating()) {
+ return "<precisionModel type=\"FLOATING\"/>";
+ }
+ return "<precisionModel type=\"FIXED\" scale=\""
+ + precisionModel.getScale() + "\"/>";
+ }
+
+ private WKTWriter wktWriter = new WKTWriter();
+ private WKBWriter wkbWriter = new WKBWriter();
+
+ public XMLTestWriter() {
+ }
+
+ public String getTestXML(Geometry geometry, String opName, String[] arguments, boolean useWKT) {
+ String xml = " <test>\n";
+ xml += " <op name=\"" + opName + "\" arg1=\"A\"";
+ int j = 2;
+ for (int i = 0; i < arguments.length; i++) {
+ String argument = arguments[i];
+ Assert.isTrue(argument != null);
+ xml += " arg" + j + "=\"" + argument + "\"";
+ j++;
+ }
+ xml += ">\n";
+ xml += getWKTorWKB(geometry, useWKT) + "\n";
+ xml += " </op>\n";
+ xml += " </test>\n";
+ return xml;
+ }
+
+ private boolean isGdbcTestCase(TestCase testCase) {
+ if (testCase.getName() == null || testCase.getDescription() == null) {
+ return false;
+ }
+ if (testCase.getName().equalsIgnoreCase(testCase.getDescription())) {
+ return false;
+ }
+ int nameColonIndex = testCase.getName().indexOf(":");
+ int descriptionColonIndex = testCase.getDescription().indexOf(":");
+ if (nameColonIndex == -1 || descriptionColonIndex == -1) {
+ return false;
+ }
+ if (nameColonIndex != descriptionColonIndex) {
+ return false;
+ }
+ return true;
+ }
+
+ public String getDescriptionForXmlFromGdbcTestCase(TestCase testCase) {
+ int descriptionColonIndex = testCase.getDescription().indexOf(":");
+ return "<desc>" + StringUtil.escapeHTML(testCase.getName() + " ["
+ + testCase.getDescription().substring(1+descriptionColonIndex).trim()
+ + "]") + "</desc>\n";
+ }
+
+ public String getDescriptionForXml(Testable testCase) {
+ /*
+ if (isGdbcTestCase(testCase)) {
+ return getDescriptionForXmlFromGdbcTestCase(testCase);
+ }
+ */
+ if (testCase.getDescription() != null && testCase.getDescription().length() > 0) {
+ return "<desc>" + StringUtil.escapeHTML(testCase.getDescription()) + "</desc>\n";
+ }
+ if (testCase.getName() != null && testCase.getName().length() > 0) {
+ return "<desc>" + StringUtil.escapeHTML(testCase.getName()) + "</desc>\n";
+ }
+ return "<desc> "
+ + getGeometryArgPairCode(testCase.getGeometry(0), testCase.getGeometry(1) )
+ + " </desc>\n";
+ }
+
+ private static String getGeometryArgPairCode(Geometry geom0, Geometry geom1)
+ {
+ return getGeometryCode(geom0) + "/" + getGeometryCode(geom1);
+ }
+
+ private static String getGeometryCode(Geometry geom)
+ {
+ String dimCode = "";
+ if (geom instanceof Puntal) dimCode = "P";
+ if (geom instanceof Lineal) dimCode = "L";
+ if (geom instanceof Polygonal) dimCode = "L";
+
+ if (geom instanceof GeometryCollection) return "m" + dimCode;
+
+ return dimCode;
+ }
+
+ public String getTestXML(TestRunnerTestCaseAdapter adapter) {
+ return adapter.getTestRunnerTestCase().toXml();
+ }
+
+ public String getTestXML(Testable testCase)
+ {
+ return getTestXML(testCase, true);
+ }
+
+ public String getTestXML(Testable testCase, boolean useWKT) {
+ Geometry geom0 = testCase.getGeometry(0);
+ Geometry geom1 = testCase.getGeometry(1);
+ StringBuffer xml = new StringBuffer();
+ xml.append("<case>\n");
+ xml.append(getDescriptionForXml(testCase));
+ if (geom0 != null) {
+ String wkt0 = getWKTorWKB(geom0, useWKT);
+ xml.append(" <a>\n" + wkt0 + "\n </a>\n");
+ }
+ if (geom1 != null) {
+ String wkt1 = getWKTorWKB(geom1, useWKT);
+ xml.append(" <b>\n" + wkt1 + "\n </b>\n");
+ }
+ xml.append("</case>\n");
+ return xml.toString();
+ }
+
+ private String getWKTorWKB(Geometry g, boolean useWKT)
+ {
+ if (useWKT)
+ return wktWriter.writeFormatted(g);
+ return WKBWriter.toHex(wkbWriter.write(g));
+ }
+
+ public String getTestXML(TestCaseList tcList) {
+ StringBuffer xml = new StringBuffer();
+ for (int i = 0; i < tcList.getList().size(); i++) {
+ xml.append("\n");
+ xml.append(getTestXML((Testable) tcList.getList().get(i)));
+ }
+ xml.append("\n");
+ return xml.toString();
+ }
+
+ public static String getRunXml(TestCaseList tcList, PrecisionModel precModel) {
+ String runXML = "<run>" + StringUtil.newLine;
+ runXML += getRunDescription(tcList);
+ runXML += getRunWorkspace(tcList);
+ runXML += toXML(precModel) + StringUtil.newLine;
+ runXML += (new XMLTestWriter()).getTestXML(tcList) + "</run>";
+ return runXML;
+ }
+
+ public static String getRunDescription(TestCaseList l) {
+ for (Iterator i = l.getList().iterator(); i.hasNext(); ) {
+ TestCaseEdit tce = (TestCaseEdit) i.next();
+ if (tce.getTestable() instanceof TestRunnerTestCaseAdapter) {
+ TestRunnerTestCaseAdapter a = (TestRunnerTestCaseAdapter) tce.getTestable();
+ String description = a.getTestRunnerTestCase().getTestRun().getDescription();
+ if (description != null && description.length() > 0) {
+ return " <desc>" + StringUtil.escapeHTML(description)
+ + "</desc>" + StringUtil.newLine;
+ }
+ return "";
+ }
+ }
+ return "";
+ }
+
+ public static String getRunWorkspace(TestCaseList l) {
+ for (Iterator i = l.getList().iterator(); i.hasNext(); ) {
+ TestCaseEdit tce = (TestCaseEdit) i.next();
+ if (tce.getTestable() instanceof TestRunnerTestCaseAdapter) {
+ TestRunnerTestCaseAdapter a = (TestRunnerTestCaseAdapter) tce.getTestable();
+ File workspace = a.getTestRunnerTestCase().getTestRun().getWorkspace();
+ if (workspace != null) {
+ return " <workspace file=\"" + StringUtil.escapeHTML(workspace.toString())
+ + "\"/>" + StringUtil.newLine;
+ }
+ return "";
+ }
+ }
+ return "";
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java
new file mode 100644
index 0000000..62d53a5
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.topostretch;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+
+public class GeometryVerticesMover
+{
+ public static Geometry move(Geometry geom, Map moves)
+ {
+ GeometryVerticesMover mover = new GeometryVerticesMover(geom, moves);
+ return mover.move();
+ }
+
+ private Geometry geom;
+ private Map moves;
+ private List modifiedCoords = new ArrayList();
+
+ public GeometryVerticesMover(Geometry geom, Map moves)
+ {
+ this.geom = geom;
+ this.moves = moves;
+ }
+
+ public Geometry move()
+ {
+ GeometryEditor editor = new GeometryEditor();
+ MoveVerticesOperation op = new MoveVerticesOperation(moves);
+ Geometry movedGeom = editor.edit(geom, new MoveVerticesOperation(moves));
+ return movedGeom;
+ }
+
+ public List getModifiedCoordinates()
+ {
+ return modifiedCoords;
+ }
+
+ private class MoveVerticesOperation
+ extends GeometryEditor.CoordinateOperation
+ {
+ private Map moves;
+
+ public MoveVerticesOperation(Map moves)
+ {
+ this.moves = moves;
+ }
+
+
+ public Coordinate[] edit(Coordinate[] coords,
+ Geometry geometry)
+ {
+ Coordinate[] newPts = new Coordinate[coords.length];
+ for (int i = 0; i < coords.length; i++) {
+ newPts[i] = movedPt(coords[i]);
+ }
+ return newPts;
+ }
+
+ private Coordinate movedPt(Coordinate orig)
+ {
+ Coordinate newLoc = (Coordinate) moves.get(orig);
+ if (newLoc == null)
+ return orig;
+ Coordinate mod = (Coordinate) newLoc.clone();
+ modifiedCoords.add(mod);
+ return mod;
+ }
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/StretchedVertex.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/StretchedVertex.java
new file mode 100644
index 0000000..438b5af
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/StretchedVertex.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.topostretch;
+
+import org.locationtech.jts.algorithm.*;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.math.MathUtil;
+import org.locationtech.jts.math.Vector2D;
+
+/**
+ * Models a vertex of a Geometry which will be stretched
+ * due to being too near other segments and vertices.
+ * <p>
+ * Currently for simplicity a vertex is assumed to
+ * be near only one segment or other vertex.
+ * This is sufficient for most cases.
+ *
+ * @author Martin Davis
+ *
+ */
+public class StretchedVertex
+{
+ // TODO: also provide information about the segments around the facet the vertex is near to, to allow smarter adjustment
+
+ private Coordinate vertexPt;
+ private Coordinate[] parentLine;
+ private int parentIndex;
+ private Coordinate nearPt = null;
+ private Coordinate[] nearPts = null;
+ private int nearIndex = -1;
+ private LineSegment nearSeg = null;
+ private Coordinate stretchedPt = null;
+
+ /**
+ * Creates a vertex which lies near a vertex
+ */
+ public StretchedVertex(Coordinate vertexPt, Coordinate[] parentLine, int parentIndex,
+ Coordinate nearPt, Coordinate[] nearPts, int nearIndex)
+ {
+ this.vertexPt = vertexPt;
+ this.parentLine = parentLine;
+ this.parentIndex = parentIndex;
+ this.nearPt = nearPt;
+ this.nearPts = nearPts;
+ this.nearIndex = nearIndex;
+ }
+
+ /**
+ * Creates a vertex for a point which lies near a line segment
+ * @param vertexPt
+ * @param parentLine
+ * @param parentIndex
+ * @param nearSeg
+ */
+ public StretchedVertex(Coordinate vertexPt, Coordinate[] parentLine, int parentIndex,
+ LineSegment nearSeg)
+ {
+ this.vertexPt = vertexPt;
+ this.parentLine = parentLine;
+ this.parentIndex = parentIndex;
+ this.nearSeg = nearSeg;
+ }
+
+ public Coordinate getVertexCoordinate()
+ {
+ return vertexPt;
+ }
+
+ /**
+ * Gets the point which this near vertex will be stretched to
+ * (by a given distance)
+ *
+ * @param dist the distance to adjust the point by
+ * @return the stretched coordinate
+ */
+ public Coordinate getStretchedVertex(double dist)
+ {
+ if (stretchedPt != null)
+ return stretchedPt;
+
+ if (nearPt != null) {
+ stretchedPt = displaceFromVertex(nearPt, dist);
+// stretchedPt = displaceFromPoint(nearPt, dist);
+ // displace in direction of segment this pt lies on
+ }
+ else {
+ stretchedPt = displaceFromSeg(nearSeg, dist);
+ }
+ return stretchedPt;
+ }
+
+ private boolean isNearRing()
+ {
+ return CoordinateArrays.isRing(nearPts);
+ }
+
+ private Coordinate getNearRingPoint(int i)
+ {
+ int index = i;
+ if (i < 0)
+ index = i + nearPts.length -1;
+ else if (i >= nearPts.length - 1)
+ index = i - (nearPts.length - 1);
+ return nearPts[index];
+ }
+
+ private Coordinate displaceFromPoint(Coordinate nearPt, double dist)
+ {
+ LineSegment seg = new LineSegment(nearPt, vertexPt);
+
+ // compute an adjustment which displaces in the direction of the nearPt-vertexPt vector
+ // TODO: make this robust!
+ double len = seg.getLength();
+ double frac = (dist + len) / len;
+ Coordinate strPt = seg.pointAlong(frac);
+ return strPt;
+ }
+
+ private Coordinate displaceFromSeg(LineSegment nearSeg, double dist)
+ {
+ double frac = nearSeg.projectionFactor(vertexPt);
+
+ // displace away from the segment on the same side as the original point
+ int side = nearSeg.orientationIndex(vertexPt);
+ if (side == Orientation.RIGHT)
+ dist = -dist;
+
+ return nearSeg.pointAlongOffset(frac, dist);
+ }
+
+ private Coordinate displaceFromVertex(Coordinate nearPt, double dist)
+ {
+ // handle linestring endpoints - do simple displacement
+ if (! isNearRing()
+ && nearIndex == 0 || nearIndex >= nearPts.length -1) {
+ return displaceFromPoint(nearPt, dist);
+ }
+
+ // analyze corner to see how to displace the vertex
+ // find corner points
+ Coordinate p1 = getNearRingPoint(nearIndex - 1);
+ Coordinate p2 = getNearRingPoint(nearIndex + 1);
+
+ // if vertexPt is identical to an arm of the corner, just displace the point
+ if (p1.equals2D(vertexPt) || p2.equals2D(vertexPt))
+ return displaceFromPoint(nearPt, dist);
+
+ return displaceFromCornerAwayFromArms(nearPt, p1, p2, dist);
+ }
+
+ private Coordinate displaceFromCornerOriginal(Coordinate nearPt, Coordinate p1, Coordinate p2, double dist)
+ {
+ // if corner is nearly flat, just displace point
+ // TODO: displace from vertex on appropriate side of flat line, with suitable angle
+ if (isFlat(nearPt, p1, p2))
+ return displaceFromFlatCorner(nearPt, p1, p2, dist);
+
+ Coordinate[] corner = orientCorner(nearPt, p1, p2);
+
+ // find quadrant of corner that vertex pt lies in
+ int quadrant = quadrant(vertexPt, nearPt, corner);
+
+ Vector2D normOffset = normalizedOffset(nearPt, p1, p2);
+ Vector2D baseOffset = normOffset.multiply(dist);
+ Vector2D rotatedOffset = baseOffset.rotateByQuarterCircle(quadrant);
+
+ return rotatedOffset.translate(vertexPt);
+ //return null;
+ }
+
+ private Coordinate displaceFromCorner(Coordinate nearPt, Coordinate p1, Coordinate p2, double dist)
+ {
+ Coordinate[] corner = orientCorner(nearPt, p1, p2);
+ // compute perpendicular bisector of p1-p2
+ Vector2D u1 = Vector2D.create(nearPt, corner[0]).normalize();
+ Vector2D u2 = Vector2D.create(nearPt, corner[1]).normalize();
+ double ang = u1.angle(u2);
+ Vector2D innerBisec = u2.rotate(ang / 2);
+ Vector2D offset = innerBisec.multiply(dist);
+ if (! isInsideCorner(vertexPt, nearPt, corner[0], corner[1])) {
+ offset = offset.multiply(-1);
+ }
+ return offset.translate(vertexPt);
+ }
+
+ private static final double MAX_ARM_NEARNESS_ANG = 20.0 / 180.0 * Math.PI;
+
+ private static double maxAngleToBisector(double ang)
+ {
+ double relAng = ang / 2 - MAX_ARM_NEARNESS_ANG;
+ if (relAng < 0) return 0;
+ return relAng;
+ }
+
+ /**
+ * Displaces a vertex from a corner,
+ * with angle limiting
+ * used to ensure that the displacement is not close to the arms of the corner.
+ *
+ * @param nearPt
+ * @param p1
+ * @param p2
+ * @param dist
+ * @return
+ */
+ private Coordinate displaceFromCornerAwayFromArms(Coordinate nearPt, Coordinate p1, Coordinate p2, double dist)
+ {
+ Coordinate[] corner = orientCorner(nearPt, p1, p2);
+ boolean isInsideCorner = isInsideCorner(vertexPt, nearPt, corner[0], corner[1]);
+
+ Vector2D u1 = Vector2D.create(nearPt, corner[0]).normalize();
+ Vector2D u2 = Vector2D.create(nearPt, corner[1]).normalize();
+ double cornerAng = u1.angle(u2);
+
+ double maxAngToBisec = maxAngleToBisector(cornerAng);
+
+ Vector2D bisec = u2.rotate(cornerAng / 2);
+ if (! isInsideCorner) {
+ bisec = bisec.multiply(-1);
+ double outerAng = 2 * Math.PI - cornerAng;
+ maxAngToBisec = maxAngleToBisector(outerAng);
+ }
+
+ Vector2D pointwiseDisplacement = Vector2D.create(nearPt, vertexPt).normalize();
+ double stretchAng = pointwiseDisplacement.angleTo(bisec);
+ double stretchAngClamp = MathUtil.clamp(stretchAng, -maxAngToBisec, maxAngToBisec);
+ Vector2D cornerDisplacement = bisec.rotate(-stretchAngClamp).multiply(dist);
+
+ return cornerDisplacement.translate(vertexPt);
+ }
+
+ private boolean isInsideCorner(Coordinate queryPt, Coordinate base, Coordinate p1, Coordinate p2)
+ {
+ return Orientation.index(base, p1, queryPt) == Orientation.CLOCKWISE
+ && Orientation.index(base, p2, queryPt) == Orientation.COUNTERCLOCKWISE;
+ }
+
+ private static final double POINT_LINE_FLATNESS_RATIO = 0.01;
+
+ private static boolean isFlat(Coordinate p, Coordinate p1, Coordinate p2)
+ {
+ double dist = Distance.pointToSegment(p, p1, p2);
+ double len = p1.distance(p2);
+ if (dist/len < POINT_LINE_FLATNESS_RATIO)
+ return true;
+ return false;
+ }
+
+ /**
+ *
+ * @param pt
+ * @param cornerBase the two vertices defining the
+ * @param corner the two vertices defining the arms of the corner, oriented CW
+ * @return the quadrant the pt lies in
+ */
+ private static int quadrant(Coordinate pt, Coordinate cornerBase, Coordinate[] corner)
+ {
+ if (Orientation.index(cornerBase, corner[0], pt) == Orientation.CLOCKWISE) {
+ if (Orientation.index(cornerBase, corner[1], pt) == Orientation.COUNTERCLOCKWISE) {
+ return 0;
+ }
+ else
+ return 3;
+ }
+ else {
+ if (Orientation.index(cornerBase, corner[1], pt) == Orientation.COUNTERCLOCKWISE) {
+ return 1;
+ }
+ else
+ return 2;
+ }
+ }
+
+ private static Coordinate rotateToQuadrant(Coordinate v, int quadrant)
+ {
+ switch (quadrant) {
+ case 0: return v;
+ case 1: return new Coordinate(-v.y, v.x);
+ case 2: return new Coordinate(-v.x, -v.y);
+ case 3: return new Coordinate(v.y, -v.x);
+ }
+ return null;
+ }
+
+ /**
+ * Returns an array of pts such that p0 - p[0] - [p1] is CW.
+ *
+ * @param p0
+ * @param p1
+ * @param p2
+ * @return
+ */
+ private static Coordinate[] orientCorner(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ Coordinate[] orient;
+ // TODO: not sure if determining orientation is necessary?
+ if (Orientation.CLOCKWISE == Orientation.index(p0, p1, p2)) {
+ orient = new Coordinate[] {p1, p2 };
+ }
+ else {
+ orient = new Coordinate[] { p2, p1 };
+ }
+
+ return orient;
+ }
+
+ /**
+ * Returns an array of pts such that p0 - p[0] - [p1] is CW.
+ *
+ * @param p0
+ * @param p1
+ * @param p2
+ * @return
+ */
+ private static Vector2D normalizedOffset(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ Vector2D u1 = Vector2D.create(p0, p1).normalize();
+ Vector2D u2 = Vector2D.create(p0, p2).normalize();
+ Vector2D offset = u1.add(u2).normalize();
+ return offset;
+ }
+
+ private Coordinate displaceFromFlatCorner(Coordinate nearPt, Coordinate p1, Coordinate p2, double dist)
+ {
+ // compute perpendicular bisector of p1-p2
+ Vector2D bisecVec = Vector2D.create(p2, p1).rotateByQuarterCircle(1);
+ Vector2D offset = bisecVec.normalize().multiply(dist);
+ return offset.translate(vertexPt);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/StretchedVertexFinder.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/StretchedVertexFinder.java
new file mode 100644
index 0000000..71d6845
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/StretchedVertexFinder.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.topostretch;
+
+import java.util.*;
+
+import org.locationtech.jts.algorithm.*;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+
+class StretchedVertexFinder
+{
+ public static List findNear(Collection linestrings, double tolerance, Envelope mask)
+ {
+ StretchedVertexFinder finder = new StretchedVertexFinder(linestrings, tolerance, mask);
+ return finder.getNearVertices();
+ }
+
+ private Collection linestrings;
+ private double tolerance = 0.0;
+ private Envelope limitEnv = null;
+ private List nearVerts = new ArrayList();
+
+ public StretchedVertexFinder(Collection linestrings, double tolerance)
+ {
+ this.linestrings = linestrings;
+ this.tolerance = tolerance;
+ }
+
+ public StretchedVertexFinder(Collection linestrings, double tolerance, Envelope limitEnv)
+ {
+ this(linestrings, tolerance);
+ this.limitEnv = limitEnv;
+ }
+
+ public List getNearVertices()
+ {
+ findNearVertices();
+ return nearVerts;
+ }
+
+ private void findNearVertices()
+ {
+ for (Iterator i = linestrings.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ findNearVertices(line);
+ }
+
+ }
+
+ private static int geomPointsLen(Coordinate[] pts)
+ {
+ int n = pts.length;
+ // don't process the last point of a ring twice
+ if (CoordinateArrays.isRing(pts))
+ n = pts.length - 1;
+ return n;
+ }
+
+ private void findNearVertices(LineString targetLine)
+ {
+ Coordinate[] pts = targetLine.getCoordinates();
+ // don't process the last point of a ring twice
+ int n = geomPointsLen(pts);
+ for (int i = 0; i < n; i++) {
+ if (limitEnv.intersects(pts[i]))
+ findNearVertex(pts, i);
+ }
+ }
+
+ private void findNearVertex(Coordinate[] linePts, int index)
+ {
+ for (Iterator i = linestrings.iterator(); i.hasNext(); ) {
+ LineString testLine = (LineString) i.next();
+ findNearVertex(linePts, index, testLine);
+ }
+ }
+
+ /**
+ * Finds a single near vertex.
+ * This is simply the first one found, not necessarily
+ * the nearest.
+ * This choice may sub-optimal, resulting
+ * in odd result geometry.
+ * It's not clear that this can be done better, however.
+ * If there are several near points, the stretched
+ * geometry is likely to be distorted anyway.
+ *
+ * @param targetPts
+ * @param index
+ * @param testLine
+ */
+ private void findNearVertex(Coordinate[] targetPts, int index, LineString testLine)
+ {
+ Coordinate targetPt = targetPts[index];
+ Coordinate[] testPts = testLine.getCoordinates();
+ // don't process the last point of a ring twice
+ int n = geomPointsLen(testPts);
+ for (int i = 0; i < n; i++) {
+ Coordinate testPt = testPts[i];
+
+ StretchedVertex stretchVert = null;
+
+ // is near to vertex?
+ double dist = testPt.distance(targetPt);
+ if (dist <= tolerance && dist != 0.0) {
+ stretchVert = new StretchedVertex(targetPt, targetPts, index, testPt, testPts, i);
+ }
+ // is near segment?
+ else if (i < testPts.length - 1) {
+ Coordinate segEndPt = testPts[i + 1];
+
+ /**
+ * Check whether pt is near or equal to other segment endpoint.
+ * If near, it will be handled by the near vertex case code.
+ * If equal, don't record it at all
+ */
+ double distToOther = segEndPt.distance(targetPt);
+ if (distToOther <= tolerance)
+ // will be handled as a point-vertex case
+ continue;
+
+ // Here we know point is not near the segment endpoints.
+ // Check if it is near the segment at all.
+ if (isPointNearButNotOnSeg(targetPt, testPt, segEndPt, tolerance)) {
+ stretchVert = new StretchedVertex(targetPt, targetPts, i, new LineSegment(testPt, testPts[i + 1]));
+ }
+ }
+ if (stretchVert != null)
+ nearVerts.add(stretchVert);
+ }
+ }
+
+ private static boolean contains(Envelope env, Coordinate p0, Coordinate p1)
+ {
+ if (! env.contains(p0)) return false;
+ if (! env.contains(p1)) return false;
+ return true;
+ }
+
+ private static boolean isPointNearButNotOnSeg(Coordinate p, Coordinate p0, Coordinate p1, double distTol)
+ {
+ // don't rely on segment distance algorithm to correctly compute zero distance
+ // on segment
+ if (Orientation.index(p0, p1, p) == Orientation.COLLINEAR)
+ return false;
+
+ // compute actual distance
+ distSeg.p0 = p0;
+ distSeg.p1 = p1;
+ double segDist = distSeg.distance(p);
+ if (segDist > distTol)
+ return false;
+ return true;
+ }
+
+ private static LineSegment distSeg = new LineSegment();
+
+ private static double distanceToSeg(Coordinate p, Coordinate p0, Coordinate p1)
+ {
+ distSeg.p0 = p0;
+ distSeg.p1 = p1;
+ double segDist = distSeg.distance(p);
+
+ // robust calculation of zero distance
+ if (Orientation.index(p0, p1, p) == Orientation.COLLINEAR)
+ segDist = 0.0;
+
+ return segDist;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/TopologyStretcher.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/TopologyStretcher.java
new file mode 100644
index 0000000..7d3863d
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/TopologyStretcher.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.topostretch;
+
+import java.util.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.util.*;
+
+/**
+ * Stretches the vertices and segments of a @link Geometry}
+ * to make the topology more visible.
+ *
+ * @author Martin Davis
+ *
+ */
+public class TopologyStretcher
+{
+ private double stretchDistance = 0.1;
+
+ private Geometry[] inputGeoms;
+ private List linestrings;
+ private List[] modifiedCoords;
+
+ public TopologyStretcher(Geometry g)
+ {
+ inputGeoms = new Geometry[1];
+ inputGeoms[0] = g;
+ }
+
+ public TopologyStretcher(Geometry g1, Geometry g2)
+ {
+ inputGeoms = new Geometry[2];
+ inputGeoms[0] = g1;
+ inputGeoms[1] = g2;
+ }
+
+ public int numVerticesInMask(Envelope mask)
+ {
+ VertexInMaskCountCoordinateFilter filter = new VertexInMaskCountCoordinateFilter(mask);
+ if (inputGeoms[0] != null) inputGeoms[0].apply(filter);
+ if (inputGeoms[1] != null) inputGeoms[1].apply(filter);
+ return filter.getCount();
+ }
+
+ public Geometry[] stretch(double nearnessTol, double stretchDistance)
+ {
+ return stretch(nearnessTol, stretchDistance, null);
+ }
+
+ public Geometry[] stretch(double nearnessTol, double stretchDistance, Envelope mask)
+ {
+ this.stretchDistance = stretchDistance;
+ linestrings = extractLineStrings(inputGeoms, mask);
+
+ List nearVerts = StretchedVertexFinder.findNear(linestrings, nearnessTol, mask);
+
+ Map coordinateMoves = getCoordinateMoves(nearVerts);
+
+ Geometry[] strGeoms = new Geometry[inputGeoms.length];
+ modifiedCoords = new List[inputGeoms.length];
+
+ for (int i = 0; i < inputGeoms.length; i++) {
+ Geometry geom = (Geometry) inputGeoms[i];
+ if (geom != null) {
+ GeometryVerticesMover mover = new GeometryVerticesMover(geom, coordinateMoves);
+ Geometry stretchedGeom = mover.move();
+ strGeoms[i] = stretchedGeom;
+ modifiedCoords[i] = mover.getModifiedCoordinates();
+ }
+ }
+ return strGeoms;
+ }
+
+ /**
+ * Gets the {@link Coordinate}s in each stretched geometry which were modified (if any).
+ *
+ * @return lists of Coordinates, one for each input geometry
+ */
+ public List[] getModifiedCoordinates()
+ {
+ return modifiedCoords;
+ }
+
+ private List extractLineStrings(Geometry[] geom, Envelope mask)
+ {
+ List lines = new ArrayList();
+ LinearComponentExtracter lineExtracter = new LinearComponentExtracter(lines);
+ for (int i = 0; i < geom.length; i++ ) {
+ if (geom[i] == null) continue;
+
+ if (mask != null && ! mask.intersects(geom[i].getEnvelopeInternal()))
+ continue;
+
+ geom[i].apply(lineExtracter);
+ }
+ if (mask != null) {
+ List masked = new ArrayList();
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ if (mask.intersects(line.getEnvelopeInternal()))
+ masked.add(line);
+ }
+ return masked;
+ }
+ return lines;
+ }
+
+ private Map getCoordinateMoves(List nearVerts)
+ {
+ Map moves = new TreeMap();
+ for (Iterator i = nearVerts.iterator(); i.hasNext(); ) {
+ StretchedVertex nv = (StretchedVertex) i.next();
+ // TODO: check if move would invalidate topology. If yes, don't move
+ Coordinate src = nv.getVertexCoordinate();
+ Coordinate moved = nv.getStretchedVertex(stretchDistance);
+ if (! moved.equals2D(src))
+ moves.put(src, moved);
+ }
+ return moves;
+ }
+
+ private static class VertexInMaskCountCoordinateFilter
+ implements CoordinateFilter
+ {
+ private Envelope mask;
+ private int count = 0;
+
+ public VertexInMaskCountCoordinateFilter(Envelope mask)
+ {
+ this.mask = mask;
+ }
+
+ public void filter(Coordinate coord)
+ {
+ if (mask.contains(coord))
+ count++;
+ }
+
+ public int getCount() { return count; }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ClipImage.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ClipImage.java
new file mode 100644
index 0000000..c9df7a9
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ClipImage.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import java.awt.*;
+import java.awt.datatransfer.*;
+
+public class ClipImage implements Transferable, ClipboardOwner {
+
+ private byte[] image;
+
+ public ClipImage(byte[] im)
+ {
+ image = im;
+ }
+
+ public DataFlavor[] getTransferDataFlavors()
+ {
+ return new DataFlavor[] { DataFlavor.imageFlavor };
+ }
+
+ public boolean isDataFlavorSupported(DataFlavor flavor)
+ {
+ return DataFlavor.imageFlavor.equals(flavor);
+ }
+
+ public Object getTransferData(DataFlavor flavor) throws
+ UnsupportedFlavorException
+ {
+ if (!isDataFlavorSupported(flavor))
+ throw new UnsupportedFlavorException(flavor);
+ return Toolkit.getDefaultToolkit().createImage(image);
+ }
+
+ public void lostOwnership(java.awt.datatransfer.Clipboard clip,
+ java.awt.datatransfer.Transferable tr)
+
+ {
+ return;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ColorUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ColorUtil.java
new file mode 100644
index 0000000..e7c6449
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ColorUtil.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import java.awt.Color;
+
+import org.locationtech.jts.math.MathUtil;
+
+
+public class ColorUtil {
+
+ public static Color gray(int grayVal)
+ {
+ return new Color(grayVal, grayVal, grayVal);
+ }
+
+ public static Color opaque(Color clr)
+ {
+ return new Color(clr.getRed(), clr.getGreen(), clr.getBlue());
+ }
+
+ public static Color lighter(Color clr)
+ {
+ return lighter(clr, 0.4);
+ }
+
+ public static Color lighter(Color clr, double saturationFraction)
+ {
+ float[] hsb = new float[3];
+ Color.RGBtoHSB(clr.getRed(), clr.getGreen(), clr.getBlue(), hsb);
+ hsb[1] = (float) MathUtil.clamp(hsb[1] * saturationFraction, 0, 1);
+ Color chsb = Color.getHSBColor(hsb[0], hsb[1], hsb[2]);
+ return new Color(chsb.getRed(), chsb.getGreen(), chsb.getBlue(), clr.getAlpha());
+ }
+
+ public static Color saturate(Color clr, double saturation)
+ {
+ float[] hsb = new float[3];
+ Color.RGBtoHSB(clr.getRed(), clr.getGreen(), clr.getBlue(), hsb);
+ hsb[1] = (float) MathUtil.clamp(saturation, 0, 1);;
+ return Color.getHSBColor(hsb[0], hsb[1], hsb[2]);
+ }
+
+ public static float getHue(Color clr) {
+ float[] hsb = Color.RGBtoHSB(clr.getRed(), clr.getGreen(), clr.getBlue(), null);
+ return hsb[0];
+ }
+
+ public static Color setAlpha(Color clr, int alpha) {
+ return new Color(clr.getRed(), clr.getGreen(), clr.getBlue(), alpha);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/GeometryLocationsWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/GeometryLocationsWriter.java
new file mode 100644
index 0000000..115df9a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/GeometryLocationsWriter.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import java.awt.geom.*;
+import java.util.*;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.geom.*;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+public class GeometryLocationsWriter
+{
+ public static String writeLocation(LayerList layers,
+ Coordinate pt, double tolerance)
+ {
+ GeometryLocationsWriter writer = new GeometryLocationsWriter();
+ return writer.writeLocationString(layers, pt, tolerance);
+ }
+
+ private static final int MAX_ITEMS_TO_DISPLAY = 10;
+
+ private boolean isHtmlFormatted = true;
+ private String eol = null;
+ private String highlightStart = null;
+ private String highlightEnd = null;
+ private String documentStart = null;
+ private String documentEnd = null;
+
+ public GeometryLocationsWriter() {
+ setHtml(true);
+ }
+
+ public void setHtml(boolean isHtmlFormatted)
+ {
+ this.isHtmlFormatted = isHtmlFormatted;
+ if (isHtmlFormatted) {
+ eol = "<br>";
+ highlightStart = "<b>";
+ highlightEnd = "</b>";
+ documentStart = "<html>";
+ documentEnd = "</html>";
+ }
+ else {
+ eol = "\n";
+ highlightStart = "";
+ highlightEnd = "";
+ documentStart = "";
+ documentEnd = "";
+ }
+ }
+
+ public String writeLocationString(LayerList layers,
+ Coordinate pt, double tolerance)
+ {
+ StringBuffer text = new StringBuffer();
+ for (int i = 0; i < layers.size(); i++) {
+
+ Layer lyr = layers.getLayer(i);
+ String locStr = writeLocation(lyr, pt, tolerance);
+ if (locStr == null) continue;
+
+ if (i > 0 && text.length() > 0) {
+ text.append(eol);
+ text.append(eol);
+ }
+
+ text.append(highlightStart + lyr.getName() + highlightEnd + eol);
+ text.append(locStr);
+ }
+
+ if (text.length() > 0) {
+ return documentStart + text.toString() +documentEnd;
+ }
+ return null;
+ }
+
+ public String writeSingleLocation(Layer lyr, Coordinate p, double tolerance)
+ {
+ Geometry geom = lyr.getGeometry();
+ if (geom == null) return null;
+
+ VertexLocater locater = new VertexLocater(geom);
+ Coordinate coord = locater.getVertex(p, tolerance);
+ int index = locater.getIndex();
+
+ if (coord == null) return null;
+ return "[" + index + "]: "
+ + coord.x + ", " + coord.y;
+ }
+
+ public String writeLocation(Layer lyr, Coordinate p, double tolerance)
+ {
+ Geometry geom = lyr.getGeometry();
+ if (geom == null) return null;
+
+ String locStr = writeComponentLocation(geom, p, tolerance);
+ String facetStr = writeFacetLocation(geom, p, tolerance);
+ if (facetStr == null)
+ return locStr;
+ return locStr + facetStr;
+ }
+
+
+ public String writeComponentLocation(Geometry geom, Coordinate p, double tolerance)
+ {
+ ComponentLocater locater = new ComponentLocater(geom);
+ List locs = locater.getComponents(p, tolerance);
+
+ StringBuffer buf = new StringBuffer();
+ int count = 0;
+ for (Iterator i = locs.iterator(); i.hasNext(); ) {
+
+ GeometryLocation loc = (GeometryLocation) i.next();
+ Geometry comp = loc.getComponent();
+
+ String path = loc.pathString();
+ path = path.length() == 0 ? "" : path;
+ buf.append("[" + path + "] ");
+
+ buf.append(comp.getGeometryType().toUpperCase());
+ if (comp instanceof GeometryCollection) {
+ buf.append("[" + comp.getNumGeometries() + "]");
+ }
+ else {
+ buf.append("(" + comp.getNumPoints() + ")");
+ }
+ if (comp.getUserData() != null) {
+ buf.append(" Data: ");
+ buf.append(comp.getUserData().toString());
+ }
+ buf.append(eol);
+
+ if (count++ > MAX_ITEMS_TO_DISPLAY) {
+ buf.append(" & more..." + eol);
+ break;
+ }
+ }
+ String locStr = buf.toString();
+ if (locStr.length() == 0)
+ return null;
+ return locStr;
+ }
+
+ public String writeFacetLocation(Geometry geom, Coordinate p, double tolerance)
+ {
+ FacetLocater locater = new FacetLocater(geom);
+ List locs = locater.getLocations(p, tolerance);
+ List vertexLocs = FacetLocater.filterVertexLocations(locs);
+
+ // only show vertices if some are present, to avoid confusing with segments
+ if (! vertexLocs.isEmpty())
+ return writeFacetLocations(vertexLocs);
+
+ // write 'em all
+ return writeFacetLocations(locs);
+ }
+
+ private String writeFacetLocations(List locs)
+ {
+ if (locs.size() <= 0) return null;
+
+ StringBuffer buf = new StringBuffer();
+ boolean isFirst = true;
+ int count = 0;
+ for (Iterator i = locs.iterator(); i.hasNext(); ) {
+ GeometryLocation loc = (GeometryLocation) i.next();
+
+ if (! isFirst) {
+ buf.append(eol);
+ }
+
+ isFirst = false;
+
+ buf.append(componentType(loc));
+ buf.append(loc.isVertex() ? "Vert" : "Seg");
+ buf.append(loc.toFacetString());
+ if (! loc.isVertex()) {
+ buf.append(" Len: " + loc.getLength());
+ }
+ if (count++ > MAX_ITEMS_TO_DISPLAY) {
+ buf.append(eol + " & more..." + eol);
+ break;
+ }
+ }
+ return buf.toString();
+ }
+
+ private String componentType(GeometryLocation loc) {
+ String compType = "";
+ if (loc.getComponent() instanceof LinearRing) {
+ boolean isCCW = Orientation.isCCW(loc.getComponent().getCoordinates());
+ compType = "Ring"
+ + (isCCW ? "-CCW" : "-CW ")
+ + " ";
+ }
+ else if (loc.getComponent() instanceof LineString) {
+ compType = "Line ";
+ }
+ else if (loc.getComponent() instanceof Point) {
+ compType = "Point ";
+ }
+ return compType;
+ }
+
+ public String OLDwriteLocation(Geometry geom, Coordinate p, double tolerance)
+ {
+ VertexLocater locater = new VertexLocater(geom);
+ List locs = locater.getLocations(p, tolerance);
+
+ if (locs.size() <= 0) return null;
+
+ StringBuffer buf = new StringBuffer();
+ boolean isFirst = true;
+ for (Iterator i = locs.iterator(); i.hasNext(); ) {
+ VertexLocater.Location vertLoc = (VertexLocater.Location) i.next();
+ int index = vertLoc.getIndices()[0];
+ Coordinate pt = vertLoc.getCoordinate();
+ if (! isFirst) {
+ buf.append(eol + "--");
+ }
+ isFirst = false;
+ String locStr = "[" + index + "]: "
+ + pt.x + ", " + pt.y;
+ buf.append(locStr);
+ }
+
+ return buf.toString();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/GraphicsUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/GraphicsUtil.java
new file mode 100644
index 0000000..8b767ad
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/GraphicsUtil.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import java.awt.Graphics2D;
+
+public class GraphicsUtil {
+
+ public static void drawStringAlignCenter(Graphics2D g2d, String s, int x, int y) {
+ int stringLen = (int) g2d.getFontMetrics().getStringBounds(s, g2d).getWidth();
+ g2d.drawString(s, x - stringLen /2, y);
+
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ImageUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ImageUtil.java
new file mode 100644
index 0000000..8902b02
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ImageUtil.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+public class ImageUtil
+{
+ public static String IMAGE_FORMAT_NAME_PNG = "png";
+
+ public static void saveImageToClipboard(Component comp, String formatName)
+ throws IOException
+ {
+ Image image = new BufferedImage(
+ comp.getSize().width,
+ comp.getSize().height,
+ BufferedImage.TYPE_4BYTE_ABGR);
+ comp.paint(image.getGraphics());
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ImageIO.write((RenderedImage) image, formatName, bos);
+
+ Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+ ClipImage ci = new ClipImage(bos.toByteArray());
+ clipboard.setContents(ci, null);
+ }
+
+
+ public static void writeImage(Component comp, String filename, String formatName)
+ throws IOException
+ {
+ Image image = new BufferedImage(
+ comp.getSize().width,
+ comp.getSize().height,
+ BufferedImage.TYPE_4BYTE_ABGR);
+ comp.paint(image.getGraphics());
+
+ ImageIO.write((RenderedImage) image, formatName,
+ new File(filename));
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/SwingUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/SwingUtil.java
new file mode 100644
index 0000000..6dbbccc
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/SwingUtil.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import java.awt.Component;
+import java.awt.Insets;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.util.Collection;
+import java.awt.datatransfer.*;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+import javax.swing.filechooser.FileFilter;
+import javax.swing.text.JTextComponent;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.model.GeometryTransferable;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+public class SwingUtil {
+
+ public static FileFilter XML_FILE_FILTER = createFileFilter("JTS Test XML File (*.xml)", ".xml");
+ public static FileFilter JAVA_FILE_FILTER = createFileFilter("Java File (*.java)", ".java");
+ public static FileFilter PNG_FILE_FILTER = createFileFilter("PNG File (*.png)", ".png");
+
+ /**
+ *
+ * Example usage:
+ * <pre>
+ * SwingUtil.createFileFilter("JEQL script (*.jql)", "jql")
+ * </pre>
+ * @param description
+ * @param extension
+ * @return the file filter
+ */
+ public static FileFilter createFileFilter(final String description, String extension)
+ {
+ final String dotExt = extension.startsWith(".") ? extension : "." + extension;
+ FileFilter ff = new FileFilter() {
+ public String getDescription() {
+ return description;
+ }
+ public boolean accept(File f) {
+ return f.isDirectory() || f.toString().toLowerCase().endsWith(dotExt);
+ }
+ };
+ return ff;
+ }
+
+ /**
+ *
+ * @param comp
+ * @param fileChooser
+ * @return filename chosen, or
+ * null if choose was cancelled for some reason
+ */
+ public static String chooseFilenameWithConfirm(Component comp, JFileChooser fileChooser) {
+ try {
+ if (JFileChooser.APPROVE_OPTION == fileChooser.showSaveDialog(comp)) {
+ File file = fileChooser.getSelectedFile();
+ if (! SwingUtil.confirmOverwrite(comp, file)) return null;
+ String fullFileName = fileChooser.getSelectedFile().toString();
+ return fullFileName;
+ }
+ }
+ catch (Exception x) {
+ SwingUtil.reportException(comp, x);
+ }
+ return null;
+ }
+
+
+ public static boolean confirmOverwrite(Component comp, File file)
+ {
+ if (file.exists()) {
+ int decision = JOptionPane.showConfirmDialog(comp, file.getName()
+ + " exists. Overwrite?", "Confirmation", JOptionPane.YES_NO_OPTION,
+ JOptionPane.WARNING_MESSAGE);
+ if (decision == JOptionPane.NO_OPTION) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public static void setEnabledWithBackground(Component comp, boolean isEnabled)
+ {
+ comp.setEnabled(isEnabled);
+ if (isEnabled)
+ comp.setBackground(SystemColor.text);
+ else
+ comp.setBackground(SystemColor.control);
+ }
+
+ public static Object coerce(Object val, Class clz) {
+ if (val == null) return val;
+ if (val.getClass() == clz) return val;
+ if (val instanceof String && (clz == Double.class || clz == double.class))
+ return convertDouble((String) val);
+ if (val instanceof String && (clz == Integer.class || clz == int.class))
+ return convertInteger((String) val);
+ return val;
+ }
+
+ public static Integer convertInteger(String str) {
+ int val = 0;
+ try {
+ val = Integer.parseInt(str);
+ } catch (NumberFormatException ex) {
+ }
+ return new Integer(val);
+ }
+
+ public static Double convertDouble(String str) {
+ double val = 0;
+ try {
+ val = Double.parseDouble(str);
+ } catch (NumberFormatException ex) {
+ }
+ return new Double(val);
+ }
+
+ public static Integer getInteger(JTextField txt, Integer defaultVal) {
+ String str = txt.getText();
+ if (str.trim().length() <= 0)
+ return defaultVal;
+
+ int val = 0;
+ try {
+ val = Integer.parseInt(str);
+ } catch (NumberFormatException ex) {
+ }
+ return new Integer(val);
+ }
+
+ public static Double getDouble(JTextField txt, Double defaultVal) {
+ String str = txt.getText();
+ if (str.trim().length() <= 0)
+ return defaultVal;
+
+ double val = 0;
+ try {
+ val = Double.parseDouble(str);
+ } catch (NumberFormatException ex) {
+ }
+ return new Double(val);
+ }
+
+ public static String value(JTextComponent txt) {
+ return txt.getText();
+ }
+
+ public static Object value(JComboBox cb, Object[] val)
+ {
+ int selIndex = cb.getSelectedIndex();
+ if (selIndex == -1)
+ return null;
+ return val[selIndex];
+ }
+
+ public static void copyToClipboard(Object o, boolean isFormatted)
+ {
+ if (o instanceof Geometry) {
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+ new GeometryTransferable((Geometry) o, isFormatted), null);
+ }
+ else
+ // transfer as string
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+ new StringSelection(o.toString()), null);
+ }
+
+ public static Object getFromClipboard() {
+ Transferable transferable = getContents(Toolkit.getDefaultToolkit()
+ .getSystemClipboard());
+
+ try {
+ if (transferable.isDataFlavorSupported(GeometryTransferable.GEOMETRY_FLAVOR)) {
+ return transferable.getTransferData(GeometryTransferable.GEOMETRY_FLAVOR);
+ }
+ // attempt to read as string
+ return transferable.getTransferData(DataFlavor.stringFlavor);
+ }
+ catch (Exception ex) {
+ // eat exception, since there isn't anything we can do
+ }
+ return null;
+ }
+
+ public static Transferable getContents(Clipboard clipboard) {
+ try {
+ return clipboard.getContents(null);
+ } catch (Throwable t) {
+ return null;
+ }
+ }
+
+ public static void reportException(Component c, Exception e) {
+ JOptionPane.showMessageDialog(c, StringUtil.wrap(e.toString(), 80), "Exception",
+ JOptionPane.ERROR_MESSAGE);
+ e.printStackTrace(System.out);
+ }
+
+ public static JButton createButton(ImageIcon icon, String tip, ActionListener action ) {
+ JButton btn = new JButton();
+ btn.setToolTipText(tip);
+ btn.setIcon(icon);
+ btn.setMargin(new Insets(0, 0, 0, 0));
+ if (action != null) btn.addActionListener(action);
+ return btn;
+ }
+
+ public static JButton createButton(String title, String tip, ActionListener action ) {
+ JButton btn = new JButton();
+ btn.setText(title);
+ if (tip != null) btn.setToolTipText(tip);
+ //btn.setMargin(new Insets(0, 0, 0, 0));
+ if (action != null) btn.addActionListener(action);
+ return btn;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/SwingWorker.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/SwingWorker.java
new file mode 100644
index 0000000..409bfbd
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/SwingWorker.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import javax.swing.SwingUtilities;
+
+/**
+ * This is the 3rd version of SwingWorker (also known as
+ * SwingWorker 3), an abstract class that you subclass to
+ * perform GUI-related work in a dedicated thread. For
+ * instructions on using this class, see:
+ *
+ * http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html
+ *
+ * Note that the API changed slightly in the 3rd version:
+ * You must now invoke start() on the SwingWorker after
+ * creating it.
+ */
+public abstract class SwingWorker {
+ private Object value; // see getValue(), setValue()
+
+ /**
+ * Class to maintain reference to current worker thread
+ * under separate synchronization control.
+ */
+ private static class ThreadVar {
+ private Thread thread;
+ ThreadVar(Thread t) { thread = t; }
+ synchronized Thread get() { return thread; }
+ synchronized void clear() { thread = null; }
+ }
+
+ private ThreadVar threadVar;
+
+ /**
+ * Get the value produced by the worker thread, or null if it
+ * hasn't been constructed yet.
+ */
+ protected synchronized Object getValue() {
+ return value;
+ }
+
+ /**
+ * Set the value produced by worker thread
+ */
+ private synchronized void setValue(Object x) {
+ value = x;
+ }
+
+ /**
+ * Compute the value to be returned by the <code>get</code> method.
+ */
+ public abstract Object construct();
+
+ /**
+ * Called on the event dispatching thread (not on the worker thread)
+ * after the <code>construct</code> method has returned.
+ */
+ public void finished() {
+ }
+
+ /**
+ * A new method that interrupts the worker thread. Call this method
+ * to force the worker to stop what it's doing.
+ */
+ public void interrupt() {
+ Thread t = threadVar.get();
+ if (t != null) {
+ System.out.println("Interrupted!");
+ t.interrupt();
+ }
+ threadVar.clear();
+ }
+
+ /**
+ * Return the value created by the <code>construct</code> method.
+ * Returns null if either the constructing thread or the current
+ * thread was interrupted before a value was produced.
+ *
+ * @return the value created by the <code>construct</code> method
+ */
+ public Object get() {
+ while (true) {
+ Thread t = threadVar.get();
+ if (t == null) {
+ return getValue();
+ }
+ try {
+ t.join();
+ }
+ catch (InterruptedException e) {
+ Thread.currentThread().interrupt(); // propagate
+ return null;
+ }
+ }
+ }
+
+
+ /**
+ * Start a thread that will call the <code>construct</code> method
+ * and then exit.
+ */
+ public SwingWorker() {
+ final Runnable doFinished = new Runnable() {
+ public void run() { finished(); }
+ };
+
+ Runnable doConstruct = new Runnable() {
+ public void run() {
+ try {
+ setValue(construct());
+ }
+ finally {
+ threadVar.clear();
+ }
+
+ SwingUtilities.invokeLater(doFinished);
+ }
+ };
+
+ Thread t = new Thread(doConstruct);
+ threadVar = new ThreadVar(t);
+ }
+
+ /**
+ * Start the worker thread.
+ */
+ public void start() {
+ Thread t = threadVar.get();
+ if (t != null) {
+ t.start();
+ }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/Viewport.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/Viewport.java
new file mode 100644
index 0000000..e1c1b84
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/Viewport.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui;
+
+import java.awt.*;
+import java.awt.geom.*;
+import java.text.NumberFormat;
+
+import org.locationtech.jts.awt.PointTransformation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.math.MathUtil;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+
+
+/**
+ * Maintains the information associated with mapping
+ * the model view to the screen
+ *
+ * @author Martin Davis
+ *
+ */
+public class Viewport implements PointTransformation
+{
+ private static double INITIAL_SCALE = 1.0;
+ private static int INITIAL_ORIGIN_X = -10;
+ private static int INITIAL_ORIGIN_Y = -10;
+
+ private GeometryEditPanel panel;
+
+ /**
+ * Origin of view in model space
+ */
+ private Point2D originInModel =
+ new Point2D.Double(INITIAL_ORIGIN_X, INITIAL_ORIGIN_Y);
+
+ /**
+ * The scale is the factor which model distance
+ * is multiplied by to get view distance
+ */
+ private double scale = 1;
+ private PrecisionModel scalePM = new PrecisionModel(scale);
+ private NumberFormat scaleFormat;
+
+ private Envelope viewEnvInModel;
+ private AffineTransform modelToViewTransform;
+ private java.awt.geom.Point2D.Double srcPt = new java.awt.geom.Point2D.Double(0, 0);
+ private java.awt.geom.Point2D.Double destPt = new java.awt.geom.Point2D.Double(0, 0);
+
+ private Dimension viewSize;
+
+ public Viewport(GeometryEditPanel panel) {
+ this.panel = panel;
+ setScaleNoUpdate(1.0);
+ }
+
+ private void viewUpdated()
+ {
+ panel.forceRepaint();
+ }
+
+ public Envelope getModelEnv()
+ {
+ return viewEnvInModel;
+ }
+
+ public Envelope getViewEnv() {
+ return new Envelope(
+ 0,
+ getWidthInView(),
+ 0,
+ getHeightInView());
+ }
+
+ public double getScale() {
+ return scale;
+ }
+
+ private void setScaleNoUpdate(double scale) {
+ this.scale = snapScale(scale);
+ scalePM = new PrecisionModel(this.scale);
+
+ scaleFormat = NumberFormat.getInstance();
+ int fracDigits = (int) (MathUtil.log10(this.scale));
+ if (fracDigits < 0) fracDigits = 0;
+ //System.out.println("scale = " + this.scale);
+ //System.out.println("fracdigits = " + fracDigits);
+ scaleFormat.setMaximumFractionDigits(fracDigits);
+ // don't show commas
+ scaleFormat.setGroupingUsed(false);
+ }
+
+ private void setScale(double scale) {
+ setScaleNoUpdate(scale);
+ update();
+ }
+
+ private void setOrigin(double viewOriginX, double viewOriginY) {
+ this.originInModel = new Point2D.Double(viewOriginX, viewOriginY);
+ update();
+ }
+
+ public NumberFormat getScaleFormat()
+ {
+ return scaleFormat;
+ }
+
+ private static final double ROUND_ERROR_REMOVAL = 0.00000001;
+
+ /**
+ * Snaps scale to nearest multiple of 2, 5 or 10.
+ * This ensures that model coordinates entered
+ * via the geometry view
+ * don't carry more precision than the zoom level warrants.
+ *
+ * @param scaleRaw
+ * @return
+ */
+ private static double snapScale(double scaleRaw)
+ {
+ double scale = snapScaleToSingleDigitPrecision(scaleRaw);
+ return scale;
+ }
+
+ private static double snapScaleToSingleDigitPrecision(double scaleRaw)
+ {
+ // if the rounding error is not nudged, snapping can "stick" at some values
+ double pow10 = Math.floor(MathUtil.log10(scaleRaw) + ROUND_ERROR_REMOVAL);
+ double nearestLowerPow10 = Math.pow(10, pow10);
+
+ int scaleDigit = (int) (scaleRaw / nearestLowerPow10);
+ double scale = scaleDigit * nearestLowerPow10;
+
+ //System.out.println("requested scale = " + scaleRaw + " scale = " + scale + " Pow10 = " + pow10);
+ return scale;
+ }
+
+ /**
+ * Not used - scaling to multiples of 10,5,2 is too coarse.
+ *
+ *
+ * @param scaleRaw
+ * @return
+ */
+ private static double snapScaleTo_10_2_5(double scaleRaw)
+ {
+ // if the rounding error is not nudged, snapping can "stick" at some values
+ double pow10 = Math.floor(MathUtil.log10(scaleRaw) + ROUND_ERROR_REMOVAL);
+ double scaleRoundedToPow10 = Math.pow(10, pow10);
+
+ double scale = scaleRoundedToPow10;
+ // rounding to a power of 10 is too coarse, so allow some finer gradations
+ //*
+ if (3.5 * scaleRoundedToPow10 <= scaleRaw)
+ scale = 5 * scaleRoundedToPow10;
+ else if (2 * scaleRoundedToPow10 <= scaleRaw)
+ scale = 2 * scaleRoundedToPow10;
+ //*/
+
+ //System.out.println("requested scale = " + scaleRaw + " scale = " + scale + " Pow10 = " + pow10);
+ return scale;
+ }
+
+ public boolean intersectsInModel(Envelope env)
+ {
+ return viewEnvInModel.intersects(env);
+ }
+
+ public Point2D toModel(Point2D viewPt) {
+ srcPt.x = viewPt.getX();
+ srcPt.y = viewPt.getY();
+ try {
+ getModelToViewTransform().inverseTransform(srcPt, destPt);
+ } catch (NoninvertibleTransformException ex) {
+ return new Point2D.Double(0, 0);
+ //Assert.shouldNeverReachHere();
+ }
+
+ // snap to scale grid
+ double x = scalePM.makePrecise(destPt.x);
+ double y = scalePM.makePrecise(destPt.y);
+
+ return new Point2D.Double(x, y);
+ }
+
+ public Coordinate toModelCoordinate(Point2D viewPt) {
+ Point2D p = toModel(viewPt);
+ return new Coordinate(p.getX(), p.getY());
+ }
+
+ public void transform(Coordinate modelCoordinate, Point2D point)
+ {
+ point.setLocation(modelCoordinate.x, modelCoordinate.y);
+ getModelToViewTransform().transform(point, point);
+ }
+
+ public Point2D toView(Coordinate modelCoordinate)
+ {
+ Point2D.Double pt = new Point2D.Double();
+ transform(modelCoordinate, pt);
+ return pt;
+ }
+
+ public Point2D toView(Point2D modelPt)
+ {
+ return toView(modelPt, new Point2D.Double());
+ }
+
+ public Point2D toView(Point2D modelPt, Point2D viewPt)
+ {
+ return getModelToViewTransform().transform(modelPt, viewPt);
+ }
+
+ /**
+ * Converts a distance in the view to a distance in the model.
+ *
+ * @param viewDist
+ * @return the model distance
+ */
+ public double toModel(double viewDist)
+ {
+ return viewDist / scale;
+ }
+
+ /**
+ * Converts a distance in the model to a distance in the view.
+ *
+ * @param modelDist
+ * @return the view distance
+ */
+ public double toView(double modelDist)
+ {
+ return modelDist * scale;
+ }
+
+ public void update(Dimension viewSize)
+ {
+ this.viewSize = viewSize;
+ update();
+ }
+
+ private void update()
+ {
+ updateModelToViewTransform();
+ viewEnvInModel = computeEnvelopeInModel();
+ viewUpdated();
+ }
+
+ private void updateModelToViewTransform() {
+ modelToViewTransform = new AffineTransform();
+ modelToViewTransform.translate(0, viewSize.height);
+ modelToViewTransform.scale(1, -1);
+ modelToViewTransform.scale(scale, scale);
+ modelToViewTransform.translate(-originInModel.getX(), -originInModel.getY());
+ }
+
+ public AffineTransform getModelToViewTransform() {
+ if (modelToViewTransform == null) {
+ updateModelToViewTransform();
+ }
+ return modelToViewTransform;
+ }
+
+ public void zoomToInitialExtent() {
+ setScale(INITIAL_SCALE);
+ setOrigin(INITIAL_ORIGIN_X, INITIAL_ORIGIN_Y);
+ }
+
+ public void zoom(Envelope zoomEnv) {
+ double xScale = getWidthInView() / zoomEnv.getWidth();
+ double yScale = getHeightInView() / zoomEnv.getHeight();
+ double zoomScale = Math.min(xScale, yScale);
+ setScale(zoomScale);
+ double xCentering = (getWidthInModel() - zoomEnv.getWidth()) / 2d;
+ double yCentering = (getHeightInModel() - zoomEnv.getHeight()) / 2d;
+ setOrigin(zoomEnv.getMinX() - xCentering, zoomEnv.getMinY() - yCentering);
+ }
+
+ public void zoomPan(double dx, double dy) {
+ setOrigin(originInModel.getX() - dx,
+ originInModel.getY() - dy);
+ }
+
+ /**
+ * Zoom to a point, ensuring that the zoom point remains in the same screen location.
+ *
+ * @param zoomPt
+ * @param zoomFactor
+ */
+ public void zoom(Point2D zoomPt, double zoomScale) {
+ double originOffsetX = zoomPt.getX() - originInModel.getX();
+ double originOffsetY = zoomPt.getY() - originInModel.getY();
+
+ // set scale first, because it may be snapped
+ double scalePrev = getScale();
+ setScale(zoomScale);
+
+ double actualZoomFactor = getScale() / scalePrev;
+ double zoomOriginX = zoomPt.getX() - originOffsetX / actualZoomFactor;
+ double zoomOriginY = zoomPt.getY() - originOffsetY / actualZoomFactor;
+ setOrigin(zoomOriginX, zoomOriginY);
+ }
+
+ private double getWidthInModel() {
+ return toModel(viewSize.width);
+ }
+
+ private double getHeightInModel() {
+ return toModel(viewSize.height);
+ }
+
+ public Point2D getLowerLeftCornerInModel() {
+ return toModel(new Point(0, viewSize.height));
+ }
+
+ public double getHeightInView() {
+ return viewSize.height;
+ }
+
+ public double getWidthInView() {
+ return viewSize.width;
+ }
+
+ private Envelope computeEnvelopeInModel() {
+ return new Envelope(
+ originInModel.getX(),
+ originInModel.getX() + getWidthInModel(),
+ originInModel.getY(),
+ originInModel.getY() + getHeightInModel());
+ }
+
+ public boolean containsInModel(Coordinate p)
+ {
+ return viewEnvInModel.contains(p);
+ }
+
+ private static final int MIN_GRID_RESOLUTION_PIXELS = 2;
+
+ /**
+ * Gets the magnitude (power of 10)
+ * for the basic grid size.
+ *
+ * @return the magnitude
+ */
+ public int gridMagnitudeModel()
+ {
+ double pixelSizeModel = toModel(1);
+ double pixelSizeModelLog = MathUtil.log10(pixelSizeModel);
+ int gridMag = (int) Math.ceil(pixelSizeModelLog);
+
+ /**
+ * Check if grid size is too small and if so increase it one magnitude
+ */
+ double gridSizeModel = Math.pow(10, gridMag);
+ double gridSizeView = toView(gridSizeModel);
+// System.out.println("\ncand gridSizeView= " + gridSizeView);
+ if (gridSizeView <= MIN_GRID_RESOLUTION_PIXELS )
+ gridMag += 1;
+
+// System.out.println("pixelSize= " + pixelSize + " pixelLog10= " + pixelSizeLog);
+ return gridMag;
+ }
+
+ /**
+ * Gets a PrecisionModel corresponding to the grid size.
+ *
+ * @return the precision model
+ */
+ public PrecisionModel getGridPrecisionModel()
+ {
+ double gridSizeModel = getGridSizeModel();
+ return new PrecisionModel(1.0/gridSizeModel);
+ }
+
+ public double getGridSizeModel()
+ {
+ return Math.pow(10, gridMagnitudeModel());
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/dnd/FileDrop.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/dnd/FileDrop.java
new file mode 100644
index 0000000..8232f45
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/dnd/FileDrop.java
@@ -0,0 +1,605 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.dnd;
+
+/**
+ * This class makes it easy to drag and drop files from the operating
+ * system to a Java program. Any <tt>java.awt.Component</tt> can be
+ * dropped onto, but only <tt>javax.swing.JComponent</tt>s will indicate
+ * the drop event with a changed border.
+ * <p/>
+ * To use this class, construct a new <tt>FileDrop</tt> by passing
+ * it the target component and a <tt>Listener</tt> to receive notification
+ * when file(s) have been dropped. Here is an example:
+ * <p/>
+ * <code><pre>
+ * JPanel myPanel = new JPanel();
+ * new FileDrop( myPanel, new FileDrop.Listener()
+ * { public void filesDropped( java.io.File[] files )
+ * {
+ * // handle file drop
+ * ...
+ * } // end filesDropped
+ * }); // end FileDrop.Listener
+ * </pre></code>
+ * <p/>
+ * You can specify the border that will appear when files are being dragged by
+ * calling the constructor with a <tt>javax.swing.border.Border</tt>. Only
+ * <tt>JComponent</tt>s will show any indication with a border.
+ * <p/>
+ * You can turn on some debugging features by passing a <tt>PrintStream</tt>
+ * object (such as <tt>System.out</tt>) into the full constructor. A <tt>null</tt>
+ * value will result in no extra debugging information being output.
+ * <p/>
+ *
+ * <p>I'm releasing this code into the Public Domain. Enjoy.
+ * </p>
+ * <p><em>Original author: Robert Harder, rharder at usa.net</em></p>
+ *
+ * @author Robert Harder
+ * @author rharder at usa.net
+ * @version 1.0
+ */
+public class FileDrop
+{
+ private transient javax.swing.border.Border normalBorder;
+ private transient java.awt.dnd.DropTargetListener dropListener;
+
+
+ /** Discover if the running JVM is modern enough to have drag and drop. */
+ private static Boolean supportsDnD;
+
+ // Default border color
+ private static java.awt.Color defaultBorderColor = new java.awt.Color( 0f, 0f, 1f, 0.25f );
+
+ /**
+ * Constructs a {@link FileDrop} with a default light-blue border
+ * and, if <var>c</var> is a {@link java.awt.Container}, recursively
+ * sets all elements contained within as drop targets, though only
+ * the top level container will change borders.
+ *
+ * @param c Component on which files will be dropped.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.awt.Component c,
+ final Listener listener )
+ { this( null, // Logging stream
+ c, // Drop target
+ javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
+ true, // Recursive
+ listener );
+ } // end constructor
+
+
+
+
+ /**
+ * Constructor with a default border and the option to recursively set drop targets.
+ * If your component is a <tt>java.awt.Container</tt>, then each of its children
+ * components will also listen for drops, though only the parent will change borders.
+ *
+ * @param c Component on which files will be dropped.
+ * @param recursive Recursively set children as drop targets.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.awt.Component c,
+ final boolean recursive,
+ final Listener listener )
+ { this( null, // Logging stream
+ c, // Drop target
+ javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
+ recursive, // Recursive
+ listener );
+ } // end constructor
+
+
+ /**
+ * Constructor with a default border and debugging optionally turned on.
+ * With Debugging turned on, more status messages will be displayed to
+ * <tt>out</tt>. A common way to use this constructor is with
+ * <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
+ * the parameter <tt>out</tt> will result in no debugging output.
+ *
+ * @param out PrintStream to record debugging info or null for no debugging.
+ * @param c Component on which files will be dropped.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.io.PrintStream out,
+ final java.awt.Component c,
+ final Listener listener )
+ { this( out, // Logging stream
+ c, // Drop target
+ javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ),
+ false, // Recursive
+ listener );
+ } // end constructor
+
+
+
+ /**
+ * Constructor with a default border, debugging optionally turned on
+ * and the option to recursively set drop targets.
+ * If your component is a <tt>java.awt.Container</tt>, then each of its children
+ * components will also listen for drops, though only the parent will change borders.
+ * With Debugging turned on, more status messages will be displayed to
+ * <tt>out</tt>. A common way to use this constructor is with
+ * <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
+ * the parameter <tt>out</tt> will result in no debugging output.
+ *
+ * @param out PrintStream to record debugging info or null for no debugging.
+ * @param c Component on which files will be dropped.
+ * @param recursive Recursively set children as drop targets.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.io.PrintStream out,
+ final java.awt.Component c,
+ final boolean recursive,
+ final Listener listener)
+ { this( out, // Logging stream
+ c, // Drop target
+ javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
+ recursive, // Recursive
+ listener );
+ } // end constructor
+
+
+
+
+ /**
+ * Constructor with a specified border
+ *
+ * @param c Component on which files will be dropped.
+ * @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.awt.Component c,
+ final javax.swing.border.Border dragBorder,
+ final Listener listener)
+ { this(
+ null, // Logging stream
+ c, // Drop target
+ dragBorder, // Drag border
+ false, // Recursive
+ listener );
+ } // end constructor
+
+
+
+
+ /**
+ * Constructor with a specified border and the option to recursively set drop targets.
+ * If your component is a <tt>java.awt.Container</tt>, then each of its children
+ * components will also listen for drops, though only the parent will change borders.
+ *
+ * @param c Component on which files will be dropped.
+ * @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
+ * @param recursive Recursively set children as drop targets.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.awt.Component c,
+ final javax.swing.border.Border dragBorder,
+ final boolean recursive,
+ final Listener listener)
+ { this(
+ null,
+ c,
+ dragBorder,
+ recursive,
+ listener );
+ } // end constructor
+
+
+
+ /**
+ * Constructor with a specified border and debugging optionally turned on.
+ * With Debugging turned on, more status messages will be displayed to
+ * <tt>out</tt>. A common way to use this constructor is with
+ * <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
+ * the parameter <tt>out</tt> will result in no debugging output.
+ *
+ * @param out PrintStream to record debugging info or null for no debugging.
+ * @param c Component on which files will be dropped.
+ * @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.io.PrintStream out,
+ final java.awt.Component c,
+ final javax.swing.border.Border dragBorder,
+ final Listener listener)
+ { this(
+ out, // Logging stream
+ c, // Drop target
+ dragBorder, // Drag border
+ false, // Recursive
+ listener );
+ } // end constructor
+
+
+
+
+
+ /**
+ * Full constructor with a specified border and debugging optionally turned on.
+ * With Debugging turned on, more status messages will be displayed to
+ * <tt>out</tt>. A common way to use this constructor is with
+ * <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
+ * the parameter <tt>out</tt> will result in no debugging output.
+ *
+ * @param out PrintStream to record debugging info or null for no debugging.
+ * @param c Component on which files will be dropped.
+ * @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
+ * @param recursive Recursively set children as drop targets.
+ * @param listener Listens for <tt>filesDropped</tt>.
+ * @since 1.0
+ */
+ public FileDrop(
+ final java.io.PrintStream out,
+ final java.awt.Component c,
+ final javax.swing.border.Border dragBorder,
+ final boolean recursive,
+ final Listener listener)
+ {
+
+ if( supportsDnD() )
+ { // Make a drop listener
+ dropListener = new java.awt.dnd.DropTargetListener()
+ { public void dragEnter( java.awt.dnd.DropTargetDragEvent evt )
+ { log( out, "FileDrop: dragEnter event." );
+
+ // Is this an acceptable drag event?
+ if( isDragOk( out, evt ) )
+ {
+ // If it's a Swing component, set its border
+ if( c instanceof javax.swing.JComponent )
+ { javax.swing.JComponent jc = (javax.swing.JComponent) c;
+ normalBorder = jc.getBorder();
+ log( out, "FileDrop: normal border saved." );
+ jc.setBorder( dragBorder );
+ log( out, "FileDrop: drag border set." );
+ } // end if: JComponent
+
+ // Acknowledge that it's okay to enter
+ //evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY_OR_MOVE );
+ evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY );
+ log( out, "FileDrop: event accepted." );
+ } // end if: drag ok
+ else
+ { // Reject the drag event
+ evt.rejectDrag();
+ log( out, "FileDrop: event rejected." );
+ } // end else: drag not ok
+ } // end dragEnter
+
+ public void dragOver( java.awt.dnd.DropTargetDragEvent evt )
+ { // This is called continually as long as the mouse is
+ // over the drag target.
+ } // end dragOver
+
+ public void drop( java.awt.dnd.DropTargetDropEvent evt )
+ { log( out, "FileDrop: drop event." );
+ try
+ { // Get whatever was dropped
+ java.awt.datatransfer.Transferable tr = evt.getTransferable();
+
+ // Is it a file list?
+ if (tr.isDataFlavorSupported (java.awt.datatransfer.DataFlavor.javaFileListFlavor))
+ {
+ // Say we'll take it.
+ //evt.acceptDrop ( java.awt.dnd.DnDConstants.ACTION_COPY_OR_MOVE );
+ evt.acceptDrop ( java.awt.dnd.DnDConstants.ACTION_COPY );
+ log( out, "FileDrop: file list accepted." );
+
+ // Get a useful list
+ java.util.List fileList = (java.util.List)
+ tr.getTransferData(java.awt.datatransfer.DataFlavor.javaFileListFlavor);
+ java.util.Iterator iterator = fileList.iterator();
+
+ // Convert list to array
+ java.io.File[] filesTemp = new java.io.File[ fileList.size() ];
+ fileList.toArray( filesTemp );
+ final java.io.File[] files = filesTemp;
+
+ // Alert listener to drop.
+ if( listener != null )
+ listener.filesDropped( files );
+
+ // Mark that drop is completed.
+ evt.getDropTargetContext().dropComplete(true);
+ log( out, "FileDrop: drop complete." );
+ } // end if: file list
+ else
+ { log( out, "FileDrop: not a file list - abort." );
+ evt.rejectDrop();
+ } // end else: not a file list
+ } // end try
+ catch ( java.io.IOException io)
+ { log( out, "FileDrop: IOException - abort:" );
+ io.printStackTrace( out );
+ evt.rejectDrop();
+ } // end catch IOException
+ catch (java.awt.datatransfer.UnsupportedFlavorException ufe)
+ { log( out, "FileDrop: UnsupportedFlavorException - abort:" );
+ ufe.printStackTrace( out );
+ evt.rejectDrop();
+ } // end catch: UnsupportedFlavorException
+ finally
+ {
+ // If it's a Swing component, reset its border
+ if( c instanceof javax.swing.JComponent )
+ { javax.swing.JComponent jc = (javax.swing.JComponent) c;
+ jc.setBorder( normalBorder );
+ log( out, "FileDrop: normal border restored." );
+ } // end if: JComponent
+ } // end finally
+ } // end drop
+
+ public void dragExit( java.awt.dnd.DropTargetEvent evt )
+ { log( out, "FileDrop: dragExit event." );
+ // If it's a Swing component, reset its border
+ if( c instanceof javax.swing.JComponent )
+ { javax.swing.JComponent jc = (javax.swing.JComponent) c;
+ jc.setBorder( normalBorder );
+ log( out, "FileDrop: normal border restored." );
+ } // end if: JComponent
+ } // end dragExit
+
+ public void dropActionChanged( java.awt.dnd.DropTargetDragEvent evt )
+ { log( out, "FileDrop: dropActionChanged event." );
+ // Is this an acceptable drag event?
+ if( isDragOk( out, evt ) )
+ { //evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY_OR_MOVE );
+ evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY );
+ log( out, "FileDrop: event accepted." );
+ } // end if: drag ok
+ else
+ { evt.rejectDrag();
+ log( out, "FileDrop: event rejected." );
+ } // end else: drag not ok
+ } // end dropActionChanged
+ }; // end DropTargetListener
+
+ // Make the component (and possibly children) drop targets
+ makeDropTarget( out, c, recursive );
+ } // end if: supports dnd
+ else
+ { log( out, "FileDrop: Drag and drop is not supported with this JVM" );
+ } // end else: does not support DnD
+ } // end constructor
+
+
+ private static boolean supportsDnD()
+ { // Static Boolean
+ if( supportsDnD == null )
+ {
+ boolean support = false;
+ try
+ { Class arbitraryDndClass = Class.forName( "java.awt.dnd.DnDConstants" );
+ support = true;
+ } // end try
+ catch( Exception e )
+ { support = false;
+ } // end catch
+ supportsDnD = new Boolean( support );
+ } // end if: first time through
+ return supportsDnD.booleanValue();
+ } // end supportsDnD
+
+
+
+
+
+ private void makeDropTarget( final java.io.PrintStream out, final java.awt.Component c, boolean recursive )
+ {
+ // Make drop target
+ final java.awt.dnd.DropTarget dt = new java.awt.dnd.DropTarget();
+ try
+ { dt.addDropTargetListener( dropListener );
+ } // end try
+ catch( java.util.TooManyListenersException e )
+ { e.printStackTrace();
+ log(out, "FileDrop: Drop will not work due to previous error. Do you have another listener attached?" );
+ } // end catch
+
+ // Listen for hierarchy changes and remove the drop target when the parent gets cleared out.
+ c.addHierarchyListener( new java.awt.event.HierarchyListener()
+ { public void hierarchyChanged( java.awt.event.HierarchyEvent evt )
+ { log( out, "FileDrop: Hierarchy changed." );
+ java.awt.Component parent = c.getParent();
+ if( parent == null )
+ { c.setDropTarget( null );
+ log( out, "FileDrop: Drop target cleared from component." );
+ } // end if: null parent
+ else
+ { new java.awt.dnd.DropTarget(c, dropListener);
+ log( out, "FileDrop: Drop target added to component." );
+ } // end else: parent not null
+ } // end hierarchyChanged
+ }); // end hierarchy listener
+ if( c.getParent() != null )
+ new java.awt.dnd.DropTarget(c, dropListener);
+
+ if( recursive && (c instanceof java.awt.Container ) )
+ {
+ // Get the container
+ java.awt.Container cont = (java.awt.Container) c;
+
+ // Get it's components
+ java.awt.Component[] comps = cont.getComponents();
+
+ // Set it's components as listeners also
+ for( int i = 0; i < comps.length; i++ )
+ makeDropTarget( out, comps[i], recursive );
+ } // end if: recursively set components as listener
+ } // end dropListener
+
+
+
+ /** Determine if the dragged data is a file list. */
+ private boolean isDragOk( final java.io.PrintStream out, final java.awt.dnd.DropTargetDragEvent evt )
+ { boolean ok = false;
+
+ // Get data flavors being dragged
+ java.awt.datatransfer.DataFlavor[] flavors = evt.getCurrentDataFlavors();
+
+ // See if any of the flavors are a file list
+ int i = 0;
+ while( !ok && i < flavors.length )
+ { // Is the flavor a file list?
+ if( flavors[i].equals( java.awt.datatransfer.DataFlavor.javaFileListFlavor ) )
+ ok = true;
+ i++;
+ } // end while: through flavors
+
+ // If logging is enabled, show data flavors
+ if( out != null )
+ { if( flavors.length == 0 )
+ log( out, "FileDrop: no data flavors." );
+ for( i = 0; i < flavors.length; i++ )
+ log( out, flavors[i].toString() );
+ } // end if: logging enabled
+
+ return ok;
+ } // end isDragOk
+
+
+ /** Outputs <tt>message</tt> to <tt>out</tt> if it's not null. */
+ private static void log( java.io.PrintStream out, String message )
+ { // Log message if requested
+ if( out != null )
+ out.println( message );
+ } // end log
+
+
+
+
+ /**
+ * Removes the drag-and-drop hooks from the component and optionally
+ * from the all children. You should call this if you add and remove
+ * components after you've set up the drag-and-drop.
+ * This will recursively unregister all components contained within
+ * <var>c</var> if <var>c</var> is a {@link java.awt.Container}.
+ *
+ * @param c The component to unregister as a drop target
+ * @since 1.0
+ */
+ public static boolean remove( java.awt.Component c)
+ { return remove( null, c, true );
+ } // end remove
+
+
+
+ /**
+ * Removes the drag-and-drop hooks from the component and optionally
+ * from the all children. You should call this if you add and remove
+ * components after you've set up the drag-and-drop.
+ *
+ * @param out Optional {@link java.io.PrintStream} for logging drag and drop messages
+ * @param c The component to unregister
+ * @param recursive Recursively unregister components within a container
+ * @since 1.0
+ */
+ public static boolean remove( java.io.PrintStream out, java.awt.Component c, boolean recursive )
+ { // Make sure we support dnd.
+ if( supportsDnD() )
+ { log( out, "FileDrop: Removing drag-and-drop hooks." );
+ c.setDropTarget( null );
+ if( recursive && ( c instanceof java.awt.Container ) )
+ { java.awt.Component[] comps = ((java.awt.Container)c).getComponents();
+ for( int i = 0; i < comps.length; i++ )
+ remove( out, comps[i], recursive );
+ return true;
+ } // end if: recursive
+ else return false;
+ } // end if: supports DnD
+ else return false;
+ } // end remove
+
+
+
+
+
+
+ /** Runs a sample program that shows dropped files */
+ public static void main( String[] args )
+ {
+ javax.swing.JFrame frame = new javax.swing.JFrame( "FileDrop" );
+ //javax.swing.border.TitledBorder dragBorder = new javax.swing.border.TitledBorder( "Drop 'em" );
+ final javax.swing.JTextArea text = new javax.swing.JTextArea();
+ frame.getContentPane().add(
+ new javax.swing.JScrollPane( text ),
+ java.awt.BorderLayout.CENTER );
+
+ new FileDrop( System.out, text, /*dragBorder,*/ new FileDrop.Listener()
+ { public void filesDropped( java.io.File[] files )
+ { for( int i = 0; i < files.length; i++ )
+ { try
+ { text.append( files[i].getCanonicalPath() + "\n" );
+ } // end try
+ catch( java.io.IOException e ) {}
+ } // end for: through each dropped file
+ } // end filesDropped
+ }); // end FileDrop.Listener
+
+ frame.setBounds( 100, 100, 300, 400 );
+ frame.setDefaultCloseOperation( frame.EXIT_ON_CLOSE );
+ frame.show();
+ } // end main
+
+
+
+
+
+/* ******** I N N E R I N T E R F A C E L I S T E N E R ******** */
+
+
+ /**
+ * Implement this inner interface to listen for when files are dropped. For example
+ * your class declaration may begin like this:
+ * <code><pre>
+ * public class MyClass implements FileDrop.Listener
+ * ...
+ * public void filesDropped( java.io.File[] files )
+ * {
+ * ...
+ * } // end filesDropped
+ * ...
+ * </pre></code>
+ *
+ * @since 1.0
+ */
+ public interface Listener
+ {
+ /**
+ * This method is called when files have been successfully dropped.
+ *
+ * @param files An array of <tt>File</tt>s that were dropped.
+ * @since 1.0
+ */
+ public abstract void filesDropped( java.io.File[] files );
+ } // end inner-interface Listener
+
+} // end class FileDrop
\ No newline at end of file
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/GeometryPainter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/GeometryPainter.java
new file mode 100644
index 0000000..1e21ecc
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/GeometryPainter.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.render;
+
+//import java.awt.*;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.GeneralPath;
+
+import org.locationtech.jts.awt.PointShapeFactory;
+import org.locationtech.jts.awt.ShapeWriter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+import org.locationtech.jtstest.testbuilder.ui.style.Style;
+
+
+
+public class GeometryPainter
+{
+ private static Stroke GEOMETRY_STROKE = new BasicStroke();
+ private static Stroke POINT_STROKE = new BasicStroke(AppConstants.POINT_SIZE);
+
+ public static void paint(Graphics2D g, Viewport viewport, Geometry geometry, Style style)
+ throws Exception
+ {
+ if (geometry == null)
+ return;
+
+ // cull non-visible geometries
+ if (! viewport.intersectsInModel(geometry.getEnvelopeInternal()))
+ return;
+
+ if (geometry instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geometry;
+ /**
+ * Render each element separately.
+ * Otherwise it is not possible to render both filled and non-filled
+ * (1D) elements correctly
+ */
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ paint(g, viewport, gc.getGeometryN(i), style);
+ }
+ return;
+ }
+
+ style.paint(geometry, viewport, g);
+ }
+
+ private static void paintGeometryCollection(Graphics2D g, Viewport viewport,
+ GeometryCollection gc,
+ Style style
+ )
+ throws Exception
+ {
+ }
+
+ static Viewport viewportCache;
+ static ShapeWriter converterCache;
+
+ // TODO: does not work, has a race condition
+ public static ShapeWriter BADgetConverter(Viewport viewport)
+ {
+ if (viewportCache != viewport) {
+ viewportCache = viewport;
+ converterCache = new ShapeWriter(viewport, new PointShapeFactory.Point());
+ }
+ return converterCache;
+ }
+
+ /**
+ * Choose a fairly conservative decimation distance to avoid visual artifacts
+ */
+ private static final double DECIMATION_DISTANCE = 1.3;
+
+ // TODO: is this a performance problem?
+ // probably not - only called once for each geom painted
+ public static ShapeWriter getConverter(Viewport viewport)
+ {
+ ShapeWriter sw = new ShapeWriter(viewport, new PointShapeFactory.Point());
+ //sw.setRemoveDuplicatePoints(true);
+ sw.setDecimation(viewport.toModel(DECIMATION_DISTANCE));
+ return sw;
+ }
+
+ /**
+ * Paints a geometry onto a graphics context,
+ * using a given Viewport.
+ *
+ * @param geometry shape to paint
+ * @param viewport
+ * @param g the graphics context
+ * @param lineColor line color (null if none)
+ * @param fillColor fill color (null if none)
+ */
+ public static void paint(Geometry geometry, Viewport viewport,
+ Graphics2D g,
+ Color lineColor, Color fillColor)
+ {
+ paint(geometry, viewport, g, lineColor, fillColor, null);
+ }
+
+ public static void paint(Geometry geometry, Viewport viewport,
+ Graphics2D g,
+ Color lineColor, Color fillColor, Stroke stroke)
+ {
+ ShapeWriter converter = getConverter(viewport);
+ //ShapeWriter converter = new ShapeWriter(viewport);
+ paint(geometry, converter, g, lineColor, fillColor, stroke);
+ }
+
+ private static void paint(Geometry geometry, ShapeWriter converter, Graphics2D g,
+ Color lineColor, Color fillColor)
+ {
+ paint(geometry, converter, g, lineColor, fillColor, null);
+ }
+
+ private static void paint(Geometry geometry, ShapeWriter converter, Graphics2D g,
+ Color lineColor, Color fillColor, Stroke stroke)
+ {
+ if (geometry == null)
+ return;
+
+ if (geometry instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geometry;
+ /**
+ * Render each element separately.
+ * Otherwise it is not possible to render both filled and non-filled
+ * (1D) elements correctly
+ */
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ paint(gc.getGeometryN(i), converter, g, lineColor, fillColor, stroke);
+ }
+ return;
+ }
+
+ Shape shape = converter.toShape(geometry);
+
+ // handle points in a special way for appearance and speed
+ if (geometry instanceof Point) {
+ g.setStroke(POINT_STROKE);
+ g.setColor(lineColor);
+ g.draw(shape);
+ return;
+ }
+
+ if (stroke == null)
+ g.setStroke(GEOMETRY_STROKE);
+ else
+ g.setStroke(stroke);
+
+ // Test for a polygonal shape and fill it if required
+ if (geometry instanceof Polygon && fillColor != null) {
+ // if (!(shape instanceof GeneralPath) && fillColor != null) {
+ g.setPaint(fillColor);
+ g.fill(shape);
+ }
+
+ if (lineColor != null) {
+ g.setColor(lineColor);
+ try {
+ g.draw(shape);
+
+ // draw polygon boundaries twice, to discriminate them
+ // MD - this isn't very obvious. Perhaps a dashed line instead?
+ /*
+ if (geometry instanceof Polygon) {
+ Shape polyShell = converter.toShape( ((Polygon)geometry).getExteriorRing());
+ g.setStroke(new BasicStroke(2));
+ g.draw(polyShell);
+ }
+*/
+ }
+ catch (Throwable ex) {
+ System.out.println(ex);
+ // eat it!
+ }
+ }
+ }
+
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/GridRenderer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/GridRenderer.java
new file mode 100644
index 0000000..ff3d9b2
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/GridRenderer.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.render;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Stroke;
+import java.awt.geom.*;
+import java.text.NumberFormat;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.math.MathUtil;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.model.DrawingGrid;
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class GridRenderer {
+ private static final int MIN_VIEW_GRID_SIZE = 5;
+
+
+ private Viewport viewport;
+
+ private DrawingGrid grid;
+
+ private boolean isEnabled = true;
+
+ private NumberFormat gridSizeFormat;
+
+
+ public GridRenderer(Viewport viewport, DrawingGrid grid) {
+ this.viewport = viewport;
+ this.grid = grid;
+ gridSizeFormat = NumberFormat.getInstance();
+ gridSizeFormat.setGroupingUsed(false);
+ }
+
+ public void setEnabled(boolean isEnabled) {
+ this.isEnabled = isEnabled;
+ }
+
+ public void paint(Graphics2D g) {
+ if (! isEnabled)
+ return;
+ try {
+ drawAxes(g);
+ drawLinedGrid(g);
+// drawDottedGrid(g);
+ drawGridSizeLabel(g, viewport.gridMagnitudeModel());
+ }
+ // guards against crazy data causing problems
+ catch (ArithmeticException ex) {
+ return;
+ }
+ }
+
+ private boolean isResolvable() {
+ Point2D p1 = viewport.toModel(new Point(0, 0));
+ Point2D p2 = viewport.toModel(new Point(MIN_VIEW_GRID_SIZE, 0));
+ return grid.isResolvable(p1, p2);
+ }
+
+ private static final Coordinate MODEL_ORIGIN = new Coordinate(0, 0);
+
+ private void drawAxes(Graphics2D g) {
+ // draw XY axes
+ g.setColor(AppConstants.AXIS_CLR);
+ g.setStroke(new BasicStroke(AppConstants.AXIS_WIDTH));
+
+ Point2D viewOrigin = viewport.toView(MODEL_ORIGIN);
+ double vOriginX = viewOrigin.getX();
+ double vOriginY = viewOrigin.getY();
+
+ if (vOriginX >= 0.0 && vOriginX <= viewport.getWidthInView()) {
+ g.draw(new Line2D.Double(vOriginX, 0, vOriginX, viewport
+ .getHeightInView()));
+ }
+
+ if (vOriginY >= 0.0 && vOriginY <= viewport.getHeightInView()) {
+ g.draw(new Line2D.Double(0, vOriginY, viewport.getWidthInView(), vOriginY));
+ }
+ }
+
+ private int maxVisibleMagnitude()
+ {
+ double visibleExtentModel = viewport.getModelEnv().maxExtent();
+ // if input is bogus then just return something reasonable
+ if (visibleExtentModel <= 0.0)
+ return 1;
+ double log10 = MathUtil.log10(visibleExtentModel);
+ return (int) log10;
+ }
+
+ /*
+ private static final int MIN_GRID_PIXELS = 2;
+
+ private int gridMagnitudeModel()
+ {
+ double pixelSizeModel = viewport.toModel(1);
+ double pixelSizeModelLog = Math.log10(pixelSizeModel);
+ int gridMag = (int) Math.ceil(pixelSizeModelLog);
+
+ // Check if grid size is too small and if so increase it one magnitude
+ double gridSizeModel = Math.pow(10, gridMag);
+ double gridSizeView = viewport.toView(gridSizeModel);
+// System.out.println("\ncand gridSizeView= " + gridSizeView);
+ if (gridSizeView <= MIN_GRID_PIXELS )
+ gridMag += 1;
+
+// System.out.println("pixelSize= " + pixelSize + " pixelLog10= " + pixelSizeLog);
+ return gridMag;
+ }
+ */
+
+ private static final int GRID_MAJOR_LINE_CLR = 220;
+ private static final int GRID_MINOR_LINE_CLR = 240;
+
+ private void drawLinedGrid(Graphics2D g)
+ {
+ int gridMagModel = viewport.gridMagnitudeModel();
+ double gridSizeModel = Math.pow(10, gridMagModel);
+ double gridSizeView = viewport.toView(gridSizeModel);
+ Envelope modelEnv = viewport.getModelEnv();
+
+ //System.out.println("gridSizeView= " + gridSizeView);
+
+ /**
+ * Major Grid (10x)
+ */
+ double gridSize10Model = 10 * gridSizeModel;
+ PrecisionModel pmGrid10 = new PrecisionModel(1.0/gridSize10Model);
+ double basex10Model = pmGrid10.makePrecise(modelEnv.getMinX());
+ double basey10Model = pmGrid10.makePrecise(modelEnv.getMinY());
+ Point2D basePt10View = viewport.toView(new Coordinate(basex10Model, basey10Model));
+ double gridSize10View = viewport.toView(gridSize10Model);
+
+ /**
+ * Major-Major Grid (100x)
+ */
+ double gridSize100Model = 100 * gridSizeModel;
+ PrecisionModel pmGrid100 = new PrecisionModel(1.0/gridSize100Model);
+ double basex100Model = pmGrid100.makePrecise(modelEnv.getMinX());
+ double basey100Model = pmGrid100.makePrecise(modelEnv.getMinY());
+ Point2D basePt100View = viewport.toView(new Coordinate(basex100Model, basey100Model));
+ double gridSize100View = viewport.toView(gridSize100Model);
+
+ /**
+ * Minor Grid
+ * Only display if dots are sparse enough
+ */
+ if (gridSizeView >= 4) {
+ PrecisionModel pmGrid = new PrecisionModel(1.0/gridSizeModel);
+ double basexModel = pmGrid.makePrecise(modelEnv.getMinX());
+ double baseyModel = pmGrid.makePrecise(modelEnv.getMinY());
+ Point2D basePtView = viewport.toView(new Coordinate(basexModel, baseyModel));
+
+ g.setStroke(new BasicStroke());
+ g.setColor(ColorUtil.gray(GRID_MINOR_LINE_CLR));
+ drawGridLines(g, basePtView.getX(), basePtView.getY(), gridSizeView);
+ }
+
+ g.setStroke(new BasicStroke());
+ g.setColor(ColorUtil.gray(GRID_MAJOR_LINE_CLR));
+ drawGridLines(g, basePt10View.getX(), basePt10View.getY(), gridSize10View);
+
+ /**
+ * Major-Major Grid (100x)
+ */
+ Stroke strokeMajor2 = new BasicStroke(1, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {4, 6}, // Dash pattern
+ 0); // Dash phase
+ g.setStroke(strokeMajor2);
+ g.setColor(ColorUtil.gray(100));
+ drawGridLines(g, basePt100View.getX(), basePt100View.getY(), gridSize100View);
+
+ /**
+ * Semi-Major dots (10x + 5)
+ */
+ float dash10Offset = ((int) basePt10View.getY()) % (int) gridSize10View;
+ dash10Offset = (float) (gridSize10View - dash10Offset + gridSize10View/2);
+
+ g.setColor(Color.BLACK);
+ Stroke strokeMid = new BasicStroke(1, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {0, (float) gridSize10View/2}, // Dash pattern
+ dash10Offset); // Dash phase
+ g.setStroke(strokeMid);
+
+ drawGridLines(g,
+ basePt10View.getX() - gridSize10View/2,
+ 0,
+ gridSize10View/2);
+ }
+
+ private void drawDottedGrid(Graphics2D g)
+ {
+ int gridMagModel = viewport.gridMagnitudeModel();
+ double gridSizeModel = Math.pow(10, gridMagModel);
+ double gridSizeView = viewport.toView(gridSizeModel);
+
+ //System.out.println("gridSizeView= " + gridSizeView);
+
+ /**
+ * Major Grid (10x)
+ */
+ double gridSize10Model = 10 * gridSizeModel;
+ PrecisionModel pmGrid10 = new PrecisionModel(1.0/gridSize10Model);
+ Envelope modelEnv = viewport.getModelEnv();
+ double basex10Model = pmGrid10.makePrecise(modelEnv.getMinX());
+ double basey10Model = pmGrid10.makePrecise(modelEnv.getMinY());
+ Point2D basePt10View = viewport.toView(new Coordinate(basex10Model, basey10Model));
+ double gridSize10View = viewport.toView(gridSize10Model);
+
+ g.setStroke(new BasicStroke());
+ g.setColor(AppConstants.GRID_MAJOR_CLR);
+ drawGridLines(g, basePt10View.getX(), basePt10View.getY(), gridSize10View);
+
+ /**
+ * Major-Major Grid (100x)
+ */
+ double gridSize100Model = 100 * gridSizeModel;
+ PrecisionModel pmGrid100 = new PrecisionModel(1.0/gridSize100Model);
+ double basex100Model = pmGrid100.makePrecise(modelEnv.getMinX());
+ double basey100Model = pmGrid100.makePrecise(modelEnv.getMinY());
+ Point2D basePt100View = viewport.toView(new Coordinate(basex100Model, basey100Model));
+ double gridSize100View = viewport.toView(gridSize100Model);
+
+ Stroke strokeMajor2 = new BasicStroke(1, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {4, 6}, // Dash pattern
+ 0); // Dash phase
+ g.setStroke(strokeMajor2);
+
+ g.setColor(AppConstants.GRID_MINOR_CLR);
+ drawGridLines(g, basePt100View.getX(), basePt100View.getY(), gridSize100View);
+
+ /**
+ * Semi-Major grid (10x + 5)
+ */
+ /*
+ // disabled for now - a bit too many lines
+ g.setColor(AppConstants.GRID_MAJOR_CLR);
+ Stroke strokeMid = new BasicStroke(1, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {4, 6}, // Dash pattern
+ 0); // Dash phase
+ g.setStroke(strokeMid);
+
+ drawGridLines(g,
+ basePt10View.getX() - gridSize10View/2,
+ basePt10View.getY() + gridSize10View/2,
+ gridSize10View);
+*/
+ float dash10Offset = ((int) basePt10View.getY()) % (int) gridSize10View;
+ dash10Offset = (float) (gridSize10View - dash10Offset + gridSize10View/2);
+
+
+ /**
+ * Minor Grid
+ * Only display if dots are sparse enough
+ */
+ if (gridSizeView >= 4) {
+ PrecisionModel pmGrid = new PrecisionModel(1.0/gridSizeModel);
+ double basexModel = pmGrid.makePrecise(modelEnv.getMinX());
+ double baseyModel = pmGrid.makePrecise(modelEnv.getMinY());
+ Point2D basePtView = viewport.toView(new Coordinate(basexModel, baseyModel));
+ float dashOffset = ((int) basePtView.getY()) % (int) gridSizeView;
+ dashOffset = (float) gridSizeView - dashOffset;
+
+ //System.out.println("dashOffset= " + dashOffset);
+
+ Stroke strokeMinor = new BasicStroke(1, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {0, (float) gridSizeView }, // Dash pattern
+ dashOffset); // Dash phase
+ g.setStroke(strokeMinor);
+ g.setColor(AppConstants.GRID_MINOR_CLR);
+ drawGridLines(g, basePtView.getX(), 0, gridSizeView);
+ }
+
+ /**
+ * Semi-Major dots (10x + 5)
+ */
+ g.setColor(Color.BLACK);
+ Stroke strokeMid = new BasicStroke(1, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {0, (float) gridSize10View/2}, // Dash pattern
+ dash10Offset); // Dash phase
+ g.setStroke(strokeMid);
+
+ drawGridLines(g,
+ basePt10View.getX() - gridSize10View/2,
+ 0,
+ gridSize10View/2);
+ }
+
+ private void drawGridSizeLabel(Graphics2D g, int gridMagModel)
+ {
+ /**
+ * Draw grid size text
+ */
+ g.setColor(Color.BLUE);
+
+ int viewHeight = (int) viewport.getHeightInView();
+ int viewWidth = (int) viewport.getWidthInView();
+
+ if (Math.abs(gridMagModel) <= 3) {
+ // display as number
+ double gridSize = Math.pow(10, gridMagModel);
+ g.drawString(gridSizeFormat.format(gridSize), 2, viewHeight - 1);
+ }
+ else {
+ // display as exponent
+ g.drawString("10", 2, viewHeight - 1);
+ g.drawString(gridMagModel + "", 20, viewHeight - 8);
+ }
+ }
+
+ private void drawFixedGrid(Graphics2D g) {
+ // draw grid major lines
+
+ double gridSize = grid.getGridSize();
+ double gridSizeInView = gridSize * viewport.getScale();
+ //System.out.println(gridSizeInView);
+
+ Point2D ptLL = viewport.getLowerLeftCornerInModel();
+
+ double minx = grid.snapToMajorGrid(ptLL).getX();
+ double miny = grid.snapToMajorGrid(ptLL).getY();
+
+ Point2D minPtView = viewport.toView(new Coordinate(minx, miny));
+
+ g.setColor(AppConstants.GRID_MAJOR_CLR);
+ drawGridLines(g, minPtView.getX(), minPtView.getY(), gridSizeInView);
+ }
+
+ private void drawGridLines(Graphics2D g, double minx, double maxy, double gridSizeInView)
+ {
+ double viewWidth = viewport.getWidthInView();
+ double viewHeight = viewport.getHeightInView();
+
+ //Point2D minPtView = viewport.toView(new Coordinate(minx, miny));
+
+
+ /**
+ * Can't draw right to edges of panel, because
+ * Swing inset border occupies that space.
+ */
+ // draw vertical grid lines
+ for (double x = minx; x < viewWidth; x += gridSizeInView) {
+ // don't draw grid line right next to panel border
+ if (x < 2) continue;
+ g.draw(new Line2D.Double(x, 0, x, viewHeight - 0));
+ }
+ // skip drawing horizontal grid lines if maxy is invalid
+ if (maxy <= 0) return;
+ for (double y = maxy; y > 0; y -= gridSizeInView) {
+ // don't draw grid line right next to panel border
+ if (y < 2) continue;
+ g.draw(new Line2D.Double(0, y, viewWidth - 0, y));
+ }
+ }
+
+ private static final int TICK_LEN = 5;
+ private static final int SCALE_TEXT_OFFSET_X = 40;
+ private static final int SCALE_TEXT_OFFSET_Y = 2;
+
+ /**
+ * Not very pleasing
+ *
+ * @param g
+ */
+ private void drawScaleMarks(Graphics2D g)
+ {
+ Envelope viewEnv = viewport.getViewEnv();
+
+ int viewMag = maxVisibleMagnitude();
+ double gridIncModel = Math.pow(10.0, viewMag);
+ double gridIncView = viewport.toView(gridIncModel);
+
+ // ensure at least 3 ticks are shown
+ if (3 * gridIncView > viewEnv.maxExtent()) {
+ gridIncView /= 10.0;
+ viewMag -= 1;
+ }
+
+ g.setColor(Color.BLACK);
+
+ // draw X axis ticks
+ double tickX = viewport.getWidthInView() - gridIncView;
+ int viewHeight = (int) viewport.getHeightInView();
+ while (tickX > 0) {
+ g.draw(new Line2D.Double(tickX, viewHeight + 1, tickX, viewHeight - TICK_LEN));
+ tickX -= gridIncView;
+ }
+
+ // draw Y axis ticks
+ double tickY = viewport.getHeightInView() - gridIncView;
+ int viewWidth = (int) viewport.getWidthInView();
+ while (tickY > 0) {
+ g.draw(new Line2D.Double(viewWidth + 1, tickY, viewWidth - TICK_LEN, tickY));
+ tickY -= gridIncView;
+ }
+
+ // draw Scale magnitude
+ g.drawString("10", viewWidth - 35, viewHeight - 1);
+ g.drawString(viewMag+"", viewWidth - 20, viewHeight - 8);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/LayerRenderer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/LayerRenderer.java
new file mode 100644
index 0000000..18a4116
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/LayerRenderer.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.render;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jtstest.testbuilder.model.DisplayParameters;
+import org.locationtech.jtstest.testbuilder.model.GeometryContainer;
+import org.locationtech.jtstest.testbuilder.model.Layer;
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+import org.locationtech.jtstest.testbuilder.ui.style.BasicStyle;
+import org.locationtech.jtstest.testbuilder.ui.style.LayerStyle;
+import org.locationtech.jtstest.testbuilder.ui.style.Style;
+import org.locationtech.jtstest.util.HSBPalette;
+
+
+public class LayerRenderer implements Renderer
+{
+ private Layer layer;
+ private GeometryContainer geomCont;
+ private Viewport viewport;
+ private boolean isCancelled = false;
+
+ public LayerRenderer(Layer layer, Viewport viewport)
+ {
+ this(layer, layer.getSource(), viewport);
+ }
+
+ public LayerRenderer(Layer layer, GeometryContainer geomCont, Viewport viewport)
+ {
+ this.layer = layer;
+ this.geomCont = geomCont;
+ this.viewport = viewport;
+ }
+
+ public void render(Graphics2D g)
+ {
+ if (! layer.isEnabled()) return;
+
+ try {
+ Geometry geom = getGeometry();
+ if (geom == null) return;
+
+ render(g, viewport, geom, layer);
+
+ } catch (Exception ex) {
+ System.out.println(ex);
+ // not much we can do about it - just carry on
+ }
+ }
+
+ private Geometry getGeometry()
+ {
+ if (geomCont == null) {
+ return null;
+ }
+ Geometry geom = geomCont.getGeometry();
+ return geom;
+ }
+
+ private void render(Graphics2D g, Viewport viewport, Geometry geometry, Layer layer)
+ throws Exception
+ {
+ // cull non-visible geometries
+ // for maximum rendering speed this needs to be checked for each component
+ if (! viewport.intersectsInModel(geometry.getEnvelopeInternal()))
+ return;
+ if (DisplayParameters.FILL_BASIC == DisplayParameters.fillType()) {
+ renderGeom(g, viewport, geometry, layer.getLayerStyle());
+ }
+ else {
+ renderCustomFill(g, viewport, geometry, layer);
+ }
+ }
+
+ private void renderCustomFill(Graphics2D g, Viewport viewport,
+ Geometry gc, Layer layer ) throws Exception
+ {
+ int numGeom = gc.getNumGeometries();
+ HSBPalette pal = customPalette(layer.getGeometryStyle().getFillColor(), numGeom);
+ /**
+ * Render each element separately.
+ * Otherwise it is not possible to render both filled and non-filled
+ * (1D) elements correctly.
+ * This also allows varying styling and cancellation.
+ */
+ for (int i = 0; i < numGeom; i++) {
+ if (isCancelled) return;
+ Style customFill = paletteFill(i, pal, layer.getGeometryStyle());
+ Style st = new LayerStyle(customFill, layer.getLayerStyle().getDecoratorStyle());
+ renderGeom(g, viewport, gc.getGeometryN(i), st);
+ }
+ }
+
+ private void renderGeom(Graphics2D g, Viewport viewport, Geometry geometry, Style style)
+ throws Exception
+ {
+ if (! viewport.intersectsInModel(geometry.getEnvelopeInternal()))
+ return;
+ if (! (geometry instanceof GeometryCollection)) {
+ style.paint(geometry, viewport, g);
+ return;
+ }
+ for (int i = 0; i < geometry.getNumGeometries(); i++) {
+ if (isCancelled) return;
+ renderGeom(g, viewport, geometry.getGeometryN(i), style);
+ }
+ }
+
+ private static final HSBPalette PAL_RAINBOW_INCREMENTAL = HSBPalette.createRainbowIncremental(0.396f, 0.4f, 1);
+
+ private static HSBPalette customPalette(Color clrBase, int numHues) {
+ HSBPalette pal = null;
+ if (DisplayParameters.FILL_VARY == DisplayParameters.fillType()) {
+ float hue = ColorUtil.getHue(clrBase);
+ pal = new HSBPalette(5, hue, 0.1f,
+ 3, 0.3f, 0.7f,
+ 3, 0.8f, 0.9f
+ );
+ }
+ else if (DisplayParameters.FILL_RAINBOW == DisplayParameters.fillType()) {
+ return HSBPalette.createRainbowSequential(numHues, 0.4f, 1);
+ }
+ else if (DisplayParameters.FILL_RAINBOW_RANDOM == DisplayParameters.fillType()) {
+ return PAL_RAINBOW_INCREMENTAL;
+ }
+ return pal;
+ }
+
+ private static Style paletteFill(int i, HSBPalette pal, BasicStyle style) {
+ Color clrBase = style.getFillColor();
+ int alpha = clrBase.getAlpha();
+ Color clr = pal.color(i, alpha);
+ BasicStyle st = new BasicStyle(style.getLineColor(), clr);
+ return st;
+ }
+
+ public void cancel()
+ {
+ isCancelled = true;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/OperationMonitorManager.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/OperationMonitorManager.java
new file mode 100644
index 0000000..48a7c41
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/OperationMonitorManager.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.render;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class OperationMonitorManager
+{
+ public static Geometry indicator = null;
+
+ // testing only
+ static {
+ GeometryFactory geomFact = new GeometryFactory();
+ indicator = geomFact.createLineString(new Coordinate[]{
+ new Coordinate(0,0), new Coordinate(100, 10)
+ });
+ }
+
+ private JPanel panel;
+ private Viewport viewport;
+
+ private Timer repaintTimer = new Timer(50, new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e) {
+ if (indicator != null) {
+ paint();
+ return;
+ }
+ }
+ });
+
+ public OperationMonitorManager(JPanel panel, Viewport viewport)
+ {
+ this.panel = panel;
+ this.viewport = viewport;
+ // start with a short time cycle to give better appearance
+ repaintTimer.setInitialDelay(1000);
+ repaintTimer.start();
+ }
+
+ private void paint()
+ {
+ Graphics2D g = (Graphics2D) panel.getGraphics();
+ if (g == null) return;
+ GeometryPainter.paint(indicator, viewport, g, Color.RED, null);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/RenderManager.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/RenderManager.java
new file mode 100644
index 0000000..6f0251a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/RenderManager.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.render;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.*;
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testbuilder.ui.*;
+
+
+public class RenderManager
+{
+ private GeometryEditPanel panel;
+ private RendererSwingWorker worker = null;
+ private Image image = null;
+ private boolean isDirty = true;
+
+ private Timer repaintTimer = new Timer(100, new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e) {
+ if (worker.isRendering()) {
+ paintPanel();
+ return;
+ }
+ repaintTimer.stop();
+ paintPanel();
+ }
+ });
+
+ public RenderManager(GeometryEditPanel panel)
+ {
+ this.panel = panel;
+ // start with a short time cycle to give better appearance
+ repaintTimer.setInitialDelay(100);
+ }
+
+ public void setDirty(boolean isDirty)
+ {
+ this.isDirty = isDirty;
+ }
+
+ public void componentResized()
+ {
+ image = null;
+ isDirty = true;
+ }
+
+ public void render()
+ {
+ if (image != null && ! isDirty) return;
+
+ /*
+ * Clear dirty flag at start of rendering, so that subsequent paints will newly rendered image.
+ * Another way to think of this is that once rendering has been initiated,
+ * from the perspective of the client panel the image is up-to-date
+ * (although possibly not yet fully rendered)
+ */
+ isDirty = false;
+
+ repaintTimer.stop();
+
+ if (worker != null)
+ worker.cancel();
+ initImage();
+ worker = new RendererSwingWorker(panel.getRenderer(), image);
+ worker.start();
+ repaintTimer.start();
+ }
+
+ private void initImage()
+ {
+ if (image != null) {
+ erase(image);
+ return;
+ }
+ image = createPanelImage(panel);
+ }
+
+ private Image createPanelImage(JPanel panel) {
+ return new BufferedImage(panel.getWidth(), panel.getHeight(),
+ BufferedImage.TYPE_INT_ARGB);
+ }
+
+ public void erase(Image image) {
+ int width = image.getWidth(null);
+ int height = image.getHeight(null);
+
+ Graphics2D g = (Graphics2D) image.getGraphics();
+ g.setColor(Color.white);
+
+ Rectangle2D.Double r = new Rectangle2D.Double(0, 0, width, height);
+ g.fill(r);
+ }
+
+ public void copyImage(Graphics g)
+ {
+ if (image == null) {
+ return;
+ }
+ g.drawImage(image, 0, 0, null);
+ }
+
+ private void paintPanel()
+ {
+ copyImage(panel.getGraphics());
+ }
+}
+
+class RendererSwingWorker extends SwingWorker
+{
+ private Image image = null;
+
+ private Renderer renderer;
+ private boolean isRendering = true;
+
+ public RendererSwingWorker(Renderer renderable, Image image)
+ {
+ this.renderer = renderable;
+ this.image = image;
+ }
+
+ public Object construct()
+ {
+ isRendering = true;
+ Graphics2D gr = (Graphics2D) image.getGraphics();
+ renderer.render(gr);
+ isRendering = false;
+ return new Boolean(true);
+ }
+
+ public boolean isRendering()
+ {
+ return isRendering;
+ }
+
+ public void cancel()
+ {
+ renderer.cancel();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/Renderer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/Renderer.java
new file mode 100644
index 0000000..63a727c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/Renderer.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.render;
+
+import java.awt.Graphics2D;
+
+/**
+ * A process object which renders a scene to a graphics context
+ * and allows cancellation.
+ * A Renderer can be cancelled, which may allow it to
+ * stop or short-circuit processing, thus saving cycles.
+ * A cancelled rendering will not be displayed.
+ *
+ * @author mbdavis
+ *
+ */
+public interface Renderer
+{
+ /**
+ * Renders the scene to the graphics context.
+ *
+ * @param g the graphics context to render to
+ */
+ void render(Graphics2D g);
+
+ /**
+ * Informs this process that it can stop rendering,
+ * because the rendered context will not be displayed.
+ *
+ */
+ void cancel();
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/AWTUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/AWTUtil.java
new file mode 100644
index 0000000..29a5abf
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/AWTUtil.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+public class AWTUtil
+{
+
+ public static Point2D subtract(Point2D a, Point2D b) {
+ return new Point2D.Double(a.getX() - b.getX(), a.getY() - b.getY());
+ }
+
+ public static Point2D add(Point2D a, Point2D b) {
+ return new Point2D.Double(a.getX() + b.getX(), a.getY() + b.getY());
+ }
+
+ public static Point2D multiply(Point2D v, double x) {
+ return new Point2D.Double(v.getX() * x, v.getY() * x);
+ }
+
+ public static void setStroke(Graphics2D g, double width) {
+ Stroke newStroke = new BasicStroke((float) width);
+ g.setStroke(newStroke);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowEndpointStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowEndpointStyle.java
new file mode 100644
index 0000000..7777fbb
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowEndpointStyle.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class ArrowEndpointStyle
+ extends LineStringEndpointStyle {
+
+ private static final int ARROW_ALPHA = 150;
+ private final static double ANGLE = 18;
+ private final static double LENGTH = 15;
+ private boolean filled = true;
+
+ // default in case colour is not set
+ private Color color = Color.RED;
+
+ public ArrowEndpointStyle(Color color, boolean start, boolean filled) {
+ super(start);
+ this.color = ColorUtil.setAlpha(color, ARROW_ALPHA);
+ this.filled = filled;
+ }
+
+ protected void paint(Point2D terminal, Point2D next, Viewport viewport,
+ Graphics2D g) throws NoninvertibleTransformException
+ {
+ // can't compute valid arrow for zero-length segments
+ if (terminal.equals(next)) {
+ return;
+ }
+
+ g.setPaint(color);
+ GeneralPath arrowhead = arrowheadPath(next, terminal, terminal, LENGTH,
+ ANGLE);
+ if (filled) {
+ arrowhead.closePath();
+ g.fill(arrowhead);
+ }
+ // draw to get effect of stroke
+ g.draw(arrowhead);
+ }
+
+ /**
+ * @param finLength
+ * required distance from the tip to each fin's tip
+ */
+ public static GeneralPath arrowheadPath(Point2D p0, Point2D p1,
+ Point2D tipPt,
+ double finLength, double finAngle) {
+ GeneralPath arrowhead = new GeneralPath();
+ Point2D finTip1 = fin(tipPt, p0, finLength, finAngle);
+ Point2D finTip2 = fin(tipPt, p0, finLength, -finAngle);
+ arrowhead.moveTo((float) finTip1.getX(), (float) finTip1.getY());
+ arrowhead.lineTo((float) tipPt.getX(), (float) tipPt.getY());
+ arrowhead.lineTo((float) finTip2.getX(), (float) finTip2.getY());
+
+ return arrowhead;
+ }
+
+ public static Point2D fin(Point2D shaftTip, Point2D shaftTail, double length,
+ double angle) {
+ double shaftLength = shaftTip.distance(shaftTail);
+ Point2D finTail = shaftTip;
+ Point2D finTip = AWTUtil.add(AWTUtil.multiply(AWTUtil.subtract(shaftTail,
+ shaftTip), length / shaftLength), finTail);
+ AffineTransform affineTransform = new AffineTransform();
+ affineTransform.rotate((angle * Math.PI) / 180, finTail.getX(), finTail
+ .getY());
+
+ return affineTransform.transform(finTip, null);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowLineStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowLineStyle.java
new file mode 100644
index 0000000..1f7c92f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowLineStyle.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class ArrowLineStyle
+ extends SegmentStyle
+{
+ private final static double HEAD_ANGLE = 30;
+ private final static double HEAD_LENGTH = 8;
+
+ private Color color = Color.RED;
+
+ private static Stroke dashStroke = new BasicStroke(1, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {2, 2}, // Dash pattern
+ 0); // Dash phase
+ private static Stroke MID_ARROW_STROKE = new BasicStroke(1);
+
+ public ArrowLineStyle(Color color) {
+ this.color = color;
+ }
+
+ protected void paint(int index, Point2D p0, Point2D p1, int lineType, Viewport vp, Graphics2D gr)
+ throws Exception
+ {
+ if (lineType == LINE)
+ paintMidpointArrow(p0, p1, vp, gr);
+ else
+ paintOffsetArrow(p0, p1, vp, gr);
+ }
+
+ protected void paintMidpointArrow(Point2D p0, Point2D p1, Viewport viewport,
+ Graphics2D graphics) throws NoninvertibleTransformException
+ {
+ if (isTooSmallToRender(p0, p1)) return;
+ graphics.setColor(color);
+ graphics.setStroke(MID_ARROW_STROKE);
+ Point2D mid = new Point2D.Float((float) ((p0.getX() + p1.getX()) / 2),
+ (float) ((p0.getY() + p1.getY()) / 2));
+ GeneralPath arrowhead = ArrowEndpointStyle.arrowheadPath(p0, p1, mid,
+ HEAD_LENGTH, HEAD_ANGLE);
+ graphics.draw(arrowhead);
+ }
+
+ private static final double LINE_OFFSET = 4;
+ private static final double ENDPOINT_OFFSET = 15;
+
+ private static final double HEAD_ANGLE_RAD = (HEAD_ANGLE - 180 ) /180.0 * Math.PI;
+ private static final double HEAD_COS = Math.cos(HEAD_ANGLE_RAD);
+ private static final double HEAD_SIN = Math.sin(HEAD_ANGLE_RAD);
+
+ public static final double MIN_VISIBLE_LEN = 2 * ENDPOINT_OFFSET + 4;
+
+ protected void paintOffsetArrow(Point2D p0, Point2D p1, Viewport viewport,
+ Graphics2D graphics) throws NoninvertibleTransformException
+ {
+ if (isTooSmallToRender(p0, p1)) return;
+
+ graphics.setColor(color);
+ // graphics.setStroke(1.0);
+ graphics.setStroke(dashStroke);
+
+
+ double dx = p1.getX() - p0.getX();
+ double dy = p1.getY() - p0.getY();
+
+ double len = Math.sqrt(dx * dx + dy * dy);
+
+ double vy = dy / len;
+ double vx = dx / len;
+
+ double off0x = p0.getX() + ENDPOINT_OFFSET * vx + LINE_OFFSET * vy;
+ double off0y = p0.getY() + ENDPOINT_OFFSET * vy + LINE_OFFSET * -vx;
+
+ double off1x = p1.getX() - ENDPOINT_OFFSET * vx + LINE_OFFSET * vy;
+ double off1y = p1.getY() - ENDPOINT_OFFSET * vy + LINE_OFFSET * -vx;
+
+ double headx = off1x + HEAD_LENGTH * (HEAD_COS * vx - HEAD_SIN * vy);
+ double heady = off1y + HEAD_LENGTH * (HEAD_SIN * vx + HEAD_COS * vy);
+
+ GeneralPath arrowhead = new GeneralPath();
+ arrowhead.moveTo((float) off0x, (float) off0y);
+ arrowhead.lineTo((float) off1x, (float) off1y);
+ arrowhead.lineTo((float) headx, (float) heady);
+
+ graphics.draw(arrowhead);
+ }
+
+ private boolean isTooSmallToRender(Point2D p0, Point2D p1)
+ {
+ if (p0.equals(p1)) {
+ return true;
+ }
+ double dx = p1.getX() - p0.getX();
+ double dy = p1.getY() - p0.getY();
+
+ double len = Math.sqrt(dx * dx + dy * dy);
+
+ return len < MIN_VISIBLE_LEN;
+
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/BasicStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/BasicStyle.java
new file mode 100644
index 0000000..b136897
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/BasicStyle.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+import org.locationtech.jtstest.testbuilder.ui.render.GeometryPainter;
+
+
+public class BasicStyle implements Style
+{
+ private Color lineColor;
+ private Color fillColor;
+
+ public BasicStyle(Color lineColor, Color fillColor) {
+ this.lineColor = lineColor;
+ this.fillColor = fillColor;
+ }
+
+ public BasicStyle() {
+ }
+
+ public void paint(Geometry geom, Viewport viewport, Graphics2D g)
+ {
+ GeometryPainter.paint(geom, viewport, g, lineColor, fillColor);
+ }
+
+ public Color getLineColor() {
+ return lineColor;
+ }
+
+ public Color getFillColor() {
+ return fillColor;
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/CircleEndpointStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/CircleEndpointStyle.java
new file mode 100644
index 0000000..6f67340
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/CircleEndpointStyle.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class CircleEndpointStyle
+ extends LineStringEndpointStyle
+{
+
+ private final static double DIAMETER = 10;
+ private boolean filled = true;
+
+ // default in case colour is not set
+ private Color color = Color.RED;
+ private double diameter = DIAMETER;
+
+ public CircleEndpointStyle(Color color, boolean start, boolean filled) {
+ super(start);
+ this.color = color;
+ this.filled = filled;
+}
+
+ public CircleEndpointStyle(Color color, double diameter, boolean start, boolean filled) {
+ super(start);
+ this.color = color;
+ this.diameter = diameter;
+ this.filled = filled;
+}
+
+ protected void paint(Point2D terminal, Point2D next, Viewport viewport,
+ Graphics2D g)
+ {
+
+ g.setPaint(color);
+
+ Shape circle = toCircle(terminal);
+
+ if (filled) {
+ g.fill(circle);
+ }
+ else {
+ g.draw(circle);
+ }
+ }
+
+ private Shape toCircle(Point2D viewPoint) {
+ return new Ellipse2D.Double(viewPoint.getX() - (diameter / 2d),
+ viewPoint.getY() - (diameter / 2d), diameter, diameter);
+}
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ComponentStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ComponentStyle.java
new file mode 100644
index 0000000..61e71ae
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ComponentStyle.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.Graphics2D;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public abstract class ComponentStyle
+ implements Style
+{
+ public void paint(Geometry geom, Viewport viewport, Graphics2D g)
+ throws Exception
+ {
+ // cull non-visible geometries
+ if (! viewport.intersectsInModel(geom.getEnvelopeInternal()))
+ return;
+
+ if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ paint(gc.getGeometryN(i), viewport, g);
+ }
+ return;
+ }
+ paintComponent(geom, viewport, g);
+ }
+
+ protected abstract void paintComponent(Geometry geom,
+ Viewport viewport, Graphics2D graphics)
+ throws Exception;
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/DataLabelStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/DataLabelStyle.java
new file mode 100644
index 0000000..fc99806
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/DataLabelStyle.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.ui.GraphicsUtil;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+import org.locationtech.jtstest.testbuilder.ui.render.GeometryPainter;
+
+
+public class DataLabelStyle implements Style
+{
+ private Color color;
+
+ public DataLabelStyle(Color color) {
+ this.color = color;
+ }
+
+ public DataLabelStyle() {
+ }
+
+ public void paint(Geometry geom, Viewport viewport, Graphics2D g2d)
+ {
+ if (geom.getUserData() == null) return;
+
+ Coordinate p = geom.getCentroid().getCoordinate();
+ Point2D vp = viewport.toView(new Point2D.Double(p.x, p.y));
+
+ g2d.setColor(color);
+ g2d.setFont(AppConstants.FONT_LABEL);
+
+ String label = geom.getUserData().toString();
+ //int stringLen = (int) g2d.getFontMetrics().getStringBounds(label, g2d).getWidth();
+ GraphicsUtil.drawStringAlignCenter(g2d, label, (int) vp.getX(), (int) vp.getY());
+ }
+
+ public Color getColor() {
+ return color;
+ }
+
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LayerStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LayerStyle.java
new file mode 100644
index 0000000..f2cbfce
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LayerStyle.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.Graphics2D;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+public class LayerStyle implements Style {
+
+ private Style geomStyle;
+ private Style decoratorStyle;
+
+ public LayerStyle(Style geomStyle, Style decoratorStyle) {
+ this.geomStyle = geomStyle;
+ this.decoratorStyle = decoratorStyle;
+ }
+
+ public Style getGeomStyle() {
+ return geomStyle;
+ }
+
+ public Style getDecoratorStyle() {
+ return decoratorStyle;
+ }
+
+ public void paint(Geometry geom, Viewport viewport, Graphics2D g) throws Exception {
+ geomStyle.paint(geom, viewport, g);
+ decoratorStyle.paint(geom, viewport, g);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringEndpointStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringEndpointStyle.java
new file mode 100644
index 0000000..e775414
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringEndpointStyle.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public abstract class LineStringEndpointStyle extends LineStringStyle {
+ private boolean start;
+
+ public LineStringEndpointStyle(boolean start) {
+ this.start = start;
+ }
+
+ protected void paintLineString(LineString lineString, int lineType, Viewport viewport, Graphics2D graphics
+ ) throws Exception {
+ if (lineString.isEmpty()) {
+ return;
+ }
+
+ paint(start ? lineString.getCoordinateN(0)
+ : lineString.getCoordinateN(lineString.getNumPoints() - 1),
+ start ? lineString.getCoordinateN(1)
+ : lineString.getCoordinateN(lineString.getNumPoints() - 2),
+ viewport, graphics);
+ }
+
+ private void paint(Coordinate terminal, Coordinate next, Viewport viewport,
+ Graphics2D graphics) throws Exception {
+ paint(viewport.toView(new Point2D.Double(terminal.x, terminal.y)),
+ viewport.toView(new Point2D.Double(next.x, next.y)), viewport,
+ graphics);
+ }
+
+ protected abstract void paint(Point2D terminal, Point2D next,
+ Viewport viewport, Graphics2D graphics) throws Exception;
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringStyle.java
new file mode 100644
index 0000000..d777518
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringStyle.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.Graphics2D;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public abstract class LineStringStyle
+ implements Style
+{
+ public static final int LINE = 1;
+ public static final int POLY_SHELL = 2;
+ public static final int POLY_HOLE = 3;
+
+ public LineStringStyle() {
+ }
+
+ public void paint(Geometry geom, Viewport viewport, Graphics2D g)
+ throws Exception
+ {
+ // cull non-visible geometries
+ if (! viewport.intersectsInModel(geom.getEnvelopeInternal()))
+ return;
+
+ if (geom instanceof LineString) {
+ LineString lineString = (LineString) geom;
+ if (lineString.getNumPoints() < 2) {
+ return;
+ }
+ paintLineString(lineString, LINE, viewport, g);
+ }
+
+ if (geom instanceof Point)
+ return;
+ if (geom instanceof MultiPoint)
+ return;
+
+ if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ paint(gc.getGeometryN(i), viewport, g);
+ }
+ return;
+ }
+ if (geom instanceof Polygon) {
+ Polygon polygon = (Polygon) geom;
+ paint(polygon.getExteriorRing(), POLY_SHELL, viewport, g);
+ for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
+ paint(polygon.getInteriorRingN(i), POLY_HOLE, viewport, g);
+ }
+ return;
+ }
+ }
+
+ public void paint(LineString line, int lineType, Viewport viewport, Graphics2D g)
+ throws Exception
+ {
+ // cull non-visible geometries
+ if (! viewport.intersectsInModel(line.getEnvelopeInternal()))
+ return;
+
+ paintLineString(line, lineType, viewport, g);
+ }
+
+ protected abstract void paintLineString(LineString lineString,
+ int lineType,
+ Viewport viewport, Graphics2D graphics)
+ throws Exception;
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/MidArrowLineStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/MidArrowLineStyle.java
new file mode 100644
index 0000000..4faf20e
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/MidArrowLineStyle.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class MidArrowLineStyle
+ extends SegmentStyle
+{
+ private final static double HEAD_ANGLE = 30;
+ private final static double HEAD_LENGTH = 10;
+
+ private Color color = Color.RED;
+
+ public MidArrowLineStyle(Color color) {
+ this.color = color;
+ }
+
+ protected void paint(int index, Point2D p0, Point2D p1, int lineType, Viewport vp, Graphics2D gr)
+ throws Exception
+ {
+ paintMidpointArrow(p0, p1, vp, gr);
+ }
+
+ protected void paintMidpointArrow(Point2D p0, Point2D p1, Viewport viewport,
+ Graphics2D graphics) throws NoninvertibleTransformException
+ {
+ // can't compute valid arrow for zero-length segments
+ if (p0.equals(p1)) {
+ return;
+ }
+ graphics.setColor(color);
+ // graphics.setStroke(1.0);
+ Point2D mid = new Point2D.Float((float) ((p0.getX() + p1.getX()) / 2),
+ (float) ((p0.getY() + p1.getY()) / 2));
+ GeneralPath arrowhead = ArrowEndpointStyle.arrowheadPath(p0, p1, mid,
+ HEAD_LENGTH, HEAD_ANGLE);
+ graphics.draw(arrowhead);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/PolygonStructureStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/PolygonStructureStyle.java
new file mode 100644
index 0000000..732f5d3
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/PolygonStructureStyle.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+import org.locationtech.jtstest.testbuilder.ui.render.GeometryPainter;
+
+
+/**
+ * Shows polygon structure (shells versus holes)
+ * by symbolizing the rings differently.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PolygonStructureStyle
+extends LineStringStyle
+{
+ private Color color = Color.BLACK;
+
+ public PolygonStructureStyle(Color color) {
+ this.color = color;
+ }
+
+ protected void paintLineString(LineString lineString,
+ int lineType,
+ Viewport viewport, Graphics2D gr)
+ throws Exception
+ {
+ Color dashClr = color.darker().darker(); //new Color(0, 0, 0);
+ Graphics2D gr2 = (Graphics2D) gr.create();
+ gr2.setColor(dashClr);
+
+ Stroke dashStroke = new BasicStroke((float) 1.2, // Width of stroke
+ BasicStroke.CAP_SQUARE, // End cap style
+ BasicStroke.JOIN_MITER, // Join style
+ 10, // Miter limit
+ new float[] {3, 6}, // Dash pattern
+ 0); // Dash phase
+ gr2.setStroke(dashStroke);
+
+ if (lineType == POLY_HOLE) {
+ Shape ringShape = GeometryPainter.getConverter(viewport).toShape(lineString);
+ gr2.draw(ringShape);
+ }
+ //Color shellClr = ColorUtil.saturate(color, 0.9);
+ //gr2.setColor(shellClr);
+ //paintRing(polygon.getExteriorRing(), true, viewport, gr2);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/SegmentIndexStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/SegmentIndexStyle.java
new file mode 100644
index 0000000..11cd9f8
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/SegmentIndexStyle.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jts.awt.FontGlyphReader;
+import org.locationtech.jts.geomgraph.Quadrant;
+import org.locationtech.jts.noding.Octant;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class SegmentIndexStyle
+ extends SegmentStyle
+{
+ private final static double MIN_LEN = 10;
+ private final static int CHAR_WIDTH_APPROX = 6;
+ private final static int CHAR_HEIGHT_APPROX = 6;
+ private final static int VERTEX_OFFSET = 15;
+ private final static int BOX_PAD = 1;
+ private final static Font FONT = new Font(FontGlyphReader.FONT_SANSSERIF, Font.PLAIN, 10);
+
+ private Color color = Color.RED;
+
+ public SegmentIndexStyle(Color color) {
+ this.color = color;
+ }
+
+ protected void paint(int index, Point2D p0, Point2D p1, int lineType, Viewport vp, Graphics2D gr)
+ throws Exception
+ {
+ double len = p0.distance(p1);
+ // can't compute label location for zero-length segments
+ if (len < MIN_LEN) {
+ return;
+ }
+
+ double vertexOffset = len / 4;
+ if (vertexOffset > VERTEX_OFFSET)
+ vertexOffset = VERTEX_OFFSET;
+
+ String indexStr = Integer.toString(index);
+
+ double dx = p1.getX() - p0.getX();
+ double dy = p1.getY() - p0.getY();
+
+ int quadrant = Quadrant.quadrant(dx, -dy);
+
+ double boxMaxX = /*2 * BOX_PAD +*/ indexStr.length() * CHAR_WIDTH_APPROX;
+ double boxMaxY = 2 * BOX_PAD + CHAR_HEIGHT_APPROX;
+
+ double strOffsetX = BOX_PAD;
+ double strOffsetY = -BOX_PAD;
+ switch (quadrant) {
+ case 0:
+ strOffsetX = -boxMaxX;
+ break;
+ case 1:
+ break;
+ case 2:
+ strOffsetY = boxMaxY;
+ break;
+ case 3:
+ strOffsetX = -boxMaxX;
+ strOffsetY = boxMaxY;
+ break;
+ }
+
+ double x = p0.getX() + dx/len*vertexOffset + strOffsetX;
+ double y = p0.getY() + dy/len*vertexOffset + strOffsetY;
+
+ gr.setColor(color);
+ gr.setFont(FONT);
+ gr.drawString(indexStr, (int) x, (int) y);
+ }
+
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/SegmentStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/SegmentStyle.java
new file mode 100644
index 0000000..2aa239d
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/SegmentStyle.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public abstract class SegmentStyle
+extends LineStringStyle
+{
+
+ public SegmentStyle() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ protected void paintLineString(LineString lineString, int lineType, Viewport viewport, Graphics2D graphics) throws Exception {
+ for (int i = 0; i < lineString.getNumPoints() - 1; i++) {
+ paint(i,
+ lineString.getCoordinateN(i),
+ lineString.getCoordinateN(i + 1),
+ lineType, viewport, graphics);
+ }
+ }
+
+ protected void paint(int index, Coordinate p0, Coordinate p1, int lineType, Viewport viewport, Graphics2D g
+ ) throws Exception {
+ paint(index, viewport.toView(new Point2D.Double(p0.x, p0.y)),
+ viewport.toView(new Point2D.Double(p1.x, p1.y)), lineType, viewport, g);
+ }
+
+ /**
+ *
+ * @param p0 the origin of the line segment, in view space
+ * @param p1 the termination of the line segment, in view space
+ * @param viewport
+ * @param graphics
+ * @throws Exception
+ */
+ protected abstract void paint(int index, Point2D p0, Point2D p1,
+ int lineType, Viewport viewport, Graphics2D graphics) throws Exception;
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/Style.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/Style.java
new file mode 100644
index 0000000..60a8a9a
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/Style.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.Graphics2D;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public interface Style {
+ void paint(Geometry geom, Viewport viewport, Graphics2D g)
+ throws Exception;
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/StyleList.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/StyleList.java
new file mode 100644
index 0000000..676ea7c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/StyleList.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.util.*;
+import java.awt.Graphics2D;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+import org.locationtech.jtstest.testbuilder.ui.render.*;
+
+
+/**
+ * Contains a list of styles and allows Geometrys
+ * to be rendered using those styles.
+ *
+ * @author mbdavis
+ *
+ */
+public class StyleList implements Style
+{
+ private List styleList = new ArrayList();
+
+ public void paint(Geometry geom, Viewport viewport, Graphics2D g)
+ throws Exception
+ {
+ for (Iterator i = styleList.iterator(); i.hasNext(); ) {
+ StyleEntry styleEntry = (StyleEntry) i.next();
+ if (styleEntry.isFullyEnabled())
+ styleEntry.getStyle().paint(geom, viewport, g);
+ }
+ }
+
+ public void add(Style style)
+ {
+ add(style, null);
+ }
+
+ public void add(Style style, StyleFilter filter)
+ {
+ styleList.add(new StyleEntry(style, filter));
+ }
+
+ public void setEnabled(Style style, boolean isEnabled)
+ {
+ StyleEntry entry = getEntry(style);
+ if (entry == null)
+ return;
+ entry.setEnabled(isEnabled);
+ }
+
+ private StyleEntry getEntry(Style style)
+ {
+ int index = getEntryIndex(style);
+ if (index < 0) return null;
+ return (StyleEntry) styleList.get(index);
+ }
+
+ private int getEntryIndex(Style style)
+ {
+ for (int i = 0; i < styleList.size(); i++) {
+ StyleEntry entry = (StyleEntry) styleList.get(i);
+ if (entry.getStyle() == style)
+ return i;
+ }
+ return -1;
+ }
+
+ public interface StyleFilter {
+ boolean isFiltered(Style style);
+ }
+}
+
+class StyleEntry
+{
+ private Style style;
+ private boolean isEnabled = true;
+ private StyleList.StyleFilter filter = null;
+
+ public StyleEntry(Style style)
+ {
+ this.style = style;
+ }
+
+ public StyleEntry(Style style, StyleList.StyleFilter filter)
+ {
+ this.style = style;
+ this.filter = filter;
+ }
+
+ public void setEnabled(boolean isEnabled)
+ {
+ this.isEnabled = isEnabled;
+ }
+
+ public boolean isEnabled() { return isEnabled; }
+
+ public boolean isFiltered() {
+ if (filter == null)
+ return false;
+ return filter.isFiltered(style);
+ }
+
+ public boolean isFullyEnabled()
+ {
+ return isEnabled() && ! isFiltered();
+ }
+
+ public Style getStyle() { return style; }
+}
\ No newline at end of file
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/VertexStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/VertexStyle.java
new file mode 100644
index 0000000..936f198
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/VertexStyle.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.style;
+
+import java.awt.*;
+import java.awt.geom.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public class VertexStyle implements Style
+{
+ private double sizeOver2 = AppConstants.VERTEX_SIZE / 2d;
+
+ protected Rectangle shape;
+ private Color color;
+
+ // reuse point objects to avoid creation overhead
+ private Point2D pM = new Point2D.Double();
+ private Point2D pV = new Point2D.Double();
+
+ public VertexStyle(Color color) {
+ this.color = color;
+ // create basic rectangle shape
+ shape = new Rectangle(0,
+ 0,
+ AppConstants.VERTEX_SIZE,
+ AppConstants.VERTEX_SIZE);
+ }
+
+
+ public void paint(Geometry geom, Viewport viewport, Graphics2D g)
+ {
+ g.setPaint(color);
+ Coordinate[] coordinates = geom.getCoordinates();
+
+ for (int i = 0; i < coordinates.length; i++) {
+ if (! viewport.containsInModel(coordinates[i])) {
+ //Otherwise get "sun.dc.pr.PRException: endPath: bad path" exception
+ continue;
+ }
+ pM.setLocation(coordinates[i].x, coordinates[i].y);
+ viewport.toView(pM, pV);
+ shape.setLocation((int) (pV.getX() - sizeOver2), (int) (pV.getY() - sizeOver2));
+ g.fill(shape);
+ }
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/AbstractDrawTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/AbstractDrawTool.java
new file mode 100644
index 0000000..a531246
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/AbstractDrawTool.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.*;
+import java.awt.event.MouseEvent;
+
+import org.locationtech.jtstest.testbuilder.AppCursors;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+//import com.vividsolutions.jtstest.testbuilder.IconLoader;
+
+/**
+ * @version 1.7
+ */
+public abstract class AbstractDrawTool extends LineBandTool {
+
+ protected AbstractDrawTool() {
+ super(AppCursors.DRAW_GEOM);
+ }
+
+ protected abstract int getGeometryType();
+
+ public void mouseClicked(MouseEvent e) {
+ setBandType();
+ super.mouseClicked(e);
+ }
+
+ protected void bandFinished() throws Exception {
+ setType();
+ geomModel().addComponent(getCoordinates());
+ panel().updateGeom();
+ }
+
+ private void setType() {
+ if (panel().getModel() == null)
+ return;
+ panel().getGeomModel().setGeometryType(getGeometryType());
+ }
+
+ private void setBandType() {
+ int geomType = getGeometryType();
+ setCloseRing(geomType == GeometryType.POLYGON);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/AbstractStreamDrawTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/AbstractStreamDrawTool.java
new file mode 100644
index 0000000..9a26abe
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/AbstractStreamDrawTool.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jtstest.testbuilder.AppCursors;
+import org.locationtech.jtstest.testbuilder.model.GeometryType;
+
+
+/**
+ * @version 1.7
+ */
+public abstract class AbstractStreamDrawTool extends LineBandTool {
+
+ protected AbstractStreamDrawTool() {
+ super(AppCursors.DRAW_GEOM);
+ }
+
+ protected abstract int getGeometryType();
+
+ protected void mouseLocationChanged(MouseEvent e) {
+ try {
+ if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK)
+ == InputEvent.BUTTON1_DOWN_MASK) {
+ Coordinate newCoord = toModelCoordinate(e.getPoint());
+ if (newCoord.distance(lastCoordinate()) < gridSize())
+ return;
+ //add(toModelSnapped(e.getPoint()));
+ add(newCoord);
+ }
+
+ tentativeCoordinate = toModelSnapped(e.getPoint());
+ redrawIndicator();
+ } catch (Throwable t) {
+ }
+ }
+
+ public void mousePressed(MouseEvent e) {
+ setBandType();
+ super.mousePressed(e);
+ }
+
+
+ public void mouseClicked(MouseEvent e) {
+ setBandType();
+ super.mouseClicked(e);
+ }
+
+ protected void bandFinished() throws Exception {
+ setType();
+ geomModel().addComponent(getCoordinates());
+ panel().updateGeom();
+ }
+
+ private void setType() {
+ if (panel().getModel() == null)
+ return;
+ panel().getGeomModel().setGeometryType(getGeometryType());
+ }
+
+ private void setBandType() {
+ int geomType = getGeometryType();
+ setCloseRing(geomType == GeometryType.POLYGON);
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BasicTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BasicTool.java
new file mode 100644
index 0000000..7a7ad7f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BasicTool.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.geom.Point2D;
+
+import org.locationtech.jts.awt.FontGlyphReader;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+import org.locationtech.jtstest.testbuilder.model.*;
+import org.locationtech.jtstest.testbuilder.ui.Viewport;
+
+
+public abstract class BasicTool implements Tool
+{
+ protected Cursor cursor = Cursor.getDefaultCursor();
+
+ private PrecisionModel gridPM;
+
+ private GeometryEditPanel panel;
+
+ public BasicTool() {
+ super();
+ }
+
+ public BasicTool(Cursor cursor) {
+ super();
+ this.cursor = cursor;
+ }
+
+ protected Graphics2D getGraphics2D() {
+ Graphics2D g = (Graphics2D) panel().getGraphics();
+ if (g != null) {
+ // guard against g == null
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ }
+ return g;
+ }
+
+ public void mouseClicked(MouseEvent e) {}
+ public void mousePressed(MouseEvent e) {}
+ public void mouseReleased(MouseEvent e) {}
+ public void mouseEntered(MouseEvent e) {}
+ public void mouseExited(MouseEvent e) {}
+ public void mouseDragged(MouseEvent e) { }
+ public void keyPressed(KeyEvent e) { }
+ public void keyReleased(KeyEvent e) { }
+ public void keyTyped(KeyEvent e) { }
+ public void mouseMoved(MouseEvent e) { }
+ public void mouseWheelMoved(MouseWheelEvent e) { }
+
+ public Cursor getCursor()
+ {
+ return cursor;
+ }
+
+ /**
+ * Called when tool is activated.
+ *
+ * If subclasses override this method they must call <tt>super.activate()</tt>.
+ */
+ public void activate(GeometryEditPanel panel)
+ {
+ this.panel = panel;
+ gridPM = getViewport().getGridPrecisionModel();
+ this.panel.setCursor(getCursor());
+ this.panel.addMouseListener(this);
+ this.panel.addMouseMotionListener(this);
+ this.panel.addMouseWheelListener(this);
+ }
+
+ public void deactivate()
+ {
+ this.panel.removeMouseListener(this);
+ this.panel.removeMouseMotionListener(this);
+ this.panel.removeMouseWheelListener(this);
+ }
+
+ protected GeometryEditPanel panel()
+ {
+ // this should probably be passed in during setup
+ //return JTSTestBuilderFrame.instance().getTestCasePanel().getGeometryEditPanel();
+ return panel;
+ }
+
+ protected GeometryEditModel geomModel()
+ {
+ // this should probably be passed in during setup
+ return JTSTestBuilder.model().getGeometryEditModel();
+ }
+
+ private Viewport getViewport()
+ {
+ return panel().getViewport();
+ }
+
+ Point2D toView(Coordinate modePt)
+ {
+ return getViewport().toView(modePt);
+ }
+
+ double toView(double distance)
+ {
+ return getViewport().toView(distance);
+ }
+
+ Point2D toModel(java.awt.Point viewPt)
+ {
+ return getViewport().toModel(viewPt);
+ }
+
+ Coordinate toModelCoordinate(java.awt.Point viewPt)
+ {
+ return getViewport().toModelCoordinate(viewPt);
+ }
+
+ double toModel(double viewDist)
+ {
+ return viewDist / getViewport().getScale();
+ }
+
+ double getModelSnapTolerance()
+ {
+ return toModel(AppConstants.TOLERANCE_PIXELS);
+ }
+
+ protected Coordinate toModelSnapped(Point2D p)
+ {
+ return toModelSnappedIfCloseToViewGrid(p);
+ }
+
+ protected Coordinate toModelSnappedToViewGrid(Point2D p)
+ {
+ // snap to view grid
+ Coordinate pModel = getViewport().toModelCoordinate(p);
+ gridPM.makePrecise(pModel);
+ return pModel;
+ }
+
+ protected Coordinate toModelSnappedIfCloseToViewGrid(Point2D p)
+ {
+ // snap to view grid if close to view grid point
+ Coordinate pModel = getViewport().toModelCoordinate(p);
+ Coordinate pSnappedModel = new Coordinate(pModel);
+ gridPM.makePrecise(pSnappedModel);
+
+ double tol = getModelSnapTolerance();
+ if (pModel.distance(pSnappedModel) <= tol)
+ return pSnappedModel;
+ return pModel;
+ }
+
+ protected double gridSize()
+ {
+ return getViewport().getGridSizeModel();
+ }
+
+ /*
+ protected Coordinate toModelSnappedToDrawingGrid(Point2D p)
+ {
+ Point2D pt = panel().snapToGrid(getViewport().toModel(p));
+ return new Coordinate(pt.getX(), pt.getY());
+ }
+ */
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BoxBandTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BoxBandTool.java
new file mode 100644
index 0000000..da6d999
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BoxBandTool.java
@@ -0,0 +1,182 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.SwingUtilities;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilder;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+
+
+
+/**
+ * @version 1.7
+ */
+public abstract class BoxBandTool extends IndicatorTool
+{
+
+ private Point zoomBoxStart = null;
+ private Point zoomBoxEnd = null;
+
+ public BoxBandTool() { }
+
+ public BoxBandTool(Cursor cursor) {
+ super(cursor);
+ }
+
+ public void mousePressed(MouseEvent e)
+ {
+ zoomBoxStart = e.getPoint();
+ zoomBoxEnd = null;
+ }
+
+ public void mouseReleased(MouseEvent e)
+ {
+ clearIndicator();
+ // don't process this event if the mouse was clicked or dragged a very short distance
+ if (! isSignificantMouseMove())
+ return;
+
+ gestureFinished();
+ }
+
+ public void mouseDragged(MouseEvent e)
+ {
+ super.mouseDragged(e);
+ zoomBoxEnd = e.getPoint();
+ redrawIndicator();
+ }
+
+ protected Shape getShape()
+ {
+ if (zoomBoxEnd == null) return null;
+
+ Envelope envModel = getEnvelope();
+
+ Point2D base = toView(new Coordinate(envModel.getMinX(), envModel.getMaxY()));
+ double width = toView(envModel.getWidth());
+ double height = toView(envModel.getHeight());
+ return new Rectangle2D.Double(base.getX(), base.getY(), width, height);
+ }
+
+ private static final int MIN_MOVEMENT = 3;
+
+ private boolean isSignificantMouseMove()
+ {
+ if (zoomBoxEnd == null) return false;
+
+ if (Math.abs(zoomBoxStart.x - zoomBoxEnd.x) < MIN_MOVEMENT)
+ return false;
+ if (Math.abs(zoomBoxStart.y - zoomBoxEnd.y) < MIN_MOVEMENT)
+ return false;
+ return true;
+ }
+
+ /**
+ * Gets the envelope of the indicated rectangle,
+ * in model coordinates.
+ *
+ * @return
+ */
+ protected Envelope getEnvelope() {
+ Coordinate start = toModelSnapped(zoomBoxStart);
+ Coordinate end = toModelSnapped(zoomBoxEnd);
+ return new Envelope(start, end);
+ }
+
+ protected Geometry getBox()
+ {
+ return JTSTestBuilder.getGeometryFactory().toGeometry(getEnvelope());
+ }
+
+ /**
+ * Getes the coordinates for the rectangle
+ * starting with the lower left point.
+ * The coordinates are oriented CW.
+ *
+ * @return the coordinates for the rectangle
+ */
+ protected List getCoordinatesOfEnvelope()
+ {
+ Envelope env = getEnvelope();
+
+ List coords = new ArrayList();
+ coords.add(new Coordinate(env.getMinX(), env.getMinY()));
+ coords.add(new Coordinate(env.getMinX(), env.getMaxY()));
+ coords.add(new Coordinate(env.getMaxX(), env.getMaxY()));
+ coords.add(new Coordinate(env.getMaxX(), env.getMinY()));
+ coords.add(new Coordinate(env.getMinX(), env.getMinY()));
+ return coords;
+ }
+
+ /**
+ * Gets the coordinates for the rectangle
+ * starting at the first point clicked.
+ * The coordinates are oriented CW.
+ *
+ * @return the coordinates for the rectangle
+ */
+ protected List getCoordinates()
+ {
+ Coordinate start = toModelSnapped(zoomBoxStart);
+ Coordinate end = toModelSnapped(zoomBoxEnd);
+
+ boolean isCW = (start.x < end.x && start.y < end.y)
+ || (start.x > end.x && start.y > end.y);
+
+ Coordinate mid1 = new Coordinate(start.x, end.y);
+ Coordinate mid2 = new Coordinate(end.x, start.y);
+
+ /**
+ * Form rectangle starting at start point,
+ * and oriented CW.
+ */
+ List coords = new ArrayList();
+ coords.add(new Coordinate(start));
+ if (isCW)
+ coords.add(mid1);
+ else
+ coords.add(mid2);
+
+ coords.add(new Coordinate(end));
+
+ if (isCW)
+ coords.add(mid2);
+ else
+ coords.add(mid1);
+
+ coords.add(new Coordinate(start));
+ return coords;
+ }
+
+
+ protected void gestureFinished()
+ {
+ // basic tool does nothing.
+ // Subclasses should override
+ }
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/DeleteVertexTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/DeleteVertexTool.java
new file mode 100644
index 0000000..3acf9c3
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/DeleteVertexTool.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testbuilder.geom.GeometryBoxDeleter;
+
+
+/**
+ * Deletes vertices within a selection box from a geometry component
+ * @version 1.7
+ */
+public class DeleteVertexTool extends BoxBandTool {
+ private static DeleteVertexTool singleton = null;
+
+ public static DeleteVertexTool getInstance() {
+ if (singleton == null)
+ singleton = new DeleteVertexTool();
+ return singleton;
+ }
+
+ private DeleteVertexTool() {
+ super();
+ }
+
+ protected void gestureFinished()
+ {
+ Envelope env = getBox().getEnvelopeInternal();
+ Geometry g = geomModel().getGeometry();
+ Geometry edit = GeometryBoxDeleter.delete(g, env);
+ geomModel().setGeometry(edit);
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/EditVertexTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/EditVertexTool.java
new file mode 100644
index 0000000..5ba52e9
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/EditVertexTool.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.*;
+import java.awt.geom.*;
+import java.awt.event.MouseEvent;
+
+import javax.swing.SwingUtilities;
+
+import org.locationtech.jts.awt.GeometryCollectionShape;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jtstest.testbuilder.AppCursors;
+import org.locationtech.jtstest.testbuilder.IconLoader;
+import org.locationtech.jtstest.testbuilder.geom.*;
+
+
+/**
+ * @version 1.7
+ */
+public class EditVertexTool
+extends IndicatorTool
+{
+ private static EditVertexTool instance = null;
+
+ //Point2D currentIndicatorLoc = null;
+ Coordinate currentVertexLoc = null;
+
+ private Coordinate selectedVertexLocation = null;
+ private Coordinate[] adjVertices = null;
+
+ public static EditVertexTool getInstance() {
+ if (instance == null)
+ instance = new EditVertexTool();
+ return instance;
+ }
+
+ private EditVertexTool() {
+ super(AppCursors.EDIT_VERTEX);
+ }
+
+ public void mousePressed(MouseEvent e) {
+ currentVertexLoc = null;
+ if (SwingUtilities.isRightMouseButton(e))
+ return;
+
+ // initiate moving a vertex
+ Coordinate mousePtModel = toModelCoordinate(e.getPoint());
+ double tolModel = getModelSnapTolerance();
+
+ selectedVertexLocation = geomModel().locateVertexPt(mousePtModel, tolModel);
+ if (selectedVertexLocation != null) {
+ adjVertices = geomModel().findAdjacentVertices(selectedVertexLocation);
+ currentVertexLoc = selectedVertexLocation;
+ redrawIndicator();
+ }
+ }
+
+ public void mouseReleased(MouseEvent e) {
+ if (SwingUtilities.isRightMouseButton(e))
+ return;
+
+ clearIndicator();
+ // finish the move of the vertex
+ if (selectedVertexLocation != null) {
+ Coordinate newLoc = toModelSnapped(e.getPoint());
+ geomModel().moveVertex(selectedVertexLocation, newLoc);
+ }
+ }
+
+ public void mouseDragged(MouseEvent e) {
+ currentVertexLoc = toModelSnapped(e.getPoint());
+ if (selectedVertexLocation != null)
+ redrawIndicator();
+ }
+
+ public void mouseClicked(MouseEvent e) {
+ if (! SwingUtilities.isRightMouseButton(e))
+ return;
+
+ Coordinate mousePtModel = toModelCoordinate(e.getPoint());
+ double tolModel = getModelSnapTolerance();
+
+ boolean isMove = ! e.isControlDown();
+ if (isMove) {
+ GeometryLocation geomLoc = geomModel().locateNonVertexPoint(mousePtModel, tolModel);
+ //System.out.println("Testing: insert vertex at " + geomLoc);
+ if (geomLoc != null) {
+ geomModel().setGeometry(geomLoc.insert());
+ }
+ }
+ else { // is a delete
+ GeometryLocation geomLoc = geomModel().locateVertex(mousePtModel, tolModel);
+ //System.out.println("Testing: delete vertex at " + geomLoc);
+ if (geomLoc != null) {
+ geomModel().setGeometry(geomLoc.delete());
+ }
+ }
+ }
+
+ protected Shape getShape()
+ {
+ GeometryCollectionShape ind = new GeometryCollectionShape();
+ Point2D currentIndicatorLoc = toView(currentVertexLoc);
+ ind.add(getIndicatorCircle(currentIndicatorLoc));
+ if (adjVertices != null) {
+ for (int i = 0; i < adjVertices.length; i++) {
+ GeneralPath line = new GeneralPath();
+ line.moveTo((float) currentIndicatorLoc.getX(), (float) currentIndicatorLoc.getY());
+ Point2D pt = toView(adjVertices[i]);
+ line.lineTo((float) pt.getX(), (float) pt.getY());
+ ind.add(line);
+ }
+ }
+ return ind;
+
+// return getIndicatorCircle(currentIndicatorLoc);
+ }
+
+ private static final double IND_CIRCLE_RADIUS = 10.0;
+
+ protected Shape getIndicatorCircle(Point2D p) {
+ return new Ellipse2D.Double(p.getX() - (IND_CIRCLE_RADIUS / 2), p.getY()
+ - (IND_CIRCLE_RADIUS / 2), IND_CIRCLE_RADIUS, IND_CIRCLE_RADIUS);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java
new file mode 100644
index 0000000..662ba73
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import org.locationtech.jtstest.testbuilder.controller.JTSTestBuilderController;
+
+/**
+ * Extracts a component of a geometry to a new Test Case
+ * @version 1.7
+ */
+public class ExtractComponentTool extends BoxBandTool {
+ private static ExtractComponentTool singleton = null;
+
+ public static ExtractComponentTool getInstance() {
+ if (singleton == null)
+ singleton = new ExtractComponentTool();
+ return singleton;
+ }
+
+ private ExtractComponentTool() {
+ super();
+ }
+
+ protected void gestureFinished()
+ {
+ JTSTestBuilderController.extractComponentsToTestCase(getBox());
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/IndicatorTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/IndicatorTool.java
new file mode 100644
index 0000000..ba19d24
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/IndicatorTool.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.geom.Point2D;
+
+import org.locationtech.jts.awt.FontGlyphReader;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+public abstract class IndicatorTool extends BasicTool
+{
+ private Color bandColor = AppConstants.BAND_CLR;
+
+ private Point mousePoint;
+ private Shape lastShapeDrawn;
+ private String lastLabelDrawn = null;
+ private Point lastLabelLoc = null;
+
+ private boolean isIndicatorVisible = false;
+ private Color originalColor;
+ private Stroke originalStroke;
+ private Font originalFont;
+
+ public IndicatorTool() {
+ super();
+ }
+
+ public IndicatorTool(Cursor cursor) {
+ super(cursor);
+ }
+
+ /**
+ * Gets the shape for displaying the current state of the action.
+ * Subclasses should override.
+ *
+ * @return null if nothing should be drawn
+ */
+ protected Shape getShape()
+ {
+ return null;
+ }
+
+ /**
+ * Important for XOR drawing. Even if #getShape returns null, this method
+ * will return true between calls of #redrawShape and #clearShape.
+ */
+ public boolean isIndicatorVisible() {
+ return isIndicatorVisible;
+ }
+
+ private void setIndicatorVisible(boolean isIndicatorVisible) {
+ this.isIndicatorVisible = isIndicatorVisible;
+ }
+
+ protected void clearIndicator() {
+ clearShape(getGraphics2D());
+ }
+
+ protected void redrawIndicator()
+ {
+ try {
+ redrawShape(getGraphics2D());
+ }
+ catch (Exception ex) {
+ // no other way to handle exception
+ ex.printStackTrace();
+ }
+ }
+
+ private void clearShape(Graphics2D graphics) {
+ if (!isIndicatorVisible) {
+ return;
+ }
+ drawShapeXOR(graphics, lastShapeDrawn, lastLabelDrawn, lastLabelLoc);
+ setIndicatorVisible(false);
+ }
+
+ private void redrawShape(Graphics2D graphics) throws Exception {
+ clearShape(graphics);
+ drawShapeXOR(graphics);
+ setIndicatorVisible(true);
+ }
+
+ private void drawShapeXOR(Graphics2D g) throws Exception {
+ Shape newShape = getShape();
+ String label = getLabel();
+ drawShapeXOR(g, newShape, label, mousePoint);
+ lastShapeDrawn = newShape;
+ lastLabelDrawn = label;
+ lastLabelLoc = mousePoint;
+ }
+
+ private void drawShapeXOR(Graphics2D graphics, Shape shape, String label, Point labelLoc) {
+ setup(graphics);
+ try {
+ if (shape != null) {
+ graphics.draw(shape);
+ }
+ /*
+ // TODO: make this work
+ if (label != null)
+ graphics.drawString(label, labelLoc.x, labelLoc.y);
+*/
+ }
+ finally {
+ teardown(graphics);
+ }
+ }
+
+ private void setup(Graphics2D graphics) {
+ originalColor = graphics.getColor();
+ originalStroke = graphics.getStroke();
+ originalFont = graphics.getFont();
+ graphics.setFont(new Font(FontGlyphReader.FONT_SANSSERIF, Font.PLAIN, 14));
+ graphics.setColor(bandColor);
+ graphics.setXORMode(Color.white);
+ }
+
+ private void teardown(Graphics2D graphics) {
+ graphics.setPaintMode();
+ graphics.setColor(originalColor);
+ graphics.setStroke(originalStroke);
+ graphics.setFont(originalFont);
+ }
+
+ /*
+ protected void setStroke(Stroke stroke) {
+ this.stroke = stroke;
+ }
+*/
+
+ private void recordLabel(Point p)
+ {
+ mousePoint = new Point(p.x + 5, p.y);
+ }
+
+ private String getLabel()
+ {
+ if (mousePoint == null) return null;
+ return mousePoint.x + "," + mousePoint.y;
+ }
+
+// protected void gestureFinished() throws Exception;
+
+ public void mouseDragged(MouseEvent e)
+ {
+ recordLabel(e.getPoint());
+ }
+
+ public void mouseMoved(MouseEvent e) {
+ recordLabel(e.getPoint());
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/InfoTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/InfoTool.java
new file mode 100644
index 0000000..28d53a0
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/InfoTool.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.event.MouseEvent;
+
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+
+
+/**
+ * @version 1.7
+ */
+public class InfoTool extends BasicTool {
+ private static InfoTool singleton = null;
+
+ public static InfoTool getInstance() {
+ if (singleton == null)
+ singleton = new InfoTool();
+ return singleton;
+ }
+
+ private InfoTool() {
+ }
+
+ public void mousePressed(MouseEvent e)
+ {
+ JTSTestBuilderFrame.instance().displayInfo(toModelCoordinate(e.getPoint()));
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/LineBandTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/LineBandTool.java
new file mode 100644
index 0000000..5a9ccc3
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/LineBandTool.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Collections;
+
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.geom.*;
+
+import org.locationtech.jts.geom.*;
+
+public abstract class LineBandTool extends IndicatorTool
+{
+ private List coordinates = new ArrayList(); // in model space
+ protected Coordinate tentativeCoordinate;
+
+ // set this to true if band should be closed
+ private boolean closeRing = false;
+ private int clickCountToFinish = 2;
+ private boolean drawBandLines = true;
+
+ public LineBandTool() {
+ super();
+ }
+
+ public LineBandTool(Cursor cursor) {
+ super(cursor);
+ }
+
+ protected void setCloseRing(boolean closeRing) {
+ this.closeRing = closeRing;
+ }
+
+ protected void setClickCountToFinishGesture(int clickCountToFinish)
+ {
+ this.clickCountToFinish = clickCountToFinish;
+ }
+
+ protected void setDrawBandLines(boolean drawBandLines)
+ {
+ this.drawBandLines = drawBandLines;
+ }
+
+ /**
+ * Returns an empty List once the shape is cleared.
+ *
+ * @see LineBandTool#clearShape
+ */
+ public List getCoordinates() {
+ return Collections.unmodifiableList(coordinates);
+ }
+
+ public Coordinate lastCoordinate()
+ {
+ if (coordinates.size() <= 0) return null;
+ return (Coordinate) coordinates.get(coordinates.size()-1);
+ }
+
+ public void mouseReleased(MouseEvent e) {
+ try {
+ // Can't assert that coordinates is not empty at this point
+ // because
+ // of the following situation: NClickTool, n=1, user
+ // double-clicks.
+ // Two events are generated: clickCount=1 and clickCount=2.
+ // When #mouseReleased is called with the clickCount=1 event,
+ // coordinates is not empty. But then #finishGesture is called and
+ // the
+ // coordinates are cleared. When #mouseReleased is then called
+ // with
+ // the clickCount=2 event, coordinates is empty!
+
+ // Even though drawing is done in #mouseLocationChanged, call it
+ // here
+ // also so that #isGestureInProgress returns true on a mouse
+ // click.
+ // This is mainly for the benefit of OrCompositeTool, which
+ // calls #isGestureInProgress.
+ // Can't do this in #mouseClicked because #finishGesture may be
+ // called
+ // by #mouseReleased (below), which happens before #mouseClicked,
+ // resulting in an IndexOutOfBoundsException in #redrawShape.
+ if (e.getClickCount() == 1) {
+ // A double-click will generate two events: one with
+ // click-count = 1 and
+ // another with click-count = 2. Handle the click-count = 1
+ // event and
+ // ignore the rest. Otherwise, the following problem can
+ // occur:
+ // -- A click-count = 1 event is generated; #redrawShape is
+ // called
+ // -- #isFinishingClick returns true; #finishGesture is called
+ // -- #finishGesture clears the points
+ // -- A click-count = 2 event is generated; #redrawShape is
+ // called.
+ // An IndexOutOfBoundsException is thrown because points is
+ // empty.
+ tentativeCoordinate = toModelSnapped(e.getPoint());
+ redrawIndicator();
+ }
+
+ super.mouseReleased(e);
+
+ // Check for finish at #mouseReleased rather than #mouseClicked.
+ // #mouseReleased is a more general condition, as it applies to
+ // both
+ // drags and clicks.
+ if (isFinishingRelease(e)) {
+ finishGesture();
+ }
+ } catch (Throwable t) {
+ }
+ }
+
+ protected void mouseLocationChanged(MouseEvent e) {
+ try {
+ tentativeCoordinate = toModelSnapped(e.getPoint());
+ redrawIndicator();
+ } catch (Throwable t) {
+ }
+ }
+
+ public void mouseMoved(MouseEvent e) {
+ super.mouseMoved(e);
+ mouseLocationChanged(e);
+ }
+
+ public void mouseDragged(MouseEvent e) {
+ super.mouseDragged(e);
+ mouseLocationChanged(e);
+ }
+
+ protected void add(Coordinate c) {
+ // don't add repeated coords
+ if (coordinates.size() > 0 && c.equals2D((Coordinate) coordinates.get(coordinates.size()-1)))
+ return;
+ coordinates.add(c);
+ }
+
+ public void mousePressed(MouseEvent e) {
+ try {
+ super.mousePressed(e);
+
+ // Don't add more than one point for double-clicks. A double-click
+ // will
+ // generate two events: one with click-count = 1 and another with
+ // click-count = 2. Handle the click-count = 1 event and ignore
+ // the rest.
+ if (e.getClickCount() != 1) {
+ return;
+ }
+
+ add(toModelSnapped(e.getPoint()));
+ } catch (Throwable t) {
+ // getPanel().getContext().handleThrowable(t);
+ }
+ }
+
+ protected Shape getShape() {
+ if (coordinates.isEmpty()) {
+ return null;
+ }
+ Point2D firstPoint = toView(
+ (Coordinate) coordinates.get(0));
+ GeneralPath path = new GeneralPath();
+ path.moveTo((float) firstPoint.getX(), (float) firstPoint.getY());
+ if (! drawBandLines)
+ return path;
+
+ for (int i = 1; i < coordinates.size(); i++) {
+ Coordinate nextCoordinate = (Coordinate) coordinates.get(i);
+ Point2D nextPoint = toView(nextCoordinate);
+ path.lineTo((int) nextPoint.getX(), (int) nextPoint.getY());
+ }
+ Point2D tentativePoint = toView(tentativeCoordinate);
+ path.lineTo((int) tentativePoint.getX(), (int) tentativePoint.getY());
+ // close path (for rings only)
+ if (closeRing)
+ path.lineTo((int) firstPoint.getX(), (int) firstPoint.getY());
+
+ drawVertices(path);
+
+ return path;
+ }
+
+ private void drawVertices(GeneralPath path)
+ {
+ for (int i = 0; i < coordinates.size(); i++) {
+ Coordinate coord = (Coordinate) coordinates.get(i);
+ Point2D p = toView(coord);
+ path.moveTo((int) p.getX()-2, (int) p.getY()-2);
+ path.lineTo((int) p.getX()+2, (int) p.getY()-2);
+ path.lineTo((int) p.getX()+2, (int) p.getY()+2);
+ path.lineTo((int) p.getX()-2, (int) p.getY()+2);
+ path.lineTo((int) p.getX()-2, (int) p.getY()-2);
+ }
+
+ }
+
+ protected boolean isFinishingRelease(MouseEvent e) {
+ return e.getClickCount() == clickCountToFinish;
+ }
+
+ protected Coordinate[] toArray(List coordinates) {
+ return (Coordinate[]) coordinates.toArray(new Coordinate[] {});
+ }
+
+ protected void finishGesture() throws Exception {
+ clearIndicator();
+ try {
+ bandFinished();
+ }
+ finally {
+ coordinates.clear();
+ }
+ }
+
+ protected abstract void bandFinished() throws Exception;
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/LineStringTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/LineStringTool.java
new file mode 100644
index 0000000..743b2a8
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/LineStringTool.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+/**
+ * @version 1.7
+ */
+public class LineStringTool extends AbstractStreamDrawTool
+{
+ private static LineStringTool singleton = null;
+
+ public static LineStringTool getInstance() {
+ if (singleton == null)
+ singleton = new LineStringTool();
+ return singleton;
+ }
+
+ private LineStringTool()
+ {
+ }
+
+ protected int getGeometryType()
+ {
+ return GeometryType.LINESTRING;
+ }
+ }
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PanTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PanTool.java
new file mode 100644
index 0000000..4381825
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PanTool.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.Cursor;
+import java.awt.Toolkit;
+import java.awt.event.MouseEvent;
+import java.awt.geom.Point2D;
+
+import org.locationtech.jtstest.*;
+import org.locationtech.jtstest.testbuilder.AppCursors;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+
+
+/**
+ * @version 1.7
+ */
+public class PanTool extends BasicTool {
+ private static PanTool singleton = null;
+
+ public static PanTool getInstance() {
+ if (singleton == null)
+ singleton = new PanTool();
+ return singleton;
+ }
+
+ private Point2D source;
+
+ private PanTool() {
+ }
+
+ public Cursor getCursor() {
+ return AppCursors.HAND;
+ }
+
+ public void activate() {
+ source = null;
+ }
+
+ public void mousePressed(MouseEvent e) {
+ source = toModel(e.getPoint());
+ }
+
+ public void mouseReleased(MouseEvent e) {
+ if (source == null)
+ return;
+ Point2D destination = toModel(e.getPoint());
+ pan(panel(), source, destination);
+ }
+
+ public static void pan(GeometryEditPanel panel, Point2D source, Point2D destination ) {
+ double xDisplacement = destination.getX() - source.getX();
+ double yDisplacement = destination.getY() - source.getY();
+ panel.zoomPan(xDisplacement, yDisplacement);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PointTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PointTool.java
new file mode 100644
index 0000000..3ec41e7
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PointTool.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+/**
+ * @version 1.7
+ */
+public class PointTool extends AbstractDrawTool
+{
+ private static PointTool singleton = null;
+
+ public static PointTool getInstance() {
+ if (singleton == null)
+ singleton = new PointTool();
+ return singleton;
+ }
+
+ private PointTool()
+ {
+ setClickCountToFinishGesture(1);
+ setDrawBandLines(false);
+ }
+
+ protected int getGeometryType()
+ {
+ return GeometryType.POINT;
+ }
+ }
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PolygonTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PolygonTool.java
new file mode 100644
index 0000000..df04676
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/PolygonTool.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+/**
+ * @version 1.7
+ */
+public class PolygonTool extends AbstractDrawTool
+{
+ private static PolygonTool singleton = null;
+
+ public static PolygonTool getInstance() {
+ if (singleton == null)
+ singleton = new PolygonTool();
+ return singleton;
+ }
+
+ private PolygonTool()
+ {
+ }
+
+ protected int getGeometryType()
+ {
+ return GeometryType.POLYGON;
+ }
+ }
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/RectangleTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/RectangleTool.java
new file mode 100644
index 0000000..d85292c
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/RectangleTool.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.Cursor;
+
+import org.locationtech.jtstest.testbuilder.model.GeometryType;
+
+
+public class RectangleTool
+extends BoxBandTool
+{
+ private static RectangleTool singleton = null;
+
+ public static RectangleTool getInstance() {
+ if (singleton == null)
+ singleton = new RectangleTool();
+ return singleton;
+ }
+
+ public RectangleTool() {
+ super(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
+ }
+
+ protected void gestureFinished()
+ {
+ geomModel().setGeometryType(GeometryType.POLYGON);
+ geomModel().addComponent(getCoordinates());
+ panel().updateGeom();
+ }
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/StreamPolygonTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/StreamPolygonTool.java
new file mode 100644
index 0000000..ab305d0
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/StreamPolygonTool.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import org.locationtech.jtstest.testbuilder.model.*;
+
+
+/**
+ * @version 1.7
+ */
+public class StreamPolygonTool extends AbstractStreamDrawTool
+{
+ private static StreamPolygonTool singleton = null;
+
+ public static StreamPolygonTool getInstance() {
+ if (singleton == null)
+ singleton = new StreamPolygonTool();
+ return singleton;
+ }
+
+ private StreamPolygonTool()
+ {
+ super();
+ }
+
+ protected int getGeometryType()
+ {
+ return GeometryType.POLYGON;
+ }
+ }
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/Tool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/Tool.java
new file mode 100644
index 0000000..2501b7b
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/Tool.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.Cursor;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelListener;
+
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+
+
+
+/**
+ * @version 1.7
+ */
+public interface Tool extends MouseListener, MouseMotionListener, MouseWheelListener, KeyListener {
+
+ Cursor getCursor();
+
+ void activate(GeometryEditPanel panel);
+
+ void deactivate();
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ZoomTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ZoomTool.java
new file mode 100644
index 0000000..566a0bb
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ZoomTool.java
@@ -0,0 +1,118 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.testbuilder.ui.tools;
+
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.geom.Point2D;
+
+import javax.swing.SwingUtilities;
+
+import org.locationtech.jtstest.testbuilder.AppConstants;
+import org.locationtech.jtstest.testbuilder.GeometryEditPanel;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+
+
+
+/**
+ * @version 1.7
+ */
+public class ZoomTool extends BasicTool
+{
+ private double zoomFactor = 2;
+ private Point zoomBoxStart = null;
+ private Point zoomBoxEnd = null;
+
+ public ZoomTool(double zoomFactor, Cursor cursor) {
+ super(cursor);
+ this.zoomFactor = zoomFactor;
+ }
+
+ public void mouseClicked(MouseEvent mouseEvent)
+ {
+ // determine if zoom in (left) or zoom out (right)
+ double realZoomFactor = SwingUtilities.isRightMouseButton(mouseEvent)
+ ? (1d / zoomFactor) : zoomFactor;
+ panel().zoom(toModel(mouseEvent.getPoint()), realZoomFactor);
+ }
+
+ public void mousePressed(MouseEvent e)
+ {
+ zoomBoxStart = e.getPoint();
+ zoomBoxEnd= e.getPoint();
+ }
+
+ public void mouseReleased(MouseEvent e) {
+ // don't process event if the mouse was clicked or dragged a very short
+ // distance
+ if (! isSignificantMouseMove(e.getPoint()))
+ return;
+
+ // do Pan
+ if (e.isControlDown()) {
+ Point2D destination = toModel(e.getPoint());
+ PanTool.pan(panel(), toModel(zoomBoxStart), destination);
+ return;
+ }
+ // no key -> do Zoom
+ panel().zoom(toModel(zoomBoxStart), toModel(zoomBoxEnd));
+ }
+
+ public void mouseDragged(MouseEvent e)
+ {
+ // if panning don't draw zoom box
+ if (e.isControlDown()) return;
+
+ Point currPoint = e.getPoint();
+ Graphics g = panel().getGraphics();
+ g.setColor(AppConstants.BAND_CLR);
+ g.setXORMode(Color.white);
+ // erase old rectangle
+ drawRect(g, zoomBoxStart, zoomBoxEnd);
+
+ // draw new zoom box
+ zoomBoxEnd = currPoint;
+ drawRect(g, zoomBoxStart, zoomBoxEnd);
+ }
+
+ public void mouseWheelMoved(MouseWheelEvent e) {
+ double notches = e.getPreciseWheelRotation();
+ double zoomFactor = Math.abs(notches) * 2;
+ if (notches > 0 && zoomFactor > 0) zoomFactor = 1.0 / zoomFactor;
+ panel().zoom(toModel(e.getPoint()), zoomFactor);
+ }
+
+ private static final int MIN_MOVEMENT = 3;
+
+ private boolean isSignificantMouseMove(Point p)
+ {
+ if (Math.abs(zoomBoxStart.x - p.x) < MIN_MOVEMENT)
+ return false;
+ if (Math.abs(zoomBoxStart.y - p.y) < MIN_MOVEMENT)
+ return false;
+ return true;
+ }
+
+ public void drawRect(Graphics g, Point p0, Point p1)
+ {
+ Point base = new Point(Math.min(p0.x, p1.x),
+ Math.min(p0.y, p1.y));
+ int width = Math.abs(p1.x - p0.x);
+ int height = Math.abs(p1.y - p0.y);
+ g.drawRect(base.x, base.y, width, height);
+ }
+
+}
+
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/ClassUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/util/ClassUtil.java
new file mode 100644
index 0000000..624c26e
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/ClassUtil.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.locationtech.jts.geom.Geometry;
+
+public class ClassUtil
+{
+ public static String getClassname(Class clz)
+ {
+ String jClassName = clz.getName();
+ int lastDotPos = jClassName.lastIndexOf(".");
+ return jClassName.substring(lastDotPos + 1, jClassName.length());
+ }
+
+ public static String[] getStringArrayClassField(Class clz, String name)
+ {
+ try {
+ Field field = clz.getField(name);
+ String[] str = (String[]) field.get(null);
+ return str;
+ }
+ catch (NoSuchFieldException ex) { }
+ catch (IllegalAccessException ex) { }
+ return null;
+ }
+
+ public static String getStringClassField(Class clz, String name)
+ {
+ try {
+ Field[] f = clz.getDeclaredFields();
+ Field field = clz.getField(name);
+ String str = (String) field.get(null);
+ return str;
+ }
+ catch (NoSuchFieldException ex) { }
+ catch (IllegalAccessException ex) { }
+ return null;
+ }
+
+ public static Object dynamicCall(String clzName, String methodName, Class[] methodParamTypes, Object[] methodArgs)
+ throws ClassNotFoundException, SecurityException, NoSuchMethodException,
+ IllegalArgumentException, InstantiationException, IllegalAccessException,
+ InvocationTargetException
+ {
+ Class clz = Class.forName(clzName);
+
+ Class[] constParTypes = new Class[] { String.class, String.class };
+ Constructor constr = clz.getConstructor(new Class[0]);
+ Object dummyto = constr.newInstance(new Object[0]);
+
+ Method meth = clz.getMethod(methodName, methodParamTypes);
+ Object result = meth.invoke(dummyto, methodArgs);
+ return result;
+ }
+
+ public static boolean isNumber(Class clz) {
+ if (clz == Double.class) return true;
+ if (clz == double.class) return true;
+ if (clz == Integer.class) return true;
+ if (clz == int.class) return true;
+ return false;
+ }
+
+ /**
+ * Converts a number-like object to a Double.
+ * If the object cannot be converted null is returned.
+ *
+ * @param o a number-like object
+ * @return the value of the number, or null
+ */
+ public static Double toDouble(Object o) {
+ double d = 0;
+ try {
+ // get Java to figure out the conversion to double
+ d = (Double) o;
+ // d = ((Number) o).doubleValue();
+ } catch (ClassCastException e) {
+ return null;
+ }
+ return new Double(d);
+ }
+
+ public static boolean isDouble(Class clz) {
+ if (clz == Double.class) return true;
+ if (clz == double.class) return true;
+ return false;
+ }
+
+ public static boolean isGeometry(Class<?> clz) {
+ return Geometry.class.isAssignableFrom(clz);
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/ExceptionFormatter.java b/modules/app/src/main/java/org/locationtech/jtstest/util/ExceptionFormatter.java
new file mode 100644
index 0000000..9773648
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/ExceptionFormatter.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.util;
+
+public class ExceptionFormatter {
+
+ public static String getFullString(Throwable ex)
+ {
+ return ex.getClass().getName() + " : " + ex.toString();
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/FileUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/util/FileUtil.java
new file mode 100644
index 0000000..2e76ae8
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/FileUtil.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.util;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Useful file utilities.
+ *
+ * @version 1.7
+ */
+public class FileUtil
+{
+ public static final String EXTENSION_SEPARATOR = ".";
+
+ public static String name(String path)
+ {
+ File file = new File(path);
+ return file.getName();
+ }
+
+ public static String extension(String path)
+ {
+ String name = name(path);
+ int extIndex = name.lastIndexOf(EXTENSION_SEPARATOR.charAt(0));
+ if (extIndex < 0) return "";
+ return name.substring(extIndex, name.length());
+ }
+
+ /**
+ * Deletes the files in the directory, but does not remove the directory.
+ */
+ public static void deleteFiles(String directoryName) {
+ File dir = new File(directoryName);
+ File[] files = dir.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ files[i].delete();
+ }
+ }
+
+ /**
+ * Returns true if the given directory exists.
+ */
+ public static boolean directoryExists(String directoryName) {
+ File directory = new File(directoryName);
+ return directory.exists();
+ }
+
+ /**
+ * Returns a List of the String's in the text file, one per line.
+ */
+ public static List getContents(String textFileName) throws FileNotFoundException, IOException {
+ List contents = new Vector();
+ FileReader fileReader = new FileReader(textFileName);
+ BufferedReader bufferedReader = new BufferedReader(fileReader);
+ String line = bufferedReader.readLine();
+ while (line != null) {
+ contents.add(line);
+ line = bufferedReader.readLine();
+ }
+ return contents;
+ }
+
+ public static String readText(String filename)
+ throws IOException
+ {
+ return readText(new File(filename));
+ }
+
+ /**
+ * Gets the contents of a text file as a single String
+ * @param file
+ * @return text file contents
+ * @throws IOException
+ */
+ public static String readText(File file)
+ throws IOException
+ {
+ String thisLine;
+ StringBuffer strb = new StringBuffer("");
+
+ FileInputStream fin = new FileInputStream(file);
+ BufferedReader br = new BufferedReader(new InputStreamReader(fin));
+ while ((thisLine = br.readLine()) != null) {
+ strb.append(thisLine + "\r\n");
+ }
+ String result = strb.toString();
+ return result;
+ }
+
+ /**
+ * Saves the String with the given filename
+ */
+ public static void setContents(String textFileName, String contents) throws IOException {
+ FileWriter fileWriter = new FileWriter(textFileName, false);
+ BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+ bufferedWriter.write(contents);
+ bufferedWriter.flush();
+ bufferedWriter.close();
+ fileWriter.close();
+ }
+
+ /**
+ * Copies the source file to the destination filename.
+ * Posted by Mark Thornton <mthorn at cix.compulink.co.uk> on Usenet.
+ */
+ public static void copyFile(File source, File destination) throws IOException {
+ RandomAccessFile out = new RandomAccessFile(destination, "rw");
+ //Tell the OS in advance how big the file will be. This may reduce fragmentation
+ out.setLength(source.length());
+ //copy the content
+ FileInputStream in = new FileInputStream(source);
+ byte[] buffer = new byte[16384];
+ while (true) {
+ int n = in.read(buffer);
+ if (n == -1)
+ break;
+ out.write(buffer, 0, n);
+ }
+ in.close();
+ out.close();
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/GeometryDataUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/util/GeometryDataUtil.java
new file mode 100644
index 0000000..31cd89f
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/GeometryDataUtil.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.util;
+
+import org.locationtech.jts.geom.Geometry;
+
+public class GeometryDataUtil
+{
+ public static void setComponentDataToIndex(Geometry geom)
+ {
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry comp = geom.getGeometryN(i);
+ comp.setUserData("Component # " + i);
+ }
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/GeometryTextCleaner.java b/modules/app/src/main/java/org/locationtech/jtstest/util/GeometryTextCleaner.java
new file mode 100644
index 0000000..54f9a6b
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/GeometryTextCleaner.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.util;
+
+/**
+ * Cleans text strings which are supposed
+ * to contain valid text for Geometries
+ * (either WKB, WKB, or GML)
+ *
+ * @author mbdavis
+ *
+ */
+public class GeometryTextCleaner
+{
+ public static final String WKT_SYMBOLS = "(),.-";
+
+ public static String cleanWKT(String input)
+ {
+ return clean(input, WKT_SYMBOLS);
+ }
+
+ private static String clean(String input, String allowedSymbols)
+ {
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < input.length(); i++) {
+ char c = input.charAt(i);
+ if (isAllowed(c, allowedSymbols))
+ buf.append(c);
+ }
+ return buf.toString();
+ }
+
+ private static boolean isAllowed(char c, String allowedSymbols)
+ {
+ if (Character.isWhitespace(c)) return true;
+ if (Character.isLetterOrDigit(c)) return true;
+ if (allowedSymbols.indexOf(c) >= 0) return true;
+ return false;
+ }
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/HSBPalette.java b/modules/app/src/main/java/org/locationtech/jtstest/util/HSBPalette.java
new file mode 100644
index 0000000..9c77786
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/HSBPalette.java
@@ -0,0 +1,79 @@
+package org.locationtech.jtstest.util;
+
+import java.awt.Color;
+
+import org.locationtech.jtstest.testbuilder.ui.ColorUtil;
+
+public class HSBPalette {
+
+ public static HSBPalette createRainbowSequential(int numHue, float s, float b) {
+ return new HSBPalette(numHue, 0, 1,
+ 1, s, s,
+ 1, b, b
+ );
+ }
+
+ public static HSBPalette createRainbowIncremental(float hInc, float s, float b) {
+ HSBPalette pal = new HSBPalette(50, 0, 1,
+ 1, s, s,
+ 1, b, b
+ );
+ pal.setHueInc(hInc);
+ return pal;
+ }
+
+ private void setHueInc(float hInc) {
+ this.hInc = hInc;
+ }
+
+ int numH = 5;
+ int numS = 3;
+ int numB = 3;
+
+ float hInc = 0.03f;
+ float sInc = 0.1f;
+ float bInc = 0.1f;
+
+ private int numEntries;
+ private float sLo;
+ private float bLo;
+ private float hBase;
+ private float hRange;
+
+ private float h1;
+
+ public HSBPalette(
+ int numH, float hBase, float hRange,
+ int numS, float sLo, float sHi,
+ int numB, float bLo, float bHi)
+ {
+ this.numH = numH;
+ this.numS = numS;
+ this.numB = numB;
+ this.hBase = hBase;
+ this.hRange = hRange;
+ this.h1 = hBase - hRange / 2;
+ this.sLo = sLo;
+ this.bLo = bLo;
+ // TODO: make this mod 1
+ this.hInc = (numH < 2) ? 0 : (hRange) / (numH - 1);
+ this.sInc = (numS < 2) ? 0 : (sHi - sLo) / (numS - 1);
+ this.bInc = (numB < 2) ? 0 : (bHi - bLo) / (numB - 1);
+ numEntries = numH * numS * numB;
+ }
+ public int numEntries() { return numEntries; }
+
+ public Color color(int index, int alpha) {
+ int i = index % numEntries;
+ int iH = i / (numS * numB);
+ int iSB = i - iH * (numS * numB);
+ int iS = iSB / numB;
+ int iB = iSB - iS * numB;
+ float h = (h1 + iH * hInc) % 1.0f;
+ float s = sLo + iS * sInc;
+ float b = bLo + iB * bInc;
+ Color chsb = Color.getHSBColor(h, s, b);
+ return ColorUtil.setAlpha(chsb, alpha);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/io/GeoJsonMultiReader.java b/modules/app/src/main/java/org/locationtech/jtstest/util/io/GeoJsonMultiReader.java
new file mode 100644
index 0000000..0c06f3e
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/io/GeoJsonMultiReader.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.util.io;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.geojson.GeoJsonReader;
+
+
+public class GeoJsonMultiReader {
+ private static final String GEOJSON_FEATURECOLLECTION = "FeatureCollection";
+ private static final String GEOJSON_COORDINATES = "coordinates";
+ private GeometryFactory geomFact;
+ private GeoJsonReader rdr;
+
+ public GeoJsonMultiReader(GeometryFactory geomFact) {
+ this.geomFact = geomFact;
+ rdr = new GeoJsonReader(geomFact);
+ }
+
+ public Geometry read(String s) throws ParseException {
+ if (isFeatureCollection(s)) {
+ return readFeatureCollection(s);
+ }
+ return readGeometry(s);
+ }
+
+ private Geometry readGeometry(String s) throws ParseException {
+ // TODO: trim string to include only Geometry object
+ return rdr.read(s);
+ }
+
+ /**
+ * Extracts all Geometry object substrings and reads them
+ * @param s
+ * @throws ParseException
+ */
+ private Geometry readFeatureCollection(String s) throws ParseException {
+ Pattern p = Pattern.compile("\\{[^\\{\\}]+?\\}");
+ Matcher m = p.matcher(s);
+ List geoms = new ArrayList();
+ while (true) {
+ boolean isFound = m.find();
+ if (! isFound) break;
+ String substr = m.group();
+ if (isGeometry(substr)) {
+ geoms.add(readGeometry(substr));
+ }
+ //System.out.println(sgeom);
+ }
+ return geomFact.createGeometryCollection(GeometryFactory.toGeometryArray(geoms));
+ }
+
+ private boolean isGeometry(String s) {
+ return s.indexOf(GEOJSON_COORDINATES) >= 0;
+ }
+
+ private static boolean isFeatureCollection(String s) {
+ return s.indexOf(GEOJSON_FEATURECOLLECTION) >= 0;
+ }
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/io/IOUtil.java b/modules/app/src/main/java/org/locationtech/jtstest/util/io/IOUtil.java
new file mode 100644
index 0000000..ebc9113
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/io/IOUtil.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.util.io;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKBHexFileReader;
+import org.locationtech.jts.io.WKBReader;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.gml2.GMLReader;
+import org.locationtech.jtstest.testbuilder.io.shapefile.Shapefile;
+import org.locationtech.jtstest.util.FileUtil;
+import org.xml.sax.SAXException;
+
+
+public class IOUtil
+{
+ public static Geometry readFile(String filename, GeometryFactory geomFact)
+ throws Exception, IOException
+ {
+ String ext = FileUtil.extension(filename);
+ if (ext.equalsIgnoreCase(".shp"))
+ return readShapefile(filename, geomFact);
+ if (ext.equalsIgnoreCase(".wkb"))
+ return readWKBHexFile(filename, geomFact);
+ if (ext.equalsIgnoreCase(".gml"))
+ return readGMLFile(filename, geomFact);
+ if (ext.equalsIgnoreCase(".geojson"))
+ return readGeoJSONFile(filename, geomFact);
+ return readWKTFile(filename, geomFact);
+ }
+
+ private static Geometry readShapefile(String filename, GeometryFactory geomFact)
+ throws Exception
+ {
+ Shapefile shpfile = new Shapefile(new FileInputStream(filename));
+ shpfile.readStream(geomFact);
+ List geomList = new ArrayList();
+ do {
+ Geometry geom = shpfile.next();
+ if (geom == null)
+ break;
+ geomList.add(geom);
+ } while (true);
+
+ return geomFact.createGeometryCollection(GeometryFactory.toGeometryArray(geomList));
+ }
+
+ private static Geometry readGMLFile(String filename, GeometryFactory geomFact)
+ throws ParseException, IOException, SAXException, ParserConfigurationException
+ {
+ return readGMLString(FileUtil.readText(filename), geomFact);
+ }
+
+ private static Geometry readWKBHexFile(String filename, GeometryFactory geomFact)
+ throws ParseException, IOException
+ {
+ return readWKBHexString(FileUtil.readText(filename), geomFact);
+ }
+
+ /*
+ private static Geometry readWKBHexString(String wkbHexFile, GeometryFactory geomFact)
+ throws ParseException, IOException
+ {
+ WKBReader reader = new WKBReader(geomFact);
+ String wkbHex = cleanHex(wkbHexFile);
+ return reader.read(WKBReader.hexToBytes(wkbHex));
+ }
+ */
+
+ private static String cleanHex(String hexStuff)
+ {
+ return hexStuff.replaceAll("[^0123456789ABCDEFabcdef]", "");
+ }
+
+ private static Geometry readWKTFile(String filename, GeometryFactory geomFact)
+ throws ParseException, IOException
+ {
+ return readWKTString(FileUtil.readText(filename), geomFact);
+ }
+
+ /**
+ * Reads one or more WKT geometries from a string.
+ *
+ * @param wkt
+ * @param geomFact
+ * @return the geometry read
+ * @throws ParseException
+ * @throws IOException
+ */
+ public static Geometry readWKTString(String wkt, GeometryFactory geomFact)
+ throws ParseException, IOException
+ {
+ WKTReader reader = new WKTReader(geomFact);
+ WKTFileReader fileReader = new WKTFileReader(new StringReader(wkt), reader);
+ List geomList = fileReader.read();
+
+ if (geomList.size() == 1)
+ return (Geometry) geomList.get(0);
+
+ return geomFact.createGeometryCollection(GeometryFactory.toGeometryArray(geomList));
+ }
+
+ public static Geometry readWKBHexString(String wkb, GeometryFactory geomFact)
+ throws ParseException, IOException
+ {
+ WKBReader reader = new WKBReader(geomFact);
+ WKBHexFileReader fileReader = new WKBHexFileReader(new StringReader(wkb), reader);
+ List geomList = fileReader.read();
+
+ if (geomList.size() == 1)
+ return (Geometry) geomList.get(0);
+
+ return geomFact.createGeometryCollection(GeometryFactory.toGeometryArray(geomList));
+ }
+
+ public static Geometry readGMLString(String gml, GeometryFactory geomFact)
+ throws ParseException, IOException, SAXException, ParserConfigurationException
+ {
+ GMLReader reader = new GMLReader();
+ Geometry geom = reader.read(gml, geomFact);
+ return geom;
+ }
+
+ private static Geometry readGeoJSONFile(String filename, GeometryFactory geomFact)
+ throws ParseException, IOException, SAXException, ParserConfigurationException
+ {
+ return readGeoJSONString(FileUtil.readText(filename), geomFact);
+ }
+
+ public static Geometry readGeoJSONString(String s, GeometryFactory geomFact)
+ throws ParseException
+ {
+ GeoJsonMultiReader reader = new GeoJsonMultiReader(geomFact);
+ Geometry geom = reader.read(s);
+ return geom;
+ }
+
+
+
+}
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/io/MultiFormatReader.java b/modules/app/src/main/java/org/locationtech/jtstest/util/io/MultiFormatReader.java
new file mode 100644
index 0000000..f6516d6
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/io/MultiFormatReader.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest.util.io;
+
+import java.io.IOException;
+
+import javax.xml.parsers.*;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.io.*;
+import org.locationtech.jts.io.geojson.GeoJsonReader;
+import org.locationtech.jts.io.gml2.*;
+
+
+/**
+ * Reads a {@link Geometry} from a string which is in either WKT, WKBHex
+ * or GML format
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class MultiFormatReader
+{
+ public static final int FORMAT_UNKNOWN = 0;
+ public static final int FORMAT_WKT = 1;
+ public static final int FORMAT_WKB = 2;
+ public static final int FORMAT_GML = 3;
+ private static final int FORMAT_GEOJSON = 4;
+
+ public static boolean isWKT(String s) {
+ return !isWKB(s) && !isGML(s);
+ }
+
+ public static boolean isWKB(String str) {
+ return isHex(str, MAX_CHARS_TO_CHECK);
+ }
+
+ public static boolean isGML(String str) {
+ return str.indexOf("<") >= 0;
+ }
+
+ public static boolean isGeoJSON(String str) {
+ return str.indexOf("{") >= 0;
+ }
+
+ public static int format(String s) {
+ if (isWKB(s))
+ return FORMAT_WKB;
+ if (isGML(s))
+ return FORMAT_GML;
+ if (isGeoJSON(s))
+ return FORMAT_GEOJSON;
+ if (isWKT(s))
+ return FORMAT_WKT;
+ return FORMAT_UNKNOWN;
+ }
+
+ private static boolean isHex(String str, int maxCharsToTest)
+ {
+ for (int i = 0; i < maxCharsToTest && i < str.length(); i++) {
+ char ch = str.charAt(i);
+ if (! isHexDigit(ch))
+ return false;
+ }
+ return true;
+ }
+
+ private static boolean isHexDigit(char ch)
+ {
+ if (Character.isDigit(ch)) return true;
+ char chLow = Character.toLowerCase(ch);
+ if (chLow >= 'a' && chLow <= 'f') return true;
+ return false;
+ }
+
+ private static final int MAX_CHARS_TO_CHECK = 6;
+
+ private GeometryFactory geomFactory;
+ private WKTReader wktReader;
+ private WKBReader wkbReader;
+
+ public MultiFormatReader()
+ {
+ this(new GeometryFactory());
+ }
+
+ public MultiFormatReader(GeometryFactory geomFactory)
+ {
+ this.geomFactory = geomFactory;
+ wktReader = new WKTReader(geomFactory);
+ wkbReader = new WKBReader(geomFactory);
+ }
+
+ public Geometry read(String geomStr)
+ throws ParseException, IOException
+ {
+ String trimStr = geomStr.trim();
+ if (isWKB(trimStr)) {
+ return IOUtil.readWKBHexString(trimStr, geomFactory);
+ }
+ if (isGML(trimStr))
+ return readGML(trimStr);
+
+ if (isGeoJSON(trimStr))
+ return readGeoJSON(trimStr);
+
+ return IOUtil.readWKTString(trimStr, geomFactory);
+ }
+
+ private Geometry readGeoJSON(String str)
+ throws ParseException
+{
+ try {
+ return (new GeoJsonMultiReader(geomFactory)).read(str);
+ }
+ catch (Exception ex) {
+ throw new ParseException(ex.getMessage());
+// ex.printStackTrace();
+ }
+ }
+
+ private Geometry readGML(String str)
+ throws ParseException
+ {
+ try {
+ return (new GMLReader()).read(str, geomFactory);
+ }
+ catch (Exception ex) {
+ throw new ParseException(ex.getMessage());
+// ex.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/io/SVGWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/util/io/SVGWriter.java
new file mode 100644
index 0000000..6706b85
--- /dev/null
+++ b/modules/app/src/main/java/org/locationtech/jtstest/util/io/SVGWriter.java
@@ -0,0 +1,610 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest.util.io;
+
+
+import java.io.*;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.util.*;
+
+/**
+ * Writes the Well-Known Text representation of a {@link Geometry}.
+ * The Well-Known Text format is defined in the
+ * OGC <A HREF="http://www.opengis.org/techno/specs.htm">
+ * <i>Simple Features Specification for SQL</i></A>.
+ * See {@link WKTReader} for a formal specification of the format syntax.
+ * <p>
+ * The <code>WKTWriter</code> outputs coordinates rounded to the precision
+ * model. Only the maximum number of decimal places
+ * necessary to represent the ordinates to the required precision will be
+ * output.
+ * <p>
+ * The SFS WKT spec does not define a special tag for {@link LinearRing}s.
+ * Under the spec, rings are output as <code>LINESTRING</code>s.
+ * In order to allow precisely specifying constructed geometries,
+ * JTS also supports a non-standard <code>LINEARRING</code> tag which is used
+ * to output LinearRings.
+ *
+ * @version 1.7
+ * @see WKTReader
+ */
+public class SVGWriter
+{
+
+ private static final int INDENT = 2;
+
+ /**
+ * Creates the <code>DecimalFormat</code> used to write <code>double</code>s
+ * with a sufficient number of decimal places.
+ *
+ *@param precisionModel the <code>PrecisionModel</code> used to determine
+ * the number of decimal places to write.
+ *@return a <code>DecimalFormat</code> that write <code>double</code>
+ * s without scientific notation.
+ */
+ private static DecimalFormat createFormatter(PrecisionModel precisionModel) {
+ // the default number of decimal places is 16, which is sufficient
+ // to accomodate the maximum precision of a double.
+ int decimalPlaces = precisionModel.getMaximumSignificantDigits();
+ // specify decimal separator explicitly to avoid problems in other locales
+ DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+ symbols.setDecimalSeparator('.');
+ String fmtString = "0" + (decimalPlaces > 0 ? "." : "")
+ + stringOfChar('#', decimalPlaces);
+ return new DecimalFormat(fmtString, symbols);
+ }
+
+ /**
+ * Returns a <code>String</code> of repeated characters.
+ *
+ *@param ch the character to repeat
+ *@param count the number of times to repeat the character
+ *@return a <code>String</code> of characters
+ */
+ public static String stringOfChar(char ch, int count) {
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < count; i++) {
+ buf.append(ch);
+ }
+ return buf.toString();
+ }
+
+ private int outputDimension = 2;
+ private DecimalFormat formatter;
+ private boolean isFormatted = false;
+ private boolean useFormatting = false;
+ private int level = 0;
+ private int coordsPerLine = -1;
+ private String indentTabStr = " ";
+
+ /**
+ * Creates a new SVGWriter with default settings
+ */
+ public SVGWriter()
+ {
+ }
+
+ /**
+ * Converts a <code>Geometry</code> to its Well-known Text representation.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ *@return a <Geometry Tagged Text> string (see the OpenGIS Simple
+ * Features Specification)
+ */
+ public String write(Geometry geometry)
+ {
+ Writer sw = new StringWriter();
+ try {
+ writeFormatted(geometry, isFormatted, sw);
+ }
+ catch (IOException ex) {
+ Assert.shouldNeverReachHere();
+ }
+ return sw.toString();
+ }
+
+ /**
+ * Converts a <code>Geometry</code> to its Well-known Text representation.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ */
+ public void write(Geometry geometry, Writer writer)
+ throws IOException
+ {
+ writeFormatted(geometry, false, writer);
+ }
+
+ /**
+ * Same as <code>write</code>, but with newlines and spaces to make the
+ * well-known text more readable.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ *@return a <Geometry Tagged Text> string (see the OpenGIS Simple
+ * Features Specification), with newlines and spaces
+ */
+ public String writeFormatted(Geometry geometry)
+ {
+ Writer sw = new StringWriter();
+ try {
+ writeFormatted(geometry, true, sw);
+ }
+ catch (IOException ex) {
+ Assert.shouldNeverReachHere();
+ }
+ return sw.toString();
+ }
+ /**
+ * Same as <code>write</code>, but with newlines and spaces to make the
+ * well-known text more readable.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ */
+ public void writeFormatted(Geometry geometry, Writer writer)
+ throws IOException
+ {
+ writeFormatted(geometry, true, writer);
+ }
+ /**
+ * Converts a <code>Geometry</code> to its Well-known Text representation.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ */
+ private void writeFormatted(Geometry geometry, boolean useFormatting, Writer writer)
+ throws IOException
+ {
+ this.useFormatting = useFormatting;
+ formatter = createFormatter(geometry.getPrecisionModel());
+ //writer.write("<g>\n");
+ appendGeometryTaggedText(geometry, 0, writer);
+ //writer.write("</g>\n");
+ }
+
+
+ /**
+ * Converts a <code>Geometry</code> to <Geometry Tagged Text> format,
+ * then appends it to the writer.
+ *
+ *@param geometry the <code>Geometry</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendGeometryTaggedText(Geometry geometry, int level, Writer writer)
+ throws IOException
+ {
+ indent(level, writer);
+
+ if (geometry instanceof Point) {
+ Point point = (Point) geometry;
+ appendPointTaggedText(point.getCoordinate(), level, writer, point.getPrecisionModel());
+ }
+ else if (geometry instanceof LinearRing) {
+ appendLinearRingTaggedText((LinearRing) geometry, level, writer);
+ }
+ else if (geometry instanceof LineString) {
+ appendLineStringTaggedText((LineString) geometry, level, writer);
+ }
+ else if (geometry instanceof Polygon) {
+ appendPolygon((Polygon) geometry, level, writer);
+ }
+ else if (geometry instanceof MultiPoint) {
+ appendMultiPointTaggedText((MultiPoint) geometry, level, writer);
+ }
+ else if (geometry instanceof MultiLineString) {
+ appendMultiLineStringTaggedText((MultiLineString) geometry, level, writer);
+ }
+ else if (geometry instanceof MultiPolygon) {
+ appendMultiPolygonTaggedText((MultiPolygon) geometry, level, writer);
+ }
+ else if (geometry instanceof GeometryCollection) {
+ appendGeometryCollectionTaggedText((GeometryCollection) geometry, level, writer);
+ }
+ else {
+ Assert.shouldNeverReachHere("Unsupported Geometry implementation:"
+ + geometry.getClass());
+ }
+
+
+ }
+
+ /**
+ * Converts a <code>Coordinate</code> to <Point Tagged Text> format,
+ * then appends it to the writer.
+ *
+ *@param coordinate the <code>Coordinate</code> to process
+ *@param writer the output writer to append to
+ *@param precisionModel the <code>PrecisionModel</code> to use to convert
+ * from a precise coordinate to an external coordinate
+ */
+ private void appendPointTaggedText(Coordinate coordinate, int level, Writer writer,
+ PrecisionModel precisionModel)
+ throws IOException
+ {
+ appendPoint(coordinate, level, writer, precisionModel);
+ }
+
+ /**
+ * Converts a <code>LineString</code> to <LineString Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param lineString the <code>LineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendLineStringTaggedText(LineString lineString, int level, Writer writer)
+ throws IOException
+ {
+ appendLineString(lineString, level, false, writer);
+ }
+
+ /**
+ * Converts a <code>LinearRing</code> to <LinearRing Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param linearRing the <code>LinearRing</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendLinearRingTaggedText(LinearRing linearRing, int level, Writer writer)
+ throws IOException
+ {
+ appendLineString(linearRing, level, false, writer);
+ }
+
+ /**
+ * Converts a <code>Polygon</code> to <Polygon Tagged Text> format,
+ * then appends it to the writer.
+ *
+ *@param polygon the <code>Polygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendPolygon(Polygon polygon, int level, Writer writer)
+ throws IOException
+ {
+ if (polygon.getNumInteriorRing() == 0) {
+ appendPolygonPolygon(polygon, level, false, writer);
+ }
+ else {
+ appendPolygonPath(polygon, level, false, writer);
+ }
+ }
+
+ /**
+ * Converts a <code>MultiPoint</code> to <MultiPoint Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param multipoint the <code>MultiPoint</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPointTaggedText(MultiPoint multipoint, int level, Writer writer)
+ throws IOException
+ {
+ appendMultiPointText(multipoint, level, writer);
+ }
+
+ /**
+ * Converts a <code>MultiLineString</code> to <MultiLineString Tagged
+ * Text> format, then appends it to the writer.
+ *
+ *@param multiLineString the <code>MultiLineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiLineStringTaggedText(MultiLineString multiLineString, int level,
+ Writer writer)
+ throws IOException
+ {
+ appendMultiLineStringText(multiLineString, level, false, writer);
+ }
+
+ /**
+ * Converts a <code>MultiPolygon</code> to <MultiPolygon Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param multiPolygon the <code>MultiPolygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPolygonTaggedText(MultiPolygon multiPolygon, int level, Writer writer)
+ throws IOException
+ {
+ appendMultiPolygonText(multiPolygon, level, writer);
+ }
+
+ /**
+ * Converts a <code>GeometryCollection</code> to <GeometryCollection
+ * Tagged Text> format, then appends it to the writer.
+ *
+ *@param geometryCollection the <code>GeometryCollection</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendGeometryCollectionTaggedText(GeometryCollection geometryCollection, int level,
+ Writer writer)
+ throws IOException
+ {
+ appendGeometryCollectionText(geometryCollection, level, writer);
+ }
+
+ /**
+ * Converts a <code>Coordinate</code> to <Point Text> format, then
+ * appends it to the writer.
+ *
+ *@param coordinate the <code>Coordinate</code> to process
+ *@param writer the output writer to append to
+ *@param precisionModel the <code>PrecisionModel</code> to use to convert
+ * from a precise coordinate to an external coordinate
+ */
+ private void appendPoint(Coordinate coordinate, int level, Writer writer,
+ PrecisionModel precisionModel)
+ throws IOException
+ {
+ writer.write("(");
+ appendCoordinate(coordinate, writer);
+ writer.write(")");
+ }
+
+ /**
+ * Appends the i'th coordinate from the sequence to the writer
+ *
+ * @param seq the <code>CoordinateSequence</code> to process
+ * @param i the index of the coordinate to write
+ * @param writer the output writer to append to
+ */
+ private void appendCoordinate(CoordinateSequence seq, int i, Writer writer)
+ throws IOException
+ {
+ writer.write(writeNumber(seq.getX(i)) + "," + writeNumber(seq.getY(i)));
+ }
+
+ /**
+ * Converts a <code>Coordinate</code> to <code><Point></code> format,
+ * then appends it to the writer.
+ *
+ *@param coordinate the <code>Coordinate</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendCoordinate(Coordinate coordinate, Writer writer)
+ throws IOException
+ {
+ writer.write(writeNumber(coordinate.x) + " " + writeNumber(coordinate.y));
+ if (outputDimension >= 3 && ! Double.isNaN(coordinate.z)) {
+ writer.write(" ");
+ writer.write(writeNumber(coordinate.z));
+ }
+ }
+
+ /**
+ * Converts a <code>double</code> to a <code>String</code>, not in scientific
+ * notation.
+ *
+ *@param d the <code>double</code> to convert
+ *@return the <code>double</code> as a <code>String</code>, not in
+ * scientific notation
+ */
+ private String writeNumber(double d) {
+ return formatter.format(d);
+ }
+
+ /**
+ * Converts a <code>LineString</code> to <LineString Text> format, then
+ * appends it to the writer.
+ *
+ *@param lineString the <code>LineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendSequencePath(CoordinateSequence seq, int level, boolean doIndent, Writer writer)
+ throws IOException
+ {
+ if (seq.size() == 0) {
+ //writer.write("EMPTY");
+ }
+ else {
+ if (doIndent) indent(level, writer);
+ for (int i = 0; i < seq.size(); i++) {
+ writer.write(" " + ((i == 0) ? "M" : "L"));
+ if (i > 0) {
+ if (coordsPerLine > 0
+ && i % coordsPerLine == 0) {
+ indent(level + 1, writer);
+ }
+ }
+ appendCoordinate(seq, i, writer);
+ }
+ }
+ }
+ private void appendSequencePoints(CoordinateSequence seq, int level, boolean doIndent, Writer writer)
+ throws IOException
+ {
+ if (seq.size() == 0) {
+ //writer.write("EMPTY");
+ }
+ else {
+ if (doIndent) indent(level, writer);
+ for (int i = 0; i < seq.size(); i++) {
+ writer.write(" ");
+ if (i > 0) {
+ if (coordsPerLine > 0
+ && i % coordsPerLine == 0) {
+ indent(level + 1, writer);
+ }
+ }
+ appendCoordinate(seq, i, writer);
+ }
+ }
+ }
+
+ /**
+ * Converts a <code>LineString</code> to <LineString Text> format, then
+ * appends it to the writer.
+ *
+ *@param lineString the <code>LineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendLineString(LineString lineString, int level, boolean doIndent, Writer writer)
+ throws IOException
+ {
+ if (doIndent) indent(level, writer);
+ writer.write("<polyline fill='none' points='");
+ appendSequencePoints(lineString.getCoordinateSequence(), level, doIndent, writer);
+ writer.write("'/>\n");
+ }
+
+ /**
+ * Converts a <code>Polygon</code> to <Polygon Text> format, then
+ * appends it to the writer.
+ *
+ *@param polygon the <code>Polygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendPolygonPolygon(Polygon polygon, int level, boolean indentFirst, Writer writer)
+ throws IOException
+ {
+ if (indentFirst) indent(level, writer);
+ writer.write("<polygon points='");
+ appendSequencePoints(polygon.getExteriorRing().getCoordinateSequence(), level, false, writer);
+ writer.write("' />\n");
+ }
+
+ private void appendPolygonPath(Polygon polygon, int level, boolean indentFirst, Writer writer)
+ throws IOException
+ {
+ if (indentFirst) indent(level, writer);
+ writer.write("<path fill-rule='evenodd' d='");
+ appendSequencePath(polygon.getExteriorRing().getCoordinateSequence(), level, false, writer);
+ for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
+ writer.write(" ");
+ appendSequencePath(polygon.getInteriorRingN(i).getCoordinateSequence(), level + 1, true, writer);
+ }
+ writer.write("' />\n");
+ }
+
+ private void appendPathStart(boolean useFillRule, Writer writer) throws IOException {
+ String fillRule = useFillRule ? "fill-rule='evenodd' " : "";
+ writer.write("<path " + fillRule + "d='");
+ }
+ private void appendPathEnd(Writer writer) throws IOException {
+ writer.write("' />\n");
+ }
+
+
+ /**
+ * Converts a <code>MultiPoint</code> to <MultiPoint Text> format, then
+ * appends it to the writer.
+ *
+ *@param multiPoint the <code>MultiPoint</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPointText(MultiPoint multiPoint, int level, Writer writer)
+ throws IOException
+ {
+ if (multiPoint.isEmpty()) {
+ writer.write("EMPTY");
+ }
+ else {
+ writer.write("(");
+ for (int i = 0; i < multiPoint.getNumGeometries(); i++) {
+ if (i > 0) {
+ writer.write(", ");
+ indentCoords(i, level + 1, writer);
+ }
+ writer.write("(");
+ appendCoordinate(((Point) multiPoint.getGeometryN(i)).getCoordinate(), writer);
+ writer.write(")");
+ }
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Converts a <code>MultiLineString</code> to <MultiLineString Text>
+ * format, then appends it to the writer.
+ *
+ *@param multiLineString the <code>MultiLineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiLineStringText(MultiLineString multiLineString, int level, boolean indentFirst,
+ Writer writer)
+ throws IOException
+ {
+ int level2 = level;
+ boolean doIndent = indentFirst;
+ for (int i = 0; i < multiLineString.getNumGeometries(); i++) {
+ if (i > 0) {
+ level2 = level + 1;
+ doIndent = true;
+ }
+ appendLineString((LineString) multiLineString.getGeometryN(i), level2, doIndent, writer);
+ }
+ }
+
+ /**
+ * Converts a <code>MultiPolygon</code> to <MultiPolygon Text> format,
+ * then appends it to the writer.
+ *
+ *@param multiPolygon the <code>MultiPolygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPolygonText(MultiPolygon multiPolygon, int level, Writer writer)
+ throws IOException
+ {
+ int level2 = level;
+ boolean doIndent = false;
+ for (int i = 0; i < multiPolygon.getNumGeometries(); i++) {
+ if (i > 0) {
+ level2 = level + 1;
+ doIndent = true;
+ }
+ appendPolygon((Polygon) multiPolygon.getGeometryN(i), level2, writer);
+ }
+ }
+
+ /**
+ * Converts a <code>GeometryCollection</code> to <GeometryCollectionText>
+ * format, then appends it to the writer.
+ *
+ *@param geometryCollection the <code>GeometryCollection</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendGeometryCollectionText(GeometryCollection geometryCollection, int level,
+ Writer writer)
+ throws IOException
+ {
+ int level2 = level;
+ for (int i = 0; i < geometryCollection.getNumGeometries(); i++) {
+ if (i > 0) {
+ level2 = level + 1;
+ }
+ appendGeometryTaggedText(geometryCollection.getGeometryN(i), level2, writer);
+ }
+ }
+
+ private void indentCoords(int coordIndex, int level, Writer writer)
+ throws IOException
+ {
+ if (coordsPerLine <= 0
+ || coordIndex % coordsPerLine != 0)
+ return;
+ indent(level, writer);
+ }
+
+ private void indent(int level, Writer writer)
+ throws IOException
+ {
+ if (! useFormatting || level <= 0)
+ return;
+ writer.write("\n");
+ for (int i = 0; i < level; i++) {
+ writer.write(indentTabStr);
+ }
+ }
+
+
+}
+
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/BinaryGeomFunction.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/BinaryGeomFunction.png
new file mode 100644
index 0000000..fddc9fe
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/BinaryGeomFunction.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/BinaryGeomFunctionWithParam.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/BinaryGeomFunctionWithParam.png
new file mode 100644
index 0000000..28ba1e7
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/BinaryGeomFunctionWithParam.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Circle.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Circle.gif
new file mode 100644
index 0000000..7bc913e
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Circle.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Copy.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Copy.png
new file mode 100644
index 0000000..fb9d13d
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Copy.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/CopyCase.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/CopyCase.png
new file mode 100644
index 0000000..7cde688
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/CopyCase.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/CopyToTest.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/CopyToTest.png
new file mode 100644
index 0000000..e6111c1
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/CopyToTest.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Cut.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Cut.gif
new file mode 100644
index 0000000..50ca3a2
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Cut.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Delete.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Delete.png
new file mode 100644
index 0000000..6387f3d
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Delete.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DeleteVertex.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DeleteVertex.png
new file mode 100644
index 0000000..fecd610
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DeleteVertex.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Delete_small.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Delete_small.png
new file mode 100644
index 0000000..5244965
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Delete_small.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Down.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Down.png
new file mode 100644
index 0000000..c58a80e
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Down.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Draw.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Draw.gif
new file mode 100644
index 0000000..8c1b37a
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Draw.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawCursor.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawCursor.png
new file mode 100644
index 0000000..110de4b
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawCursor.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLineString.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLineString.png
new file mode 100644
index 0000000..ba15b2e
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLineString.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLineStringB.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLineStringB.png
new file mode 100644
index 0000000..5e51e1d
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLineStringB.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLinearRing.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLinearRing.png
new file mode 100644
index 0000000..224cf98
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLinearRing.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLinearRingB.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLinearRingB.png
new file mode 100644
index 0000000..8eda372
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawLinearRingB.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPoint.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPoint.gif
new file mode 100644
index 0000000..22c654f
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPoint.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPoint.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPoint.png
new file mode 100644
index 0000000..f04f968
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPoint.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPointB.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPointB.png
new file mode 100644
index 0000000..801d8be
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPointB.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPolygon.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPolygon.png
new file mode 100644
index 0000000..66b65da
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPolygon.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPolygonB.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPolygonB.png
new file mode 100644
index 0000000..c14e69a
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawPolygonB.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawRectangle.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawRectangle.png
new file mode 100644
index 0000000..adddefe
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawRectangle.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawRectangleB.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawRectangleB.png
new file mode 100644
index 0000000..3ebb47f
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/DrawRectangleB.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExchangeGeoms.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExchangeGeoms.png
new file mode 100644
index 0000000..e61ea9c
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExchangeGeoms.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExecuteProject.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExecuteProject.gif
new file mode 100644
index 0000000..db9c41b
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExecuteProject.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExtractComponent.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExtractComponent.png
new file mode 100644
index 0000000..aa74f9b
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ExtractComponent.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/FingerUp.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/FingerUp.gif
new file mode 100644
index 0000000..7e1e70b
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/FingerUp.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Hand.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Hand.gif
new file mode 100644
index 0000000..811da88
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Hand.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Home.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Home.gif
new file mode 100644
index 0000000..dca0f29
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Home.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Hourglass.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Hourglass.gif
new file mode 100644
index 0000000..3bd9a1a
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Hourglass.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_GeomCollection.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_GeomCollection.png
new file mode 100644
index 0000000..4f597cd
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_GeomCollection.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_GeomCollection_B.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_GeomCollection_B.png
new file mode 100644
index 0000000..d8f9704
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_GeomCollection_B.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LineString.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LineString.png
new file mode 100644
index 0000000..92c2384
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LineString.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LineString_B.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LineString_B.png
new file mode 100644
index 0000000..438d5e8
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LineString_B.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LinearRing.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LinearRing.png
new file mode 100644
index 0000000..67006c5
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LinearRing.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LinearRing_B.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LinearRing_B.png
new file mode 100644
index 0000000..cf9915e
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_LinearRing_B.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Point.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Point.png
new file mode 100644
index 0000000..0b0f898
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Point.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Point_B.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Point_B.png
new file mode 100644
index 0000000..f554798
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Point_B.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Polygon.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Polygon.png
new file mode 100644
index 0000000..8e08754
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Polygon.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Polygon_B.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Polygon_B.png
new file mode 100644
index 0000000..4c85246
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Icon_Polygon_B.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Info.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Info.png
new file mode 100644
index 0000000..0651ca5
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Info.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/InspectGeometry.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/InspectGeometry.png
new file mode 100644
index 0000000..2e8275c
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/InspectGeometry.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Left.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Left.png
new file mode 100644
index 0000000..6583d8c
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Left.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/LoadWKTToTest.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/LoadWKTToTest.png
new file mode 100644
index 0000000..8dd5060
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/LoadWKTToTest.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyCursor.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyCursor.gif
new file mode 100644
index 0000000..2c8ec57
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyCursor.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyMinus.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyMinus.gif
new file mode 100644
index 0000000..4a81126
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyMinus.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyPlus.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyPlus.gif
new file mode 100644
index 0000000..91510f7
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MagnifyPlus.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MoveVertex.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MoveVertex.png
new file mode 100644
index 0000000..3fd76f7
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MoveVertex.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MoveVertexCursor.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MoveVertexCursor.gif
new file mode 100644
index 0000000..7374da3
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/MoveVertexCursor.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Paste.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Paste.png
new file mode 100644
index 0000000..20e66a9
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Paste.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Plus.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Plus.png
new file mode 100644
index 0000000..d728062
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Plus.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Right.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Right.png
new file mode 100644
index 0000000..508c09b
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Right.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Select.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Select.gif
new file mode 100644
index 0000000..c5bd8ea
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Select.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/UnaryGeomFunction.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/UnaryGeomFunction.png
new file mode 100644
index 0000000..f41270f
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/UnaryGeomFunction.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Up.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Up.png
new file mode 100644
index 0000000..e2bfeb3
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/Up.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/YellowCircle.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/YellowCircle.gif
new file mode 100644
index 0000000..46261fc
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/YellowCircle.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomAll.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomAll.png
new file mode 100644
index 0000000..f6b1f34
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomAll.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInput.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInput.png
new file mode 100644
index 0000000..6b60b13
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInput.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInputA.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInputA.png
new file mode 100644
index 0000000..97eba19
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInputA.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInputB.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInputB.png
new file mode 100644
index 0000000..82bea06
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomInputB.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomOneToOne.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomOneToOne.png
new file mode 100644
index 0000000..29d53f7
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomOneToOne.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomResult.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomResult.png
new file mode 100644
index 0000000..7012bcc
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/ZoomResult.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/app-icon.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/app-icon.gif
new file mode 100644
index 0000000..b88500f
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/app-icon.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/booleanGeomFunction.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/booleanGeomFunction.png
new file mode 100644
index 0000000..494748c
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/booleanGeomFunction.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/clear.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/clear.gif
new file mode 100644
index 0000000..a81d6c8
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/clear.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/crossShaded.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/crossShaded.gif
new file mode 100644
index 0000000..5df8cf3
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/crossShaded.gif differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/logo64.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/logo64.png
new file mode 100644
index 0000000..d02b1a3
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/logo64.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/numGeomFunction.png b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/numGeomFunction.png
new file mode 100644
index 0000000..1263edd
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/numGeomFunction.png differ
diff --git a/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/tickShaded.gif b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/tickShaded.gif
new file mode 100644
index 0000000..30844e8
Binary files /dev/null and b/modules/app/src/main/resources/org/locationtech/jtstest/testbuilder/tickShaded.gif differ
diff --git a/modules/app/src/test/java/org/locationtech/jtstest/TestBuilderTest.java b/modules/app/src/test/java/org/locationtech/jtstest/TestBuilderTest.java
new file mode 100644
index 0000000..a645fb3
--- /dev/null
+++ b/modules/app/src/test/java/org/locationtech/jtstest/TestBuilderTest.java
@@ -0,0 +1,48 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest;
+
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+import org.locationtech.jtstest.testbuilder.model.*;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class TestBuilderTest extends TestCase {
+
+ public TestBuilderTest(String Name_) {
+ super(Name_);
+ }
+
+ public static void main(String[] args) {
+ String[] testCaseName = {TestBuilderTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ public void testPrecisionModelXml1() {
+ PrecisionModel precisionModel = new PrecisionModel();
+ assertEquals("<precisionModel type=\"FLOATING\"/>", XMLTestWriter.toXML(precisionModel));
+ }
+
+ public void testPrecisionModelXml2() {
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ assertEquals("<precisionModel type=\"FIXED\" scale=\"1.0\"/>", XMLTestWriter.toXML(precisionModel));
+ }
+
+}
diff --git a/modules/app/src/test/java/org/locationtech/jtstest/TestFileGeometryExtractor.java b/modules/app/src/test/java/org/locationtech/jtstest/TestFileGeometryExtractor.java
new file mode 100644
index 0000000..9285b51
--- /dev/null
+++ b/modules/app/src/test/java/org/locationtech/jtstest/TestFileGeometryExtractor.java
@@ -0,0 +1,68 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jtstest;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jtstest.testrunner.TestCase;
+import org.locationtech.jtstest.testrunner.TestReader;
+import org.locationtech.jtstest.testrunner.TestRun;
+import org.locationtech.jtstest.util.FileUtil;
+import org.locationtech.jtstest.util.StringUtil;
+
+
+
+/**
+ * @version 1.7
+ */
+public class TestFileGeometryExtractor {
+
+ public TestFileGeometryExtractor() {
+ }
+ public static void main(String[] args) throws Exception {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File("c:\\blah\\isvalid.xml"), 0);
+ ArrayList geometries = new ArrayList();
+ for (Iterator i = testRun.getTestCases().iterator(); i.hasNext(); ) {
+ TestCase testCase = (TestCase) i.next();
+ add(testCase.getGeometryA(), geometries);
+ add(testCase.getGeometryB(), geometries);
+ }
+ String run = "";
+ int j = 0;
+ for (Iterator i = geometries.iterator(); i.hasNext(); ) {
+ Geometry geometry = (Geometry) i.next();
+ j++;
+ run += "<case>" + StringUtil.newLine;
+ run += " <desc>Test " + j + "</desc>" + StringUtil.newLine;
+ run += " <a>" + StringUtil.newLine;
+ run += " " + geometry + StringUtil.newLine;
+ run += " </a>" + StringUtil.newLine;
+ run += " <test> <op name=\"isValid\" arg1=\"A\"> true </op> </test>" + StringUtil.newLine;
+ run += "</case>" + StringUtil.newLine;
+ }
+ FileUtil.setContents("c:\\blah\\isvalid2.xml", run);
+ }
+
+ private static void add(Geometry geometry, ArrayList geometries) {
+ if (geometry == null) { return; }
+ for (Iterator i = geometries.iterator(); i.hasNext(); ) {
+ Geometry existingGeometry = (Geometry) i.next();
+ if (geometry.equalsExact(existingGeometry)) { return; }
+ }
+ geometries.add(geometry);
+ }
+}
diff --git a/modules/app/src/test/java/org/locationtech/jtstest/TestReaderTest.java b/modules/app/src/test/java/org/locationtech/jtstest/TestReaderTest.java
new file mode 100644
index 0000000..b995164
--- /dev/null
+++ b/modules/app/src/test/java/org/locationtech/jtstest/TestReaderTest.java
@@ -0,0 +1,284 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jtstest;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jtstest.testbuilder.JTSTestBuilderFrame;
+import org.locationtech.jtstest.testbuilder.model.TestRunnerTestCaseAdapter;
+import org.locationtech.jtstest.testbuilder.model.XMLTestWriter;
+import org.locationtech.jtstest.testrunner.TestReader;
+import org.locationtech.jtstest.testrunner.TestRun;
+import org.locationtech.jtstest.util.StringUtil;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+// MD - all tests disabled for now, since input data is missing
+public class TestReaderTest extends TestCase {
+
+ public TestReaderTest(String Name_) {
+ super(Name_);
+ }
+
+ public static void main(String[] args) {
+ String[] testCaseName = {TestReaderTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ public void testDummy()
+ {
+
+ }
+
+ public void XtestWktFile() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\testreader_wktfile.xml"), 0);
+ printParsingProblems(testReader);
+ assertNull(testRun.getWorkspace());
+ assertEquals(1, testRun.getTestCases().size());
+ org.locationtech.jtstest.testrunner.TestCase testCase = (org.locationtech.jtstest.testrunner.TestCase) testRun.getTestCases().get(0);
+ assertTrue(testCase.getGeometryA().equals(new GeometryFactory().createPoint(new Coordinate(10, 20))));
+ assertTrue(testCase.getGeometryB().equals(new GeometryFactory().createPoint(new Coordinate(30, 40))));
+
+ XMLTestWriter xmlTestWriter = new XMLTestWriter();
+
+ String expectedXML =
+ "<case>" + StringUtil.newLine +
+ " <desc>same point</desc>" + StringUtil.newLine +
+ " <a file=\"\\\\pluto\\data\\jts\\testing\\testreader_wktfile_point.xml\"/>" + StringUtil.newLine +
+ " <b>" + StringUtil.newLine +
+ " POINT (30 40)" + StringUtil.newLine +
+ " </b>" + StringUtil.newLine +
+ "<test>" + StringUtil.newLine +
+ " <op name=\"relate\" arg1=\"A\" arg2=\"B\" arg3=\"0FFFFFFF2\">" + StringUtil.newLine +
+ " true" + StringUtil.newLine +
+ " </op>" + StringUtil.newLine +
+ "</test>" + StringUtil.newLine +
+ "</case>" + StringUtil.newLine;
+ assertEquals(normalize(expectedXML), normalize(xmlTestWriter.getTestXML(new TestRunnerTestCaseAdapter(testCase))));
+
+ testCase.setGeometryA(new GeometryFactory().createPoint(new Coordinate(2, 3)));
+ expectedXML =
+ "<case>" + StringUtil.newLine +
+ " <desc>same point</desc>" + StringUtil.newLine +
+ " <a>" + StringUtil.newLine +
+ " POINT (2 3)" + StringUtil.newLine +
+ " </a>" + StringUtil.newLine +
+ " <b>" + StringUtil.newLine +
+ " POINT (30 40)" + StringUtil.newLine +
+ " </b>" + StringUtil.newLine +
+ "<test>" + StringUtil.newLine +
+ " <op name=\"relate\" arg1=\"A\" arg2=\"B\" arg3=\"0FFFFFFF2\">" + StringUtil.newLine +
+ " true" + StringUtil.newLine +
+ " </op>" + StringUtil.newLine +
+ "</test>" + StringUtil.newLine +
+ "</case>" + StringUtil.newLine;
+ assertEquals(normalize(expectedXML), normalize(xmlTestWriter.getTestXML(new TestRunnerTestCaseAdapter(testCase))));
+ }
+
+ public void XtestWktFileWorkspace() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\testReader_wktFileWorkspace.xml"), 0);
+ printParsingProblems(testReader);
+ assertEquals("\\\\pluto\\data\\jts\\testing\\x", testRun.getWorkspace().toString());
+ assertEquals(1, testRun.getTestCases().size());
+ org.locationtech.jtstest.testrunner.TestCase testCase = (org.locationtech.jtstest.testrunner.TestCase) testRun.getTestCases().get(0);
+ assertTrue(testCase.getGeometryA().equals(new GeometryFactory().createPoint(new Coordinate(5, 6))));
+ assertTrue(testCase.getGeometryB().equals(new GeometryFactory().createPoint(new Coordinate(7, 8))));
+
+ XMLTestWriter xmlTestWriter = new XMLTestWriter();
+
+ String expectedXML =
+ "<case>" + StringUtil.newLine +
+ " <desc>same point</desc>" + StringUtil.newLine +
+ " <a file=\"testReader_wktFileWorkspace_point.xml\"/>" + StringUtil.newLine +
+ " <b>" + StringUtil.newLine +
+ " POINT (7 8)" + StringUtil.newLine +
+ " </b>" + StringUtil.newLine +
+ "<test>" + StringUtil.newLine +
+ " <op name=\"relate\" arg1=\"A\" arg2=\"B\" arg3=\"0FFFFFFF2\">" + StringUtil.newLine +
+ " true" + StringUtil.newLine +
+ " </op>" + StringUtil.newLine +
+ "</test>" + StringUtil.newLine +
+ "</case>" + StringUtil.newLine;
+ assertEquals(normalize(expectedXML), normalize(xmlTestWriter.getTestXML(new TestRunnerTestCaseAdapter(testCase))));
+
+ testCase.setGeometryA(new GeometryFactory().createPoint(new Coordinate(9, 10)));
+ expectedXML =
+ "<case>" + StringUtil.newLine +
+ " <desc>same point</desc>" + StringUtil.newLine +
+ " <a>" + StringUtil.newLine +
+ " POINT (9 10)" + StringUtil.newLine +
+ " </a>" + StringUtil.newLine +
+ " <b>" + StringUtil.newLine +
+ " POINT (7 8)" + StringUtil.newLine +
+ " </b>" + StringUtil.newLine +
+ "<test>" + StringUtil.newLine +
+ " <op name=\"relate\" arg1=\"A\" arg2=\"B\" arg3=\"0FFFFFFF2\">" + StringUtil.newLine +
+ " true" + StringUtil.newLine +
+ " </op>" + StringUtil.newLine +
+ "</test>" + StringUtil.newLine +
+ "</case>" + StringUtil.newLine;
+ assertEquals(normalize(expectedXML), normalize(xmlTestWriter.getTestXML(new TestRunnerTestCaseAdapter(testCase))));
+ }
+
+ public void XtestWktFileWorkspace2() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\testReader_wktFileWorkspace2.xml"), 0);
+ printParsingProblems(testReader);
+ assertNull(testRun.getWorkspace());
+ assertEquals(1, testRun.getTestCases().size());
+ org.locationtech.jtstest.testrunner.TestCase testCase = (org.locationtech.jtstest.testrunner.TestCase) testRun.getTestCases().get(0);
+ assertTrue(testCase.getGeometryA().equals(new GeometryFactory().createPoint(new Coordinate(3, 4))));
+ assertTrue(testCase.getGeometryB().equals(new GeometryFactory().createPoint(new Coordinate(1, 2))));
+
+ XMLTestWriter xmlTestWriter = new XMLTestWriter();
+
+ String expectedXML =
+ "<case>" + StringUtil.newLine +
+ " <desc>same point</desc>" + StringUtil.newLine +
+ " <a file=\"testReader_wktFileWorkspace2_point.xml\"/>" + StringUtil.newLine +
+ " <b>" + StringUtil.newLine +
+ " POINT (1 2)" + StringUtil.newLine +
+ " </b>" + StringUtil.newLine +
+ "<test>" + StringUtil.newLine +
+ " <op name=\"relate\" arg1=\"A\" arg2=\"B\" arg3=\"0FFFFFFF2\">" + StringUtil.newLine +
+ " true" + StringUtil.newLine +
+ " </op>" + StringUtil.newLine +
+ "</test>" + StringUtil.newLine +
+ "</case>" + StringUtil.newLine;
+ assertEquals(normalize(expectedXML), normalize(xmlTestWriter.getTestXML(new TestRunnerTestCaseAdapter(testCase))));
+
+ testCase.setGeometryA(new GeometryFactory().createPoint(new Coordinate(11, 12)));
+ expectedXML =
+ "<case>" + StringUtil.newLine +
+ " <desc>same point</desc>" + StringUtil.newLine +
+ " <a>" + StringUtil.newLine +
+ " POINT (11 12)" + StringUtil.newLine +
+ " </a>" + StringUtil.newLine +
+ " <b>" + StringUtil.newLine +
+ " POINT (1 2)" + StringUtil.newLine +
+ " </b>" + StringUtil.newLine +
+ "<test>" + StringUtil.newLine +
+ " <op name=\"relate\" arg1=\"A\" arg2=\"B\" arg3=\"0FFFFFFF2\">" + StringUtil.newLine +
+ " true" + StringUtil.newLine +
+ " </op>" + StringUtil.newLine +
+ "</test>" + StringUtil.newLine +
+ "</case>" + StringUtil.newLine;
+ assertEquals(normalize(expectedXML), normalize(xmlTestWriter.getTestXML(new TestRunnerTestCaseAdapter(testCase))));
+ }
+
+ public void XtestGetWorkspaceXML() throws Exception {
+ JTSTestBuilderFrame.instance().openXmlFilesAndDirectories(new File[] {new File(
+ "\\\\pluto\\data\\jts\\testing\\testReader_getWorkspaceXML.xml")});
+ String expectedXML =
+ "<run>" +
+ " <desc>ABCDEF</desc>" +
+ " <workspace file=\"\\\\pluto\\data\\jts\\testing\"/>" +
+ " <precisionModel type=\"FLOATING\"/>" +
+ " <case>" +
+ " <a>POINT (5 6)</a>" +
+ " <b>POINT (7 8)</b>" +
+ " <test>" +
+ " <op name=\"relate\" arg1=\"A\" arg2=\"B\" arg3=\"0FFFFFFF2\">" +
+ " true" +
+ " </op>" +
+ " </test>" +
+ " </case>" +
+ "</run>";
+ assertEquals(normalize(expectedXML), normalize(JTSTestBuilderFrame.instance().getRunXml()));
+ }
+
+ public void XtestPrecisionModel_noType_scale() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\precisionModel_noType_scale.xml"), 0);
+ assertNotNull(testRun);
+ assertTrue(! testRun.getPrecisionModel().isFloating());
+ assertEquals(1, testRun.getPrecisionModel().getScale(), 1E-15);
+ }
+
+ public void XtestPrecisionModel_noType_noScale() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\precisionModel_noType_noScale.xml"), 0);
+ assertNull(testRun);
+ assertTrue(testReader.getParsingProblems().get(0).toString().indexOf("Missing type attribute in <precisionModel>") > -1);
+ }
+
+ public void XtestPrecisionModel_fixed_scale() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\precisionModel_fixed_scale.xml"), 0);
+ assertNotNull(testRun);
+ assertTrue(! testRun.getPrecisionModel().isFloating());
+ assertEquals(1, testRun.getPrecisionModel().getScale(), 1E-15);
+ }
+
+ public void XtestPrecisionModel_fixed_noScale() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\precisionModel_fixed_noScale.xml"), 0);
+ assertNull(testRun);
+ assertTrue(testReader.getParsingProblems().get(0).toString().indexOf("Missing scale attribute in <precisionModel>") > -1);
+ }
+
+ public void XtestPrecisionModel_floating_scale() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\precisionModel_floating_scale.xml"), 0);
+ assertNull(testRun);
+ assertTrue(testReader.getParsingProblems().get(0).toString().indexOf("scale attribute not allowed in floating <precisionModel>") > -1);
+ }
+
+ public void XtestPrecisionModel_floating_noScale() {
+ TestReader testReader = new TestReader();
+ TestRun testRun = testReader.createTestRun(new File(
+ "\\\\pluto\\data\\jts\\testing\\precisionModel_floating_noScale.xml"), 0);
+ assertNotNull(testRun);
+ assertTrue(testRun.getPrecisionModel().isFloating());
+ assertEquals(0, testRun.getPrecisionModel().getScale(), 1E-15);
+ }
+
+ private void printParsingProblems(TestReader testReader) {
+ for (Iterator i = testReader.getParsingProblems().iterator(); i.hasNext(); ) {
+ String problem = (String) i.next();
+ System.out.println(problem);
+ }
+ }
+
+ private String normalize(String xml) {
+ String normalizedXML = "";
+ StringTokenizer tokenizer = new StringTokenizer(xml.toUpperCase());
+ while (tokenizer.hasMoreTokens()) {
+ normalizedXML += tokenizer.nextToken();
+ }
+ return normalizedXML;
+ }
+
+}
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
new file mode 100644
index 0000000..412f9da
--- /dev/null
+++ b/modules/core/pom.xml
@@ -0,0 +1,54 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-modules</artifactId>
+ <version>1.15.0</version>
+ </parent>
+ <artifactId>jts-core</artifactId>
+ <name>${project.groupId}:${project.artifactId}</name>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
+ <!--configuration>
+ <archive>
+ <manifestSections>
+ <manifestSection>
+ <name>org.locationtech.jts</name>
+ <manifestEntries>
+ <Sealed>true</Sealed>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration-->
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <unpackBundle>true</unpackBundle>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/JTSVersion.java b/modules/core/src/main/java/org/locationtech/jts/JTSVersion.java
new file mode 100644
index 0000000..53d357a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/JTSVersion.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts;
+
+/**
+ * JTS API version information.
+ * <p>
+ * Versions consist of a 3-part version number: <code>major.minor.patch</code>
+ * An optional release status string may be present in the string version of
+ * the version.
+ *
+ * @version 1.7
+ */
+public class JTSVersion {
+
+ /**
+ * The current version number of the JTS API.
+ */
+ public static final JTSVersion CURRENT_VERSION = new JTSVersion();
+
+ /**
+ * The major version number.
+ */
+ public static final int MAJOR = 1;
+
+ /**
+ * The minor version number.
+ */
+ public static final int MINOR = 15;
+
+ /**
+ * The patch version number.
+ */
+ public static final int PATCH = 0;
+
+ /**
+ * An optional string providing further release info (such as "alpha 1");
+ */
+ private static final String releaseInfo = "";
+
+ /**
+ * Prints the current JTS version to stdout.
+ *
+ * @param args the command-line arguments (none are required).
+ */
+ public static void main(String[] args)
+ {
+ System.out.println(CURRENT_VERSION);
+ }
+
+ private JTSVersion() {
+ }
+
+ /**
+ * Gets the major number of the release version.
+ *
+ * @return the major number of the release version.
+ */
+ public int getMajor() { return MAJOR; }
+
+ /**
+ * Gets the minor number of the release version.
+ *
+ * @return the minor number of the release version.
+ */
+ public int getMinor() { return MINOR; }
+
+ /**
+ * Gets the patch number of the release version.
+ *
+ * @return the patch number of the release version.
+ */
+ public int getPatch() { return PATCH; }
+
+ /**
+ * Gets the full version number, suitable for display.
+ *
+ * @return the full version number, suitable for display.
+ */
+ public String toString()
+ {
+ String ver = MAJOR + "." + MINOR + "." + PATCH;
+ if (releaseInfo != null && releaseInfo.length() > 0)
+ return ver + " " + releaseInfo;
+ return ver;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/Angle.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/Angle.java
new file mode 100644
index 0000000..1ef9690
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/Angle.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Utility functions for working with angles.
+ * Unless otherwise noted, methods in this class express angles in radians.
+ */
+public class Angle
+{
+ public static final double PI_TIMES_2 = 2.0 * Math.PI;
+ public static final double PI_OVER_2 = Math.PI / 2.0;
+ public static final double PI_OVER_4 = Math.PI / 4.0;
+
+ /** Constant representing counterclockwise orientation */
+ public static final int COUNTERCLOCKWISE = Orientation.COUNTERCLOCKWISE;
+
+ /** Constant representing clockwise orientation */
+ public static final int CLOCKWISE = Orientation.CLOCKWISE;
+
+ /** Constant representing no orientation */
+ public static final int NONE = Orientation.COLLINEAR;
+
+ private Angle() {}
+
+ /**
+ * Converts from radians to degrees.
+ * @param radians an angle in radians
+ * @return the angle in degrees
+ */
+ public static double toDegrees(double radians) {
+ return (radians * 180) / (Math.PI);
+ }
+
+ /**
+ * Converts from degrees to radians.
+ *
+ * @param angleDegrees an angle in degrees
+ * @return the angle in radians
+ */
+ public static double toRadians(double angleDegrees) {
+ return (angleDegrees * Math.PI) / 180.0;
+ }
+
+
+ /**
+ * Returns the angle of the vector from p0 to p1,
+ * relative to the positive X-axis.
+ * The angle is normalized to be in the range [ -Pi, Pi ].
+ *
+ * @return the normalized angle (in radians) that p0-p1 makes with the positive x-axis.
+ */
+ public static double angle(Coordinate p0, Coordinate p1) {
+ double dx = p1.x - p0.x;
+ double dy = p1.y - p0.y;
+ return Math.atan2(dy, dx);
+ }
+
+ /**
+ * Returns the angle that the vector from (0,0) to p,
+ * relative to the positive X-axis.
+ * The angle is normalized to be in the range ( -Pi, Pi ].
+ *
+ * @return the normalized angle (in radians) that p makes with the positive x-axis.
+ */
+ public static double angle(Coordinate p) {
+ return Math.atan2(p.y, p.x);
+ }
+
+
+ /**
+ * Tests whether the angle between p0-p1-p2 is acute.
+ * An angle is acute if it is less than 90 degrees.
+ * <p>
+ * Note: this implementation is not precise (deterministic) for angles very close to 90 degrees.
+ *
+ * @param p0 an endpoint of the angle
+ * @param p1 the base of the angle
+ * @param p2 the other endpoint of the angle
+ */
+ public static boolean isAcute(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ // relies on fact that A dot B is positive iff A ang B is acute
+ double dx0 = p0.x - p1.x;
+ double dy0 = p0.y - p1.y;
+ double dx1 = p2.x - p1.x;
+ double dy1 = p2.y - p1.y;
+ double dotprod = dx0 * dx1 + dy0 * dy1;
+ return dotprod > 0;
+ }
+
+ /**
+ * Tests whether the angle between p0-p1-p2 is obtuse.
+ * An angle is obtuse if it is greater than 90 degrees.
+ * <p>
+ * Note: this implementation is not precise (deterministic) for angles very close to 90 degrees.
+ *
+ * @param p0 an endpoint of the angle
+ * @param p1 the base of the angle
+ * @param p2 the other endpoint of the angle
+ */
+ public static boolean isObtuse(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ // relies on fact that A dot B is negative iff A ang B is obtuse
+ double dx0 = p0.x - p1.x;
+ double dy0 = p0.y - p1.y;
+ double dx1 = p2.x - p1.x;
+ double dy1 = p2.y - p1.y;
+ double dotprod = dx0 * dx1 + dy0 * dy1;
+ return dotprod < 0;
+ }
+
+ /**
+ * Returns the unoriented smallest angle between two vectors.
+ * The computed angle will be in the range [0, Pi).
+ *
+ * @param tip1 the tip of one vector
+ * @param tail the tail of each vector
+ * @param tip2 the tip of the other vector
+ * @return the angle between tail-tip1 and tail-tip2
+ */
+ public static double angleBetween(Coordinate tip1, Coordinate tail,
+ Coordinate tip2) {
+ double a1 = angle(tail, tip1);
+ double a2 = angle(tail, tip2);
+
+ return diff(a1, a2);
+ }
+
+ /**
+ * Returns the oriented smallest angle between two vectors.
+ * The computed angle will be in the range (-Pi, Pi].
+ * A positive result corresponds to a counterclockwise
+ * (CCW) rotation
+ * from v1 to v2;
+ * a negative result corresponds to a clockwise (CW) rotation;
+ * a zero result corresponds to no rotation.
+ *
+ * @param tip1 the tip of v1
+ * @param tail the tail of each vector
+ * @param tip2 the tip of v2
+ * @return the angle between v1 and v2, relative to v1
+ */
+ public static double angleBetweenOriented(Coordinate tip1, Coordinate tail,
+ Coordinate tip2)
+ {
+ double a1 = angle(tail, tip1);
+ double a2 = angle(tail, tip2);
+ double angDel = a2 - a1;
+
+ // normalize, maintaining orientation
+ if (angDel <= -Math.PI)
+ return angDel + PI_TIMES_2;
+ if (angDel > Math.PI)
+ return angDel - PI_TIMES_2;
+ return angDel;
+ }
+
+ /**
+ * Computes the interior angle between two segments of a ring. The ring is
+ * assumed to be oriented in a clockwise direction. The computed angle will be
+ * in the range [0, 2Pi]
+ *
+ * @param p0
+ * a point of the ring
+ * @param p1
+ * the next point of the ring
+ * @param p2
+ * the next point of the ring
+ * @return the interior angle based at <code>p1</code>
+ */
+ public static double interiorAngle(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ double anglePrev = Angle.angle(p1, p0);
+ double angleNext = Angle.angle(p1, p2);
+ return Math.abs(angleNext - anglePrev);
+ }
+
+ /**
+ * Returns whether an angle must turn clockwise or counterclockwise
+ * to overlap another angle.
+ *
+ * @param ang1 an angle (in radians)
+ * @param ang2 an angle (in radians)
+ * @return whether a1 must turn CLOCKWISE, COUNTERCLOCKWISE or NONE to
+ * overlap a2.
+ */
+ public static int getTurn(double ang1, double ang2) {
+ double crossproduct = Math.sin(ang2 - ang1);
+
+ if (crossproduct > 0) {
+ return COUNTERCLOCKWISE;
+ }
+ if (crossproduct < 0) {
+ return CLOCKWISE;
+ }
+ return NONE;
+ }
+
+ /**
+ * Computes the normalized value of an angle, which is the
+ * equivalent angle in the range ( -Pi, Pi ].
+ *
+ * @param angle the angle to normalize
+ * @return an equivalent angle in the range (-Pi, Pi]
+ */
+ public static double normalize(double angle)
+ {
+ while (angle > Math.PI)
+ angle -= PI_TIMES_2;
+ while (angle <= -Math.PI)
+ angle += PI_TIMES_2;
+ return angle;
+ }
+
+ /**
+ * Computes the normalized positive value of an angle, which is the
+ * equivalent angle in the range [ 0, 2*Pi ).
+ * E.g.:
+ * <ul>
+ * <li>normalizePositive(0.0) = 0.0
+ * <li>normalizePositive(-PI) = PI
+ * <li>normalizePositive(-2PI) = 0.0
+ * <li>normalizePositive(-3PI) = PI
+ * <li>normalizePositive(-4PI) = 0
+ * <li>normalizePositive(PI) = PI
+ * <li>normalizePositive(2PI) = 0.0
+ * <li>normalizePositive(3PI) = PI
+ * <li>normalizePositive(4PI) = 0.0
+ * </ul>
+ *
+ * @param angle the angle to normalize, in radians
+ * @return an equivalent positive angle
+ */
+ public static double normalizePositive(double angle)
+ {
+ if (angle < 0.0) {
+ while (angle < 0.0)
+ angle += PI_TIMES_2;
+ // in case round-off error bumps the value over
+ if (angle >= PI_TIMES_2)
+ angle = 0.0;
+ }
+ else {
+ while (angle >= PI_TIMES_2)
+ angle -= PI_TIMES_2;
+ // in case round-off error bumps the value under
+ if (angle < 0.0)
+ angle = 0.0;
+ }
+ return angle;
+ }
+
+ /**
+ * Computes the unoriented smallest difference between two angles.
+ * The angles are assumed to be normalized to the range [-Pi, Pi].
+ * The result will be in the range [0, Pi].
+ *
+ * @param ang1 the angle of one vector (in [-Pi, Pi] )
+ * @param ang2 the angle of the other vector (in range [-Pi, Pi] )
+ * @return the angle (in radians) between the two vectors (in range [0, Pi] )
+ */
+ public static double diff(double ang1, double ang2) {
+ double delAngle;
+
+ if (ang1 < ang2) {
+ delAngle = ang2 - ang1;
+ } else {
+ delAngle = ang1 - ang2;
+ }
+
+ if (delAngle > Math.PI) {
+ delAngle = (2 * Math.PI) - delAngle;
+ }
+
+ return delAngle;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/Area.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/Area.java
new file mode 100644
index 0000000..7ff12f7
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/Area.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+
+/**
+ * Functions for computing area.
+ *
+ * @author Martin Davis
+ *
+ */
+public class Area {
+
+ /**
+ * Computes the area for a ring.
+ *
+ * @param ring the coordinates forming the ring
+ * @return the area of the ring
+ */
+ public static double ofRing(Coordinate[] ring)
+ {
+ return Math.abs(ofRingSigned(ring));
+ }
+
+ /**
+ * Computes the area for a ring.
+ *
+ * @param ring the coordinates forming the ring
+ * @return the area of the ring
+ */
+ public static double ofRing(CoordinateSequence ring)
+ {
+ return Math.abs(ofRingSigned(ring));
+ }
+
+ /**
+ * Computes the signed area for a ring. The signed area is positive if the
+ * ring is oriented CW, negative if the ring is oriented CCW, and zero if the
+ * ring is degenerate or flat.
+ *
+ * @param ring
+ * the coordinates forming the ring
+ * @return the signed area of the ring
+ */
+ public static double ofRingSigned(Coordinate[] ring)
+ {
+ if (ring.length < 3)
+ return 0.0;
+ double sum = 0.0;
+ /**
+ * Based on the Shoelace formula.
+ * http://en.wikipedia.org/wiki/Shoelace_formula
+ */
+ double x0 = ring[0].x;
+ for (int i = 1; i < ring.length - 1; i++) {
+ double x = ring[i].x - x0;
+ double y1 = ring[i + 1].y;
+ double y2 = ring[i - 1].y;
+ sum += x * (y2 - y1);
+ }
+ return sum / 2.0;
+ }
+
+ /**
+ * Computes the signed area for a ring. The signed area is:
+ * <ul>
+ * <li>positive if the ring is oriented CW
+ * <li>negative if the ring is oriented CCW
+ * <li>zero if the ring is degenerate or flat
+ * </ul>
+ *
+ * @param ring
+ * the coordinates forming the ring
+ * @return the signed area of the ring
+ */
+ public static double ofRingSigned(CoordinateSequence ring)
+ {
+ int n = ring.size();
+ if (n < 3)
+ return 0.0;
+ /**
+ * Based on the Shoelace formula.
+ * http://en.wikipedia.org/wiki/Shoelace_formula
+ */
+ Coordinate p0 = new Coordinate();
+ Coordinate p1 = new Coordinate();
+ Coordinate p2 = new Coordinate();
+ ring.getCoordinate(0, p1);
+ ring.getCoordinate(1, p2);
+ double x0 = p1.x;
+ p2.x -= x0;
+ double sum = 0.0;
+ for (int i = 1; i < n - 1; i++) {
+ p0.y = p1.y;
+ p1.x = p2.x;
+ p1.y = p2.y;
+ ring.getCoordinate(i + 1, p2);
+ p2.x -= x0;
+ sum += p1.x * (p0.y - p2.y);
+ }
+ return sum / 2.0;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/BoundaryNodeRule.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/BoundaryNodeRule.java
new file mode 100644
index 0000000..b669596
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/BoundaryNodeRule.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Lineal;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.operation.BoundaryOp;
+import org.locationtech.jts.operation.IsSimpleOp;
+import org.locationtech.jts.operation.relate.RelateOp;
+
+/**
+ * An interface for rules which determine whether node points
+ * which are in boundaries of {@link Lineal} geometry components
+ * are in the boundary of the parent geometry collection.
+ * The SFS specifies a single kind of boundary node rule,
+ * the {@link Mod2BoundaryNodeRule} rule.
+ * However, other kinds of Boundary Node Rules are appropriate
+ * in specific situations (for instance, linear network topology
+ * usually follows the {@link EndPointBoundaryNodeRule}.)
+ * Some JTS operations
+ * (such as {@link RelateOp}, {@link BoundaryOp} and {@link IsSimpleOp})
+ * allow the BoundaryNodeRule to be specified,
+ * and respect the supplied rule when computing the results of the operation.
+ * <p>
+ * An example use case for a non-SFS-standard Boundary Node Rule is
+ * that of checking that a set of {@link LineString}s have
+ * valid linear network topology, when turn-arounds are represented
+ * as closed rings. In this situation, the entry road to the
+ * turn-around is only valid when it touches the turn-around ring
+ * at the single (common) endpoint. This is equivalent
+ * to requiring the set of <tt>LineString</tt>s to be
+ * <b>simple</b> under the {@link EndPointBoundaryNodeRule}.
+ * The SFS-standard {@link Mod2BoundaryNodeRule} is not
+ * sufficient to perform this test, since it
+ * states that closed rings have <b>no</b> boundary points.
+ * <p>
+ * This interface and its subclasses follow the <tt>Strategy</tt> design pattern.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ *
+ * @see RelateOp
+ * @see BoundaryOp
+ * @see IsSimpleOp
+ * @see PointLocator
+ */
+public interface BoundaryNodeRule
+{
+
+ /**
+ * Tests whether a point that lies in <tt>boundaryCount</tt>
+ * geometry component boundaries is considered to form part of the boundary
+ * of the parent geometry.
+ *
+ * @param boundaryCount the number of component boundaries that this point occurs in
+ * @return true if points in this number of boundaries lie in the parent boundary
+ */
+ boolean isInBoundary(int boundaryCount);
+
+ /**
+ * The Mod-2 Boundary Node Rule (which is the rule specified in the OGC SFS).
+ * @see Mod2BoundaryNodeRule
+ */
+ public static final BoundaryNodeRule MOD2_BOUNDARY_RULE = new Mod2BoundaryNodeRule();
+
+ /**
+ * The Endpoint Boundary Node Rule.
+ * @see EndPointBoundaryNodeRule
+ */
+ public static final BoundaryNodeRule ENDPOINT_BOUNDARY_RULE = new EndPointBoundaryNodeRule();
+
+ /**
+ * The MultiValent Endpoint Boundary Node Rule.
+ * @see MultiValentEndPointBoundaryNodeRule
+ */
+ public static final BoundaryNodeRule MULTIVALENT_ENDPOINT_BOUNDARY_RULE = new MultiValentEndPointBoundaryNodeRule();
+
+ /**
+ * The Monovalent Endpoint Boundary Node Rule.
+ * @see MonoValentEndPointBoundaryNodeRule
+ */
+ public static final BoundaryNodeRule MONOVALENT_ENDPOINT_BOUNDARY_RULE = new MonoValentEndPointBoundaryNodeRule();
+
+ /**
+ * The Boundary Node Rule specified by the OGC Simple Features Specification,
+ * which is the same as the Mod-2 rule.
+ * @see Mod2BoundaryNodeRule
+ */
+ public static final BoundaryNodeRule OGC_SFS_BOUNDARY_RULE = MOD2_BOUNDARY_RULE;
+
+ /**
+ * A {@link BoundaryNodeRule} specifies that points are in the
+ * boundary of a lineal geometry iff
+ * the point lies on the boundary of an odd number
+ * of components.
+ * Under this rule {@link LinearRing}s and closed
+ * {@link LineString}s have an empty boundary.
+ * <p>
+ * This is the rule specified by the <i>OGC SFS</i>,
+ * and is the default rule used in JTS.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+ public static class Mod2BoundaryNodeRule
+ implements BoundaryNodeRule
+ {
+ public boolean isInBoundary(int boundaryCount)
+ {
+ // the "Mod-2 Rule"
+ return boundaryCount % 2 == 1;
+ }
+ }
+
+ /**
+ * A {@link BoundaryNodeRule} which specifies that any points which are endpoints
+ * of lineal components are in the boundary of the
+ * parent geometry.
+ * This corresponds to the "intuitive" topological definition
+ * of boundary.
+ * Under this rule {@link LinearRing}s have a non-empty boundary
+ * (the common endpoint of the underlying LineString).
+ * <p>
+ * This rule is useful when dealing with linear networks.
+ * For example, it can be used to check
+ * whether linear networks are correctly noded.
+ * The usual network topology constraint is that linear segments may touch only at endpoints.
+ * In the case of a segment touching a closed segment (ring) at one point,
+ * the Mod2 rule cannot distinguish between the permitted case of touching at the
+ * node point and the invalid case of touching at some other interior (non-node) point.
+ * The EndPoint rule does distinguish between these cases,
+ * so is more appropriate for use.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+ public static class EndPointBoundaryNodeRule
+ implements BoundaryNodeRule
+ {
+ public boolean isInBoundary(int boundaryCount)
+ {
+ return boundaryCount > 0;
+ }
+ }
+
+ /**
+ * A {@link BoundaryNodeRule} which determines that only
+ * endpoints with valency greater than 1 are on the boundary.
+ * This corresponds to the boundary of a {@link MultiLineString}
+ * being all the "attached" endpoints, but not
+ * the "unattached" ones.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+ public static class MultiValentEndPointBoundaryNodeRule
+ implements BoundaryNodeRule
+ {
+ public boolean isInBoundary(int boundaryCount)
+ {
+ return boundaryCount > 1;
+ }
+ }
+
+ /**
+ * A {@link BoundaryNodeRule} which determines that only
+ * endpoints with valency of exactly 1 are on the boundary.
+ * This corresponds to the boundary of a {@link MultiLineString}
+ * being all the "unattached" endpoints.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+ public static class MonoValentEndPointBoundaryNodeRule
+ implements BoundaryNodeRule
+ {
+ public boolean isInBoundary(int boundaryCount)
+ {
+ return boundaryCount == 1;
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithms.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithms.java
new file mode 100644
index 0000000..16fe739
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithms.java
@@ -0,0 +1,575 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.math.MathUtil;
+
+/**
+ * Specifies and implements various fundamental Computational Geometric
+ * algorithms. The algorithms supplied in this class are robust for
+ * double-precision floating point.
+ *
+ * @version 1.7
+ * @deprecated See Length, Area, Distance, Orientation, PointLocation
+ */
+public class CGAlgorithms
+{
+
+ /**
+ * A value that indicates an orientation of clockwise, or a right turn.
+ */
+ public static final int CLOCKWISE = -1;
+
+ /**
+ * A value that indicates an orientation of clockwise, or a right turn.
+ */
+ public static final int RIGHT = CLOCKWISE;
+
+ /**
+ * A value that indicates an orientation of counterclockwise, or a left turn.
+ */
+ public static final int COUNTERCLOCKWISE = 1;
+
+ /**
+ * A value that indicates an orientation of counterclockwise, or a left turn.
+ */
+ public static final int LEFT = COUNTERCLOCKWISE;
+
+ /**
+ * A value that indicates an orientation of collinear, or no turn (straight).
+ */
+ public static final int COLLINEAR = 0;
+
+ /**
+ * A value that indicates an orientation of collinear, or no turn (straight).
+ */
+ public static final int STRAIGHT = COLLINEAR;
+
+ /**
+ * Returns the index of the direction of the point <code>q</code> relative to
+ * a vector specified by <code>p1-p2</code>.
+ *
+ * @param p1 the origin point of the vector
+ * @param p2 the final point of the vector
+ * @param q the point to compute the direction to
+ *
+ * @return 1 if q is counter-clockwise (left) from p1-p2
+ * @return -1 if q is clockwise (right) from p1-p2
+ * @return 0 if q is collinear with p1-p2
+ */
+ public static int orientationIndex(Coordinate p1, Coordinate p2, Coordinate q)
+ {
+ /**
+ * MD - 9 Aug 2010 It seems that the basic algorithm is slightly orientation
+ * dependent, when computing the orientation of a point very close to a
+ * line. This is possibly due to the arithmetic in the translation to the
+ * origin.
+ *
+ * For instance, the following situation produces identical results in spite
+ * of the inverse orientation of the line segment:
+ *
+ * Coordinate p0 = new Coordinate(219.3649559090992, 140.84159161824724);
+ * Coordinate p1 = new Coordinate(168.9018919682399, -5.713787599646864);
+ *
+ * Coordinate p = new Coordinate(186.80814046338352, 46.28973405831556); int
+ * orient = orientationIndex(p0, p1, p); int orientInv =
+ * orientationIndex(p1, p0, p);
+ *
+ * A way to force consistent results is to normalize the orientation of the
+ * vector using the following code. However, this may make the results of
+ * orientationIndex inconsistent through the triangle of points, so it's not
+ * clear this is an appropriate patch.
+ *
+ */
+ return CGAlgorithmsDD.orientationIndex(p1, p2, q);
+ // testing only
+ //return ShewchuksDeterminant.orientationIndex(p1, p2, q);
+ // previous implementation - not quite fully robust
+ //return RobustDeterminant.orientationIndex(p1, p2, q);
+
+ }
+
+ public CGAlgorithms()
+ {
+ }
+
+ /**
+ * Tests whether a point lies inside or on a ring. The ring may be oriented in
+ * either direction. A point lying exactly on the ring boundary is considered
+ * to be inside the ring.
+ * <p>
+ * This method does <i>not</i> first check the point against the envelope of
+ * the ring.
+ *
+ * @param p
+ * point to check for ring inclusion
+ * @param ring
+ * an array of coordinates representing the ring (which must have
+ * first point identical to last point)
+ * @return true if p is inside ring
+ *
+ * @see locatePointInRing
+ */
+ public static boolean isPointInRing(Coordinate p, Coordinate[] ring)
+ {
+ return locatePointInRing(p, ring) != Location.EXTERIOR;
+ }
+
+ /**
+ * Determines whether a point lies in the interior, on the boundary, or in the
+ * exterior of a ring. The ring may be oriented in either direction.
+ * <p>
+ * This method does <i>not</i> first check the point against the envelope of
+ * the ring.
+ *
+ * @param p
+ * point to check for ring inclusion
+ * @param ring
+ * an array of coordinates representing the ring (which must have
+ * first point identical to last point)
+ * @return the {@link Location} of p relative to the ring
+ */
+ public static int locatePointInRing(Coordinate p, Coordinate[] ring)
+ {
+ return RayCrossingCounter.locatePointInRing(p, ring);
+ }
+
+ /**
+ * Tests whether a point lies on the line segments defined by a list of
+ * coordinates.
+ *
+ * @return true if the point is a vertex of the line or lies in the interior
+ * of a line segment in the linestring
+ */
+ public static boolean isOnLine(Coordinate p, Coordinate[] pt)
+ {
+ LineIntersector lineIntersector = new RobustLineIntersector();
+ for (int i = 1; i < pt.length; i++) {
+ Coordinate p0 = pt[i - 1];
+ Coordinate p1 = pt[i];
+ lineIntersector.computeIntersection(p, p0, p1);
+ if (lineIntersector.hasIntersection()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Computes whether a ring defined by an array of {@link Coordinate}s is
+ * oriented counter-clockwise.
+ * <ul>
+ * <li>The list of points is assumed to have the first and last points equal.
+ * <li>This will handle coordinate lists which contain repeated points.
+ * </ul>
+ * This algorithm is <b>only</b> guaranteed to work with valid rings. If the
+ * ring is invalid (e.g. self-crosses or touches), the computed result may not
+ * be correct.
+ *
+ * @param ring
+ * an array of Coordinates forming a ring
+ * @return true if the ring is oriented counter-clockwise.
+ * @throws IllegalArgumentException
+ * if there are too few points to determine orientation (< 4)
+ */
+ public static boolean isCCW(Coordinate[] ring)
+ {
+ // # of points without closing endpoint
+ int nPts = ring.length - 1;
+ // sanity check
+ if (nPts < 3)
+ throw new IllegalArgumentException(
+ "Ring has fewer than 4 points, so orientation cannot be determined");
+
+ // find highest point
+ Coordinate hiPt = ring[0];
+ int hiIndex = 0;
+ for (int i = 1; i <= nPts; i++) {
+ Coordinate p = ring[i];
+ if (p.y > hiPt.y) {
+ hiPt = p;
+ hiIndex = i;
+ }
+ }
+
+ // find distinct point before highest point
+ int iPrev = hiIndex;
+ do {
+ iPrev = iPrev - 1;
+ if (iPrev < 0)
+ iPrev = nPts;
+ } while (ring[iPrev].equals2D(hiPt) && iPrev != hiIndex);
+
+ // find distinct point after highest point
+ int iNext = hiIndex;
+ do {
+ iNext = (iNext + 1) % nPts;
+ } while (ring[iNext].equals2D(hiPt) && iNext != hiIndex);
+
+ Coordinate prev = ring[iPrev];
+ Coordinate next = ring[iNext];
+
+ /**
+ * This check catches cases where the ring contains an A-B-A configuration
+ * of points. This can happen if the ring does not contain 3 distinct points
+ * (including the case where the input array has fewer than 4 elements), or
+ * it contains coincident line segments.
+ */
+ if (prev.equals2D(hiPt) || next.equals2D(hiPt) || prev.equals2D(next))
+ return false;
+
+ int disc = computeOrientation(prev, hiPt, next);
+
+ /**
+ * If disc is exactly 0, lines are collinear. There are two possible cases:
+ * (1) the lines lie along the x axis in opposite directions (2) the lines
+ * lie on top of one another
+ *
+ * (1) is handled by checking if next is left of prev ==> CCW (2) will never
+ * happen if the ring is valid, so don't check for it (Might want to assert
+ * this)
+ */
+ boolean isCCW;
+ if (disc == 0) {
+ // poly is CCW if prev x is right of next x
+ isCCW = (prev.x > next.x);
+ }
+ else {
+ // if area is positive, points are ordered CCW
+ isCCW = (disc > 0);
+ }
+ return isCCW;
+ }
+
+ /**
+ * Computes the orientation of a point q to the directed line segment p1-p2.
+ * The orientation of a point relative to a directed line segment indicates
+ * which way you turn to get to q after travelling from p1 to p2.
+ *
+ * @param p1 the first vertex of the line segment
+ * @param p2 the second vertex of the line segment
+ * @param q the point to compute the relative orientation of
+ * @return 1 if q is counter-clockwise from p1-p2,
+ * or -1 if q is clockwise from p1-p2,
+ * or 0 if q is collinear with p1-p2
+ */
+ public static int computeOrientation(Coordinate p1, Coordinate p2,
+ Coordinate q)
+ {
+ return orientationIndex(p1, p2, q);
+ }
+
+ /**
+ * Computes the distance from a point p to a line segment AB
+ *
+ * Note: NON-ROBUST!
+ *
+ * @param p
+ * the point to compute the distance for
+ * @param A
+ * one point of the line
+ * @param B
+ * another point of the line (must be different to A)
+ * @return the distance from p to line segment AB
+ */
+ public static double distancePointLine(Coordinate p, Coordinate A,
+ Coordinate B)
+ {
+ // if start = end, then just compute distance to one of the endpoints
+ if (A.x == B.x && A.y == B.y)
+ return p.distance(A);
+
+ // otherwise use comp.graphics.algorithms Frequently Asked Questions method
+ /*
+ * (1) r = AC dot AB
+ * ---------
+ * ||AB||^2
+ *
+ * r has the following meaning:
+ * r=0 P = A
+ * r=1 P = B
+ * r<0 P is on the backward extension of AB
+ * r>1 P is on the forward extension of AB
+ * 0<r<1 P is interior to AB
+ */
+
+ double len2 = (B.x - A.x) * (B.x - A.x) + (B.y - A.y) * (B.y - A.y);
+ double r = ((p.x - A.x) * (B.x - A.x) + (p.y - A.y) * (B.y - A.y))
+ / len2;
+
+ if (r <= 0.0)
+ return p.distance(A);
+ if (r >= 1.0)
+ return p.distance(B);
+
+ /*
+ * (2) s = (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+ * -----------------------------
+ * L^2
+ *
+ * Then the distance from C to P = |s|*L.
+ *
+ * This is the same calculation as {@link #distancePointLinePerpendicular}.
+ * Unrolled here for performance.
+ */
+ double s = ((A.y - p.y) * (B.x - A.x) - (A.x - p.x) * (B.y - A.y))
+ / len2;
+ return Math.abs(s) * Math.sqrt(len2);
+ }
+
+ /**
+ * Computes the perpendicular distance from a point p to the (infinite) line
+ * containing the points AB
+ *
+ * @param p
+ * the point to compute the distance for
+ * @param A
+ * one point of the line
+ * @param B
+ * another point of the line (must be different to A)
+ * @return the distance from p to line AB
+ */
+ public static double distancePointLinePerpendicular(Coordinate p,
+ Coordinate A, Coordinate B)
+ {
+ // use comp.graphics.algorithms Frequently Asked Questions method
+ /*
+ * (2) s = (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+ * -----------------------------
+ * L^2
+ *
+ * Then the distance from C to P = |s|*L.
+ */
+ double len2 = (B.x - A.x) * (B.x - A.x) + (B.y - A.y) * (B.y - A.y);
+ double s = ((A.y - p.y) * (B.x - A.x) - (A.x - p.x) * (B.y - A.y))
+ / len2;
+
+ return Math.abs(s) * Math.sqrt(len2);
+ }
+
+ /**
+ * Computes the distance from a point to a sequence of line segments.
+ *
+ * @param p
+ * a point
+ * @param line
+ * a sequence of contiguous line segments defined by their vertices
+ * @return the minimum distance between the point and the line segments
+ */
+ public static double distancePointLine(Coordinate p, Coordinate[] line)
+ {
+ if (line.length == 0)
+ throw new IllegalArgumentException(
+ "Line array must contain at least one vertex");
+ // this handles the case of length = 1
+ double minDistance = p.distance(line[0]);
+ for (int i = 0; i < line.length - 1; i++) {
+ double dist = distancePointLine(p, line[i], line[i + 1]);
+ if (dist < minDistance) {
+ minDistance = dist;
+ }
+ }
+ return minDistance;
+ }
+
+ /**
+ * Computes the distance from a line segment AB to a line segment CD
+ *
+ * Note: NON-ROBUST!
+ *
+ * @param A
+ * a point of one line
+ * @param B
+ * the second point of (must be different to A)
+ * @param C
+ * one point of the line
+ * @param D
+ * another point of the line (must be different to A)
+ */
+ public static double distanceLineLine(Coordinate A, Coordinate B,
+ Coordinate C, Coordinate D)
+ {
+ // check for zero-length segments
+ if (A.equals(B))
+ return distancePointLine(A, C, D);
+ if (C.equals(D))
+ return distancePointLine(D, A, B);
+
+ // AB and CD are line segments
+ /*
+ * from comp.graphics.algo
+ *
+ * Solving the above for r and s yields
+ *
+ * (Ay-Cy)(Dx-Cx)-(Ax-Cx)(Dy-Cy)
+ * r = ----------------------------- (eqn 1)
+ * (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx)
+ *
+ * (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+ * s = ----------------------------- (eqn 2)
+ * (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx)
+ *
+ * Let P be the position vector of the
+ * intersection point, then
+ * P=A+r(B-A) or
+ * Px=Ax+r(Bx-Ax)
+ * Py=Ay+r(By-Ay)
+ * By examining the values of r & s, you can also determine some other limiting
+ * conditions:
+ * If 0<=r<=1 & 0<=s<=1, intersection exists
+ * r<0 or r>1 or s<0 or s>1 line segments do not intersect
+ * If the denominator in eqn 1 is zero, AB & CD are parallel
+ * If the numerator in eqn 1 is also zero, AB & CD are collinear.
+ */
+
+ boolean noIntersection = false;
+ if (! Envelope.intersects(A, B, C, D)) {
+ noIntersection = true;
+ }
+ else {
+ double denom = (B.x - A.x) * (D.y - C.y) - (B.y - A.y) * (D.x - C.x);
+
+ if (denom == 0) {
+ noIntersection = true;
+ }
+ else {
+ double r_num = (A.y - C.y) * (D.x - C.x) - (A.x - C.x) * (D.y - C.y);
+ double s_num = (A.y - C.y) * (B.x - A.x) - (A.x - C.x) * (B.y - A.y);
+
+ double s = s_num / denom;
+ double r = r_num / denom;
+
+ if ((r < 0) || (r > 1) || (s < 0) || (s > 1)) {
+ noIntersection = true;
+ }
+ }
+ }
+ if (noIntersection) {
+ return MathUtil.min(
+ distancePointLine(A, C, D),
+ distancePointLine(B, C, D),
+ distancePointLine(C, A, B),
+ distancePointLine(D, A, B));
+ }
+ // segments intersect
+ return 0.0;
+ }
+
+ /**
+ * Computes the signed area for a ring. The signed area is positive if the
+ * ring is oriented CW, negative if the ring is oriented CCW, and zero if the
+ * ring is degenerate or flat.
+ *
+ * @param ring
+ * the coordinates forming the ring
+ * @return the signed area of the ring
+ */
+ public static double signedArea(Coordinate[] ring)
+ {
+ if (ring.length < 3)
+ return 0.0;
+ double sum = 0.0;
+ /**
+ * Based on the Shoelace formula.
+ * http://en.wikipedia.org/wiki/Shoelace_formula
+ */
+ double x0 = ring[0].x;
+ for (int i = 1; i < ring.length - 1; i++) {
+ double x = ring[i].x - x0;
+ double y1 = ring[i + 1].y;
+ double y2 = ring[i - 1].y;
+ sum += x * (y2 - y1);
+ }
+ return sum / 2.0;
+ }
+
+ /**
+ * Computes the signed area for a ring. The signed area is:
+ * <ul>
+ * <li>positive if the ring is oriented CW
+ * <li>negative if the ring is oriented CCW
+ * <li>zero if the ring is degenerate or flat
+ * </ul>
+ *
+ * @param ring
+ * the coordinates forming the ring
+ * @return the signed area of the ring
+ */
+ public static double signedArea(CoordinateSequence ring)
+ {
+ int n = ring.size();
+ if (n < 3)
+ return 0.0;
+ /**
+ * Based on the Shoelace formula.
+ * http://en.wikipedia.org/wiki/Shoelace_formula
+ */
+ Coordinate p0 = new Coordinate();
+ Coordinate p1 = new Coordinate();
+ Coordinate p2 = new Coordinate();
+ ring.getCoordinate(0, p1);
+ ring.getCoordinate(1, p2);
+ double x0 = p1.x;
+ p2.x -= x0;
+ double sum = 0.0;
+ for (int i = 1; i < n - 1; i++) {
+ p0.y = p1.y;
+ p1.x = p2.x;
+ p1.y = p2.y;
+ ring.getCoordinate(i + 1, p2);
+ p2.x -= x0;
+ sum += p1.x * (p0.y - p2.y);
+ }
+ return sum / 2.0;
+ }
+
+ /**
+ * Computes the length of a linestring specified by a sequence of points.
+ *
+ * @param pts
+ * the points specifying the linestring
+ * @return the length of the linestring
+ */
+ public static double length(CoordinateSequence pts)
+ {
+ // optimized for processing CoordinateSequences
+ int n = pts.size();
+ if (n <= 1)
+ return 0.0;
+
+ double len = 0.0;
+
+ Coordinate p = new Coordinate();
+ pts.getCoordinate(0, p);
+ double x0 = p.x;
+ double y0 = p.y;
+
+ for (int i = 1; i < n; i++) {
+ pts.getCoordinate(i, p);
+ double x1 = p.x;
+ double y1 = p.y;
+ double dx = x1 - x0;
+ double dy = y1 - y0;
+
+ len += Math.sqrt(dx * dx + dy * dy);
+
+ x0 = x1;
+ y0 = y1;
+ }
+ return len;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithms3D.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithms3D.java
new file mode 100644
index 0000000..898709c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithms3D.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.math.Vector3D;
+
+/**
+ * Basic computational geometry algorithms
+ * for geometry and coordinates defined in 3-dimensional Cartesian space.
+ *
+ * @author mdavis
+ *
+ */
+public class CGAlgorithms3D
+{
+ private CGAlgorithms3D() {}
+
+ public static double distance(Coordinate p0, Coordinate p1)
+ {
+ // default to 2D distance if either Z is not set
+ if (Double.isNaN(p0.z) || Double.isNaN(p1.z))
+ return p0.distance(p1);
+
+ double dx = p0.x - p1.x;
+ double dy = p0.y - p1.y;
+ double dz = p0.z - p1.z;
+ return Math.sqrt(dx * dx + dy * dy + dz * dz);
+ }
+
+ public static double distancePointSegment(Coordinate p,
+ Coordinate A, Coordinate B) {
+ // if start = end, then just compute distance to one of the endpoints
+ if (A.equals3D(B))
+ return distance(p, A);
+
+ // otherwise use comp.graphics.algorithms Frequently Asked Questions method
+ /*
+ * (1) r = AC dot AB
+ * ---------
+ * ||AB||^2
+ *
+ * r has the following meaning:
+ * r=0 P = A
+ * r=1 P = B
+ * r<0 P is on the backward extension of AB
+ * r>1 P is on the forward extension of AB
+ * 0<r<1 P is interior to AB
+ */
+
+ double len2 = (B.x - A.x) * (B.x - A.x) + (B.y - A.y) * (B.y - A.y) + (B.z - A.z) * (B.z - A.z);
+ if (Double.isNaN(len2))
+ throw new IllegalArgumentException("Ordinates must not be NaN");
+ double r = ((p.x - A.x) * (B.x - A.x) + (p.y - A.y) * (B.y - A.y) + (p.z - A.z) * (B.z - A.z))
+ / len2;
+
+ if (r <= 0.0)
+ return distance(p, A);
+ if (r >= 1.0)
+ return distance(p, B);
+
+ // compute closest point q on line segment
+ double qx = A.x + r * (B.x - A.x);
+ double qy = A.y + r * (B.y - A.y);
+ double qz = A.z + r * (B.z - A.z);
+ // result is distance from p to q
+ double dx = p.x - qx;
+ double dy = p.y - qy;
+ double dz = p.z - qz;
+ return Math.sqrt(dx*dx + dy*dy + dz*dz);
+ }
+
+
+ /**
+ * Computes the distance between two 3D segments.
+ *
+ * @param A the start point of the first segment
+ * @param B the end point of the first segment
+ * @param C the start point of the second segment
+ * @param D the end point of the second segment
+ * @return the distance between the segments
+ */
+ public static double distanceSegmentSegment(
+ Coordinate A, Coordinate B, Coordinate C, Coordinate D)
+ {
+ /**
+ * This calculation is susceptible to roundoff errors when
+ * passed large ordinate values.
+ * It may be possible to improve this by using {@link DD} arithmetic.
+ */
+ if (A.equals3D(B))
+ return distancePointSegment(A, C, D);
+ if (C.equals3D(B))
+ return distancePointSegment(C, A, B);
+
+ /**
+ * Algorithm derived from http://softsurfer.com/Archive/algorithm_0106/algorithm_0106.htm
+ */
+ double a = Vector3D.dot(A, B, A, B);
+ double b = Vector3D.dot(A, B, C, D);
+ double c = Vector3D.dot(C, D, C, D);
+ double d = Vector3D.dot(A, B, C, A);
+ double e = Vector3D.dot(C, D, C, A);
+
+ double denom = a*c - b*b;
+ if (Double.isNaN(denom))
+ throw new IllegalArgumentException("Ordinates must not be NaN");
+
+ double s;
+ double t;
+ if (denom <= 0.0) {
+ /**
+ * The lines are parallel.
+ * In this case solve for the parameters s and t by assuming s is 0.
+ */
+ s = 0;
+ // choose largest denominator for optimal numeric conditioning
+ if (b > c)
+ t = d/b;
+ else
+ t = e/c;
+ }
+ else {
+ s = (b*e - c*d) / denom;
+ t = (a*e - b*d) / denom;
+ }
+ if (s < 0)
+ return distancePointSegment(A, C, D);
+ else if (s > 1)
+ return distancePointSegment(B, C, D);
+ else if (t < 0)
+ return distancePointSegment(C, A, B);
+ else if(t > 1) {
+ return distancePointSegment(D, A, B);
+ }
+ /**
+ * The closest points are in interiors of segments,
+ * so compute them directly
+ */
+ double x1 = A.x + s * (B.x - A.x);
+ double y1 = A.y + s * (B.y - A.y);
+ double z1 = A.z + s * (B.z - A.z);
+
+ double x2 = C.x + t * (D.x - C.x);
+ double y2 = C.y + t * (D.y - C.y);
+ double z2 = C.z + t * (D.z - C.z);
+
+ // length (p1-p2)
+ return distance(new Coordinate(x1, y1, z1), new Coordinate(x2, y2, z2));
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithmsDD.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithmsDD.java
new file mode 100644
index 0000000..a71357f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/CGAlgorithmsDD.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.math.DD;
+
+/**
+ * Implements basic computational geometry algorithms using {@link DD} arithmetic.
+ *
+ * @author Martin Davis
+ *
+ */
+public class CGAlgorithmsDD
+{
+ private CGAlgorithmsDD() {}
+
+ /**
+ * Returns the index of the direction of the point <code>q</code> relative to
+ * a vector specified by <code>p1-p2</code>.
+ *
+ * @param p1 the origin point of the vector
+ * @param p2 the final point of the vector
+ * @param q the point to compute the direction to
+ *
+ * @return 1 if q is counter-clockwise (left) from p1-p2
+ * @return -1 if q is clockwise (right) from p1-p2
+ * @return 0 if q is collinear with p1-p2
+ */
+ public static int orientationIndex(Coordinate p1, Coordinate p2, Coordinate q)
+ {
+ // fast filter for orientation index
+ // avoids use of slow extended-precision arithmetic in many cases
+ int index = orientationIndexFilter(p1, p2, q);
+ if (index <= 1) return index;
+
+ // normalize coordinates
+ DD dx1 = DD.valueOf(p2.x).selfAdd(-p1.x);
+ DD dy1 = DD.valueOf(p2.y).selfAdd(-p1.y);
+ DD dx2 = DD.valueOf(q.x).selfAdd(-p2.x);
+ DD dy2 = DD.valueOf(q.y).selfAdd(-p2.y);
+
+ // sign of determinant - unrolled for performance
+ return dx1.selfMultiply(dy2).selfSubtract(dy1.selfMultiply(dx2)).signum();
+ }
+
+ /**
+ * Computes the sign of the determinant of the 2x2 matrix
+ * with the given entries.
+ *
+ * @return -1 if the determinant is negative,
+ * @return 1 if the determinant is positive,
+ * @return 0 if the determinant is 0.
+ */
+ public static int signOfDet2x2(DD x1, DD y1, DD x2, DD y2)
+ {
+ DD det = x1.multiply(y2).selfSubtract(y1.multiply(x2));
+ return det.signum();
+ }
+
+ /**
+ * Computes the sign of the determinant of the 2x2 matrix
+ * with the given entries.
+ *
+ * @return -1 if the determinant is negative,
+ * @return 1 if the determinant is positive,
+ * @return 0 if the determinant is 0.
+ */
+ public static int signOfDet2x2(double dx1, double dy1, double dx2, double dy2)
+ {
+ DD x1 = DD.valueOf(dx1);
+ DD y1 = DD.valueOf(dy1);
+ DD x2 = DD.valueOf(dx2);
+ DD y2 = DD.valueOf(dy2);
+
+ DD det = x1.multiply(y2).selfSubtract(y1.multiply(x2));
+ return det.signum();
+ }
+
+ /**
+ * A value which is safely greater than the
+ * relative round-off error in double-precision numbers
+ */
+ private static final double DP_SAFE_EPSILON = 1e-15;
+
+ /**
+ * A filter for computing the orientation index of three coordinates.
+ * <p>
+ * If the orientation can be computed safely using standard DP
+ * arithmetic, this routine returns the orientation index.
+ * Otherwise, a value i > 1 is returned.
+ * In this case the orientation index must
+ * be computed using some other more robust method.
+ * The filter is fast to compute, so can be used to
+ * avoid the use of slower robust methods except when they are really needed,
+ * thus providing better average performance.
+ * <p>
+ * Uses an approach due to Jonathan Shewchuk, which is in the public domain.
+ *
+ * @param pa a coordinate
+ * @param pb a coordinate
+ * @param pc a coordinate
+ * @return the orientation index if it can be computed safely
+ * @return i > 1 if the orientation index cannot be computed safely
+ */
+ private static int orientationIndexFilter(Coordinate pa, Coordinate pb, Coordinate pc)
+ {
+ double detsum;
+
+ double detleft = (pa.x - pc.x) * (pb.y - pc.y);
+ double detright = (pa.y - pc.y) * (pb.x - pc.x);
+ double det = detleft - detright;
+
+ if (detleft > 0.0) {
+ if (detright <= 0.0) {
+ return signum(det);
+ }
+ else {
+ detsum = detleft + detright;
+ }
+ }
+ else if (detleft < 0.0) {
+ if (detright >= 0.0) {
+ return signum(det);
+ }
+ else {
+ detsum = -detleft - detright;
+ }
+ }
+ else {
+ return signum(det);
+ }
+
+ double errbound = DP_SAFE_EPSILON * detsum;
+ if ((det >= errbound) || (-det >= errbound)) {
+ return signum(det);
+ }
+
+ return 2;
+ }
+
+ private static int signum(double x)
+ {
+ if (x > 0) return 1;
+ if (x < 0) return -1;
+ return 0;
+ }
+
+ /**
+ * Computes an intersection point between two lines
+ * using DD arithmetic.
+ * Currently does not handle case of parallel lines.
+ *
+ * @param p1
+ * @param p2
+ * @param q1
+ * @param q2
+ * @return
+ */
+ public static Coordinate intersection(
+ Coordinate p1, Coordinate p2,
+ Coordinate q1, Coordinate q2)
+ {
+ DD denom1 = DD.valueOf(q2.y).selfSubtract(q1.y)
+ .selfMultiply(DD.valueOf(p2.x).selfSubtract(p1.x));
+ DD denom2 = DD.valueOf(q2.x).selfSubtract(q1.x)
+ .selfMultiply(DD.valueOf(p2.y).selfSubtract(p1.y));
+ DD denom = denom1.subtract(denom2);
+
+ /**
+ * Cases:
+ * - denom is 0 if lines are parallel
+ * - intersection point lies within line segment p if fracP is between 0 and 1
+ * - intersection point lies within line segment q if fracQ is between 0 and 1
+ */
+
+ DD numx1 = DD.valueOf(q2.x).selfSubtract(q1.x)
+ .selfMultiply(DD.valueOf(p1.y).selfSubtract(q1.y));
+ DD numx2 = DD.valueOf(q2.y).selfSubtract(q1.y)
+ .selfMultiply(DD.valueOf(p1.x).selfSubtract(q1.x));
+ DD numx = numx1.subtract(numx2);
+ double fracP = numx.selfDivide(denom).doubleValue();
+
+ double x = DD.valueOf(p1.x).selfAdd(DD.valueOf(p2.x).selfSubtract(p1.x).selfMultiply(fracP)).doubleValue();
+
+ DD numy1 = DD.valueOf(p2.x).selfSubtract(p1.x)
+ .selfMultiply(DD.valueOf(p1.y).selfSubtract(q1.y));
+ DD numy2 = DD.valueOf(p2.y).selfSubtract(p1.y)
+ .selfMultiply(DD.valueOf(p1.x).selfSubtract(q1.x));
+ DD numy = numy1.subtract(numy2);
+ double fracQ = numy.selfDivide(denom).doubleValue();
+
+ double y = DD.valueOf(q1.y).selfAdd(DD.valueOf(q2.y).selfSubtract(q1.y).selfMultiply(fracQ)).doubleValue();
+
+ return new Coordinate(x,y);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/Centroid.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/Centroid.java
new file mode 100644
index 0000000..d8aa855
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/Centroid.java
@@ -0,0 +1,256 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Computes the centroid of a {@link Geometry} of any dimension.
+ * If the geometry is nominally of higher dimension,
+ * but has lower <i>effective</i> dimension
+ * (i.e. contains only components
+ * having zero length or area),
+ * the centroid will be computed as for the equivalent lower-dimension geometry.
+ * If the input geometry is empty, a
+ * <code>null</code> Coordinate is returned.
+ *
+ * <h2>Algorithm</h2>
+ * <ul>
+ * <li><b>Dimension 2</b> - the centroid is computed
+ * as the weighted sum of the centroids
+ * of a decomposition of the area into (possibly overlapping) triangles.
+ * Holes and multipolygons are handled correctly.
+ * See <code>http://www.faqs.org/faqs/graphics/algorithms-faq/</code>
+ * for further details of the basic approach.
+ *
+ * <li><b>Dimension 1</b> - Computes the average of the midpoints
+ * of all line segments weighted by the segment length.
+ * Zero-length lines are treated as points.
+ *
+ * <li><b>Dimension 0</b> - Compute the average coordinate for all points.
+ * Repeated points are all included in the average.
+ * </ul>
+ *
+ * @version 1.7
+ */
+public class Centroid
+{
+ /**
+ * Computes the centroid point of a geometry.
+ *
+ * @param geom the geometry to use
+ * @return the centroid point, or null if the geometry is empty
+ */
+ public static Coordinate getCentroid(Geometry geom)
+ {
+ Centroid cent = new Centroid(geom);
+ return cent.getCentroid();
+ }
+
+ private Coordinate areaBasePt = null;// the point all triangles are based at
+ private Coordinate triangleCent3 = new Coordinate();// temporary variable to hold centroid of triangle
+ private double areasum2 = 0; /* Partial area sum */
+ private Coordinate cg3 = new Coordinate(); // partial centroid sum
+
+ // data for linear centroid computation, if needed
+ private Coordinate lineCentSum = new Coordinate();
+ private double totalLength = 0.0;
+
+ private int ptCount = 0;
+ private Coordinate ptCentSum = new Coordinate();
+
+ /**
+ * Creates a new instance for computing the centroid of a geometry
+ */
+ public Centroid(Geometry geom)
+ {
+ areaBasePt = null;
+ add(geom);
+ }
+
+ /**
+ * Adds a Geometry to the centroid total.
+ *
+ * @param geom the geometry to add
+ */
+ private void add(Geometry geom)
+ {
+ if (geom.isEmpty())
+ return;
+ if (geom instanceof Point) {
+ addPoint(geom.getCoordinate());
+ }
+ else if (geom instanceof LineString) {
+ addLineSegments(geom.getCoordinates());
+ }
+ else if (geom instanceof Polygon) {
+ Polygon poly = (Polygon) geom;
+ add(poly);
+ }
+ else if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ add(gc.getGeometryN(i));
+ }
+ }
+ }
+
+ /**
+ * Gets the computed centroid.
+ *
+ * @return the computed centroid, or null if the input is empty
+ */
+ public Coordinate getCentroid()
+ {
+ /**
+ * The centroid is computed from the highest dimension components present in the input.
+ * I.e. areas dominate lineal geometry, which dominates points.
+ * Degenerate geometry are computed using their effective dimension
+ * (e.g. areas may degenerate to lines or points)
+ */
+ Coordinate cent = new Coordinate();
+ if (Math.abs(areasum2) > 0.0) {
+ /**
+ * Input contains areal geometry
+ */
+ cent.x = cg3.x / 3 / areasum2;
+ cent.y = cg3.y / 3 / areasum2;
+ }
+ else if (totalLength > 0.0) {
+ /**
+ * Input contains lineal geometry
+ */
+ cent.x = lineCentSum.x / totalLength;
+ cent.y = lineCentSum.y / totalLength;
+ }
+ else if (ptCount > 0){
+ /**
+ * Input contains puntal geometry only
+ */
+ cent.x = ptCentSum.x / ptCount;
+ cent.y = ptCentSum.y / ptCount;
+ }
+ else {
+ return null;
+ }
+ return cent;
+ }
+
+ private void setAreaBasePoint(Coordinate basePt)
+ {
+ this.areaBasePt = basePt;
+ }
+
+ private void add(Polygon poly)
+ {
+ addShell(poly.getExteriorRing().getCoordinates());
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ addHole(poly.getInteriorRingN(i).getCoordinates());
+ }
+ }
+
+ private void addShell(Coordinate[] pts)
+ {
+ if (pts.length > 0)
+ setAreaBasePoint(pts[0]);
+ boolean isPositiveArea = ! Orientation.isCCW(pts);
+ for (int i = 0; i < pts.length - 1; i++) {
+ addTriangle(areaBasePt, pts[i], pts[i+1], isPositiveArea);
+ }
+ addLineSegments(pts);
+ }
+
+ private void addHole(Coordinate[] pts)
+ {
+ boolean isPositiveArea = Orientation.isCCW(pts);
+ for (int i = 0; i < pts.length - 1; i++) {
+ addTriangle(areaBasePt, pts[i], pts[i+1], isPositiveArea);
+ }
+ addLineSegments(pts);
+ }
+ private void addTriangle(Coordinate p0, Coordinate p1, Coordinate p2, boolean isPositiveArea)
+ {
+ double sign = (isPositiveArea) ? 1.0 : -1.0;
+ centroid3( p0, p1, p2, triangleCent3 );
+ double area2 = area2( p0, p1, p2 );
+ cg3.x += sign * area2 * triangleCent3.x;
+ cg3.y += sign * area2 * triangleCent3.y;
+ areasum2 += sign * area2;
+ }
+ /**
+ * Computes three times the centroid of the triangle p1-p2-p3.
+ * The factor of 3 is
+ * left in to permit division to be avoided until later.
+ */
+ private static void centroid3( Coordinate p1, Coordinate p2, Coordinate p3, Coordinate c )
+ {
+ c.x = p1.x + p2.x + p3.x;
+ c.y = p1.y + p2.y + p3.y;
+ return;
+ }
+
+ /**
+ * Returns twice the signed area of the triangle p1-p2-p3.
+ * The area is positive if the triangle is oriented CCW, and negative if CW.
+ */
+ private static double area2( Coordinate p1, Coordinate p2, Coordinate p3 )
+ {
+ return
+ (p2.x - p1.x) * (p3.y - p1.y) -
+ (p3.x - p1.x) * (p2.y - p1.y);
+ }
+
+ /**
+ * Adds the line segments defined by an array of coordinates
+ * to the linear centroid accumulators.
+ *
+ * @param pts an array of {@link Coordinate}s
+ */
+ private void addLineSegments(Coordinate[] pts)
+ {
+ double lineLen = 0.0;
+ for (int i = 0; i < pts.length - 1; i++) {
+ double segmentLen = pts[i].distance(pts[i + 1]);
+ if (segmentLen == 0.0)
+ continue;
+
+ lineLen += segmentLen;
+
+ double midx = (pts[i].x + pts[i + 1].x) / 2;
+ lineCentSum.x += segmentLen * midx;
+ double midy = (pts[i].y + pts[i + 1].y) / 2;
+ lineCentSum.y += segmentLen * midy;
+ }
+ totalLength += lineLen;
+ if (lineLen == 0.0 && pts.length > 0)
+ addPoint(pts[0]);
+ }
+
+ /**
+ * Adds a point to the point centroid accumulator.
+ * @param pt a {@link Coordinate}
+ */
+ private void addPoint(Coordinate pt)
+ {
+ ptCount += 1;
+ ptCentSum.x += pt.x;
+ ptCentSum.y += pt.y;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/ConvexHull.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/ConvexHull.java
new file mode 100644
index 0000000..5a17155
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/ConvexHull.java
@@ -0,0 +1,509 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Stack;
+import java.util.TreeSet;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jts.util.UniqueCoordinateArrayFilter;
+
+/**
+ * Computes the convex hull of a {@link Geometry}.
+ * The convex hull is the smallest convex Geometry that contains all the
+ * points in the input Geometry.
+ * <p>
+ * Uses the Graham Scan algorithm.
+ *
+ *@version 1.7
+ */
+public class ConvexHull
+{
+ private GeometryFactory geomFactory;
+ private Coordinate[] inputPts;
+
+ /**
+ * Create a new convex hull construction for the input {@link Geometry}.
+ */
+ public ConvexHull(Geometry geometry)
+ {
+ this(extractCoordinates(geometry), geometry.getFactory());
+ }
+ /**
+ * Create a new convex hull construction for the input {@link Coordinate} array.
+ */
+ public ConvexHull(Coordinate[] pts, GeometryFactory geomFactory)
+ {
+ inputPts = UniqueCoordinateArrayFilter.filterCoordinates(pts);
+ //inputPts = pts;
+ this.geomFactory = geomFactory;
+ }
+
+ private static Coordinate[] extractCoordinates(Geometry geom)
+ {
+ UniqueCoordinateArrayFilter filter = new UniqueCoordinateArrayFilter();
+ geom.apply(filter);
+ return filter.getCoordinates();
+ }
+
+ /**
+ * Returns a {@link Geometry} that represents the convex hull of the input
+ * geometry.
+ * The returned geometry contains the minimal number of points needed to
+ * represent the convex hull. In particular, no more than two consecutive
+ * points will be collinear.
+ *
+ * @return if the convex hull contains 3 or more points, a {@link Polygon};
+ * 2 points, a {@link LineString};
+ * 1 point, a {@link Point};
+ * 0 points, an empty {@link GeometryCollection}.
+ */
+ public Geometry getConvexHull() {
+
+ if (inputPts.length == 0) {
+ return geomFactory.createGeometryCollection();
+ }
+ if (inputPts.length == 1) {
+ return geomFactory.createPoint(inputPts[0]);
+ }
+ if (inputPts.length == 2) {
+ return geomFactory.createLineString(inputPts);
+ }
+
+ Coordinate[] reducedPts = inputPts;
+ // use heuristic to reduce points, if large
+ if (inputPts.length > 50) {
+ reducedPts = reduce(inputPts);
+ }
+ // sort points for Graham scan.
+ Coordinate[] sortedPts = preSort(reducedPts);
+
+ // Use Graham scan to find convex hull.
+ Stack cHS = grahamScan(sortedPts);
+
+ // Convert stack to an array.
+ Coordinate[] cH = toCoordinateArray(cHS);
+
+ // Convert array to appropriate output geometry.
+ return lineOrPolygon(cH);
+ }
+
+ /**
+ * An alternative to Stack.toArray, which is not present in earlier versions
+ * of Java.
+ */
+ protected Coordinate[] toCoordinateArray(Stack stack) {
+ Coordinate[] coordinates = new Coordinate[stack.size()];
+ for (int i = 0; i < stack.size(); i++) {
+ Coordinate coordinate = (Coordinate) stack.get(i);
+ coordinates[i] = coordinate;
+ }
+ return coordinates;
+ }
+
+ /**
+ * Uses a heuristic to reduce the number of points scanned
+ * to compute the hull.
+ * The heuristic is to find a polygon guaranteed to
+ * be in (or on) the hull, and eliminate all points inside it.
+ * A quadrilateral defined by the extremal points
+ * in the four orthogonal directions
+ * can be used, but even more inclusive is
+ * to use an octilateral defined by the points in the 8 cardinal directions.
+ * <p>
+ * Note that even if the method used to determine the polygon vertices
+ * is not 100% robust, this does not affect the robustness of the convex hull.
+ * <p>
+ * To satisfy the requirements of the Graham Scan algorithm,
+ * the returned array has at least 3 entries.
+ *
+ * @param pts the points to reduce
+ * @return the reduced list of points (at least 3)
+ */
+ private Coordinate[] reduce(Coordinate[] inputPts)
+ {
+ //Coordinate[] polyPts = computeQuad(inputPts);
+ Coordinate[] polyPts = computeOctRing(inputPts);
+ //Coordinate[] polyPts = null;
+
+ // unable to compute interior polygon for some reason
+ if (polyPts == null)
+ return inputPts;
+
+// LinearRing ring = geomFactory.createLinearRing(polyPts);
+// System.out.println(ring);
+
+ // add points defining polygon
+ TreeSet reducedSet = new TreeSet();
+ for (int i = 0; i < polyPts.length; i++) {
+ reducedSet.add(polyPts[i]);
+ }
+ /**
+ * Add all unique points not in the interior poly.
+ * CGAlgorithms.isPointInRing is not defined for points actually on the ring,
+ * but this doesn't matter since the points of the interior polygon
+ * are forced to be in the reduced set.
+ */
+ for (int i = 0; i < inputPts.length; i++) {
+ if (! PointLocation.isInRing(inputPts[i], polyPts)) {
+ reducedSet.add(inputPts[i]);
+ }
+ }
+ Coordinate[] reducedPts = CoordinateArrays.toCoordinateArray(reducedSet);
+
+ // ensure that computed array has at least 3 points (not necessarily unique)
+ if (reducedPts.length < 3)
+ return padArray3(reducedPts);
+ return reducedPts;
+ }
+
+ private Coordinate[] padArray3(Coordinate[] pts)
+ {
+ Coordinate[] pad = new Coordinate[3];
+ for (int i = 0; i < pad.length; i++) {
+ if (i < pts.length) {
+ pad[i] = pts[i];
+ }
+ else
+ pad[i] = pts[0];
+ }
+ return pad;
+ }
+
+ private Coordinate[] preSort(Coordinate[] pts) {
+ Coordinate t;
+
+ // find the lowest point in the set. If two or more points have
+ // the same minimum y coordinate choose the one with the minimu x.
+ // This focal point is put in array location pts[0].
+ for (int i = 1; i < pts.length; i++) {
+ if ((pts[i].y < pts[0].y) || ((pts[i].y == pts[0].y) && (pts[i].x < pts[0].x))) {
+ t = pts[0];
+ pts[0] = pts[i];
+ pts[i] = t;
+ }
+ }
+
+ // sort the points radially around the focal point.
+ Arrays.sort(pts, 1, pts.length, new RadialComparator(pts[0]));
+
+ //radialSort(pts);
+ return pts;
+ }
+
+ /**
+ * Uses the Graham Scan algorithm to compute the convex hull vertices.
+ *
+ * @param c a list of points, with at least 3 entries
+ * @return a Stack containing the ordered points of the convex hull ring
+ */
+ private Stack grahamScan(Coordinate[] c) {
+ Coordinate p;
+ Stack ps = new Stack();
+ ps.push(c[0]);
+ ps.push(c[1]);
+ ps.push(c[2]);
+ for (int i = 3; i < c.length; i++) {
+ p = (Coordinate) ps.pop();
+ // check for empty stack to guard against robustness problems
+ while (
+ ! ps.empty() &&
+ Orientation.index((Coordinate) ps.peek(), p, c[i]) > 0) {
+ p = (Coordinate) ps.pop();
+ }
+ ps.push(p);
+ ps.push(c[i]);
+ }
+ ps.push(c[0]);
+ return ps;
+ }
+
+ /**
+ *@return whether the three coordinates are collinear and c2 lies between
+ * c1 and c3 inclusive
+ */
+ private boolean isBetween(Coordinate c1, Coordinate c2, Coordinate c3) {
+ if (Orientation.index(c1, c2, c3) != 0) {
+ return false;
+ }
+ if (c1.x != c3.x) {
+ if (c1.x <= c2.x && c2.x <= c3.x) {
+ return true;
+ }
+ if (c3.x <= c2.x && c2.x <= c1.x) {
+ return true;
+ }
+ }
+ if (c1.y != c3.y) {
+ if (c1.y <= c2.y && c2.y <= c3.y) {
+ return true;
+ }
+ if (c3.y <= c2.y && c2.y <= c1.y) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private Coordinate[] computeOctRing(Coordinate[] inputPts) {
+ Coordinate[] octPts = computeOctPts(inputPts);
+ CoordinateList coordList = new CoordinateList();
+ coordList.add(octPts, false);
+
+ // points must all lie in a line
+ if (coordList.size() < 3) {
+ return null;
+ }
+ coordList.closeRing();
+ return coordList.toCoordinateArray();
+ }
+
+ private Coordinate[] computeOctPts(Coordinate[] inputPts)
+ {
+ Coordinate[] pts = new Coordinate[8];
+ for (int j = 0; j < pts.length; j++) {
+ pts[j] = inputPts[0];
+ }
+ for (int i = 1; i < inputPts.length; i++) {
+ if (inputPts[i].x < pts[0].x) {
+ pts[0] = inputPts[i];
+ }
+ if (inputPts[i].x - inputPts[i].y < pts[1].x - pts[1].y) {
+ pts[1] = inputPts[i];
+ }
+ if (inputPts[i].y > pts[2].y) {
+ pts[2] = inputPts[i];
+ }
+ if (inputPts[i].x + inputPts[i].y > pts[3].x + pts[3].y) {
+ pts[3] = inputPts[i];
+ }
+ if (inputPts[i].x > pts[4].x) {
+ pts[4] = inputPts[i];
+ }
+ if (inputPts[i].x - inputPts[i].y > pts[5].x - pts[5].y) {
+ pts[5] = inputPts[i];
+ }
+ if (inputPts[i].y < pts[6].y) {
+ pts[6] = inputPts[i];
+ }
+ if (inputPts[i].x + inputPts[i].y < pts[7].x + pts[7].y) {
+ pts[7] = inputPts[i];
+ }
+ }
+ return pts;
+
+ }
+
+/*
+ // MD - no longer used, but keep for reference purposes
+ private Coordinate[] computeQuad(Coordinate[] inputPts) {
+ BigQuad bigQuad = bigQuad(inputPts);
+
+ // Build a linear ring defining a big poly.
+ ArrayList bigPoly = new ArrayList();
+ bigPoly.add(bigQuad.westmost);
+ if (! bigPoly.contains(bigQuad.northmost)) {
+ bigPoly.add(bigQuad.northmost);
+ }
+ if (! bigPoly.contains(bigQuad.eastmost)) {
+ bigPoly.add(bigQuad.eastmost);
+ }
+ if (! bigPoly.contains(bigQuad.southmost)) {
+ bigPoly.add(bigQuad.southmost);
+ }
+ // points must all lie in a line
+ if (bigPoly.size() < 3) {
+ return null;
+ }
+ // closing point
+ bigPoly.add(bigQuad.westmost);
+
+ Coordinate[] bigPolyArray = CoordinateArrays.toCoordinateArray(bigPoly);
+
+ return bigPolyArray;
+ }
+
+ private BigQuad bigQuad(Coordinate[] pts) {
+ BigQuad bigQuad = new BigQuad();
+ bigQuad.northmost = pts[0];
+ bigQuad.southmost = pts[0];
+ bigQuad.westmost = pts[0];
+ bigQuad.eastmost = pts[0];
+ for (int i = 1; i < pts.length; i++) {
+ if (pts[i].x < bigQuad.westmost.x) {
+ bigQuad.westmost = pts[i];
+ }
+ if (pts[i].x > bigQuad.eastmost.x) {
+ bigQuad.eastmost = pts[i];
+ }
+ if (pts[i].y < bigQuad.southmost.y) {
+ bigQuad.southmost = pts[i];
+ }
+ if (pts[i].y > bigQuad.northmost.y) {
+ bigQuad.northmost = pts[i];
+ }
+ }
+ return bigQuad;
+ }
+
+ private static class BigQuad {
+ public Coordinate northmost;
+ public Coordinate southmost;
+ public Coordinate westmost;
+ public Coordinate eastmost;
+ }
+ */
+
+ /**
+ *@param vertices the vertices of a linear ring, which may or may not be
+ * flattened (i.e. vertices collinear)
+ *@return a 2-vertex <code>LineString</code> if the vertices are
+ * collinear; otherwise, a <code>Polygon</code> with unnecessary
+ * (collinear) vertices removed
+ */
+ private Geometry lineOrPolygon(Coordinate[] coordinates) {
+
+ coordinates = cleanRing(coordinates);
+ if (coordinates.length == 3) {
+ return geomFactory.createLineString(new Coordinate[]{coordinates[0], coordinates[1]});
+// return new LineString(new Coordinate[]{coordinates[0], coordinates[1]},
+// geometry.getPrecisionModel(), geometry.getSRID());
+ }
+ LinearRing linearRing = geomFactory.createLinearRing(coordinates);
+ return geomFactory.createPolygon(linearRing);
+ }
+
+ /**
+ *@param vertices the vertices of a linear ring, which may or may not be
+ * flattened (i.e. vertices collinear)
+ *@return the coordinates with unnecessary (collinear) vertices
+ * removed
+ */
+ private Coordinate[] cleanRing(Coordinate[] original) {
+ Assert.equals(original[0], original[original.length - 1]);
+ ArrayList cleanedRing = new ArrayList();
+ Coordinate previousDistinctCoordinate = null;
+ for (int i = 0; i <= original.length - 2; i++) {
+ Coordinate currentCoordinate = original[i];
+ Coordinate nextCoordinate = original[i+1];
+ if (currentCoordinate.equals(nextCoordinate)) {
+ continue;
+ }
+ if (previousDistinctCoordinate != null
+ && isBetween(previousDistinctCoordinate, currentCoordinate, nextCoordinate)) {
+ continue;
+ }
+ cleanedRing.add(currentCoordinate);
+ previousDistinctCoordinate = currentCoordinate;
+ }
+ cleanedRing.add(original[original.length - 1]);
+ Coordinate[] cleanedRingCoordinates = new Coordinate[cleanedRing.size()];
+ return (Coordinate[]) cleanedRing.toArray(cleanedRingCoordinates);
+ }
+
+
+ /**
+ * Compares {@link Coordinate}s for their angle and distance
+ * relative to an origin.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+ private static class RadialComparator
+ implements Comparator
+ {
+ private Coordinate origin;
+
+ public RadialComparator(Coordinate origin)
+ {
+ this.origin = origin;
+ }
+ public int compare(Object o1, Object o2)
+ {
+ Coordinate p1 = (Coordinate) o1;
+ Coordinate p2 = (Coordinate) o2;
+ return polarCompare(origin, p1, p2);
+ }
+
+ /**
+ * Given two points p and q compare them with respect to their radial
+ * ordering about point o. First checks radial ordering.
+ * If points are collinear, the comparison is based
+ * on their distance to the origin.
+ * <p>
+ * p < q iff
+ * <ul>
+ * <li>ang(o-p) < ang(o-q) (e.g. o-p-q is CCW)
+ * <li>or ang(o-p) == ang(o-q) && dist(o,p) < dist(o,q)
+ * </ul>
+ *
+ * @param o the origin
+ * @param p a point
+ * @param q another point
+ * @return -1, 0 or 1 depending on whether p is less than,
+ * equal to or greater than q
+ */
+ private static int polarCompare(Coordinate o, Coordinate p, Coordinate q)
+ {
+ double dxp = p.x - o.x;
+ double dyp = p.y - o.y;
+ double dxq = q.x - o.x;
+ double dyq = q.y - o.y;
+
+/*
+ // MD - non-robust
+ int result = 0;
+ double alph = Math.atan2(dxp, dyp);
+ double beta = Math.atan2(dxq, dyq);
+ if (alph < beta) {
+ result = -1;
+ }
+ if (alph > beta) {
+ result = 1;
+ }
+ if (result != 0) return result;
+ //*/
+
+ int orient = Orientation.index(o, p, q);
+
+ if (orient == Orientation.COUNTERCLOCKWISE) return 1;
+ if (orient == Orientation.CLOCKWISE) return -1;
+
+ // points are collinear - check distance
+ double op = dxp * dxp + dyp * dyp;
+ double oq = dxq * dxq + dyq * dyq;
+ if (op < oq) {
+ return -1;
+ }
+ if (op > oq) {
+ return 1;
+ }
+ return 0;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/Distance.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/Distance.java
new file mode 100644
index 0000000..bdc7709
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/Distance.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.math.MathUtil;
+
+/**
+ * Functions to compute distance between basic geometric structures.
+ *
+ * @author Martin Davis
+ *
+ */
+public class Distance {
+
+ /**
+ * Computes the distance from a line segment AB to a line segment CD
+ *
+ * Note: NON-ROBUST!
+ *
+ * @param A
+ * a point of one line
+ * @param B
+ * the second point of (must be different to A)
+ * @param C
+ * one point of the line
+ * @param D
+ * another point of the line (must be different to A)
+ */
+ public static double segmentToSegment(Coordinate A, Coordinate B,
+ Coordinate C, Coordinate D)
+ {
+ // check for zero-length segments
+ if (A.equals(B))
+ return Distance.pointToSegment(A, C, D);
+ if (C.equals(D))
+ return Distance.pointToSegment(D, A, B);
+
+ // AB and CD are line segments
+ /*
+ * from comp.graphics.algo
+ *
+ * Solving the above for r and s yields
+ *
+ * (Ay-Cy)(Dx-Cx)-(Ax-Cx)(Dy-Cy)
+ * r = ----------------------------- (eqn 1)
+ * (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx)
+ *
+ * (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+ * s = ----------------------------- (eqn 2)
+ * (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx)
+ *
+ * Let P be the position vector of the
+ * intersection point, then
+ * P=A+r(B-A) or
+ * Px=Ax+r(Bx-Ax)
+ * Py=Ay+r(By-Ay)
+ * By examining the values of r & s, you can also determine some other limiting
+ * conditions:
+ * If 0<=r<=1 & 0<=s<=1, intersection exists
+ * r<0 or r>1 or s<0 or s>1 line segments do not intersect
+ * If the denominator in eqn 1 is zero, AB & CD are parallel
+ * If the numerator in eqn 1 is also zero, AB & CD are collinear.
+ */
+
+ boolean noIntersection = false;
+ if (! Envelope.intersects(A, B, C, D)) {
+ noIntersection = true;
+ }
+ else {
+ double denom = (B.x - A.x) * (D.y - C.y) - (B.y - A.y) * (D.x - C.x);
+
+ if (denom == 0) {
+ noIntersection = true;
+ }
+ else {
+ double r_num = (A.y - C.y) * (D.x - C.x) - (A.x - C.x) * (D.y - C.y);
+ double s_num = (A.y - C.y) * (B.x - A.x) - (A.x - C.x) * (B.y - A.y);
+
+ double s = s_num / denom;
+ double r = r_num / denom;
+
+ if ((r < 0) || (r > 1) || (s < 0) || (s > 1)) {
+ noIntersection = true;
+ }
+ }
+ }
+ if (noIntersection) {
+ return MathUtil.min(
+ Distance.pointToSegment(A, C, D),
+ Distance.pointToSegment(B, C, D),
+ Distance.pointToSegment(C, A, B),
+ Distance.pointToSegment(D, A, B));
+ }
+ // segments intersect
+ return 0.0;
+ }
+
+ /**
+ * Computes the distance from a point to a sequence of line segments.
+ *
+ * @param p
+ * a point
+ * @param line
+ * a sequence of contiguous line segments defined by their vertices
+ * @return the minimum distance between the point and the line segments
+ */
+ public static double pointToSegmentString(Coordinate p, Coordinate[] line)
+ {
+ if (line.length == 0)
+ throw new IllegalArgumentException(
+ "Line array must contain at least one vertex");
+ // this handles the case of length = 1
+ double minDistance = p.distance(line[0]);
+ for (int i = 0; i < line.length - 1; i++) {
+ double dist = Distance.pointToSegment(p, line[i], line[i + 1]);
+ if (dist < minDistance) {
+ minDistance = dist;
+ }
+ }
+ return minDistance;
+ }
+
+ /**
+ * Computes the distance from a point p to a line segment AB
+ *
+ * Note: NON-ROBUST!
+ *
+ * @param p
+ * the point to compute the distance for
+ * @param A
+ * one point of the line
+ * @param B
+ * another point of the line (must be different to A)
+ * @return the distance from p to line segment AB
+ */
+ public static double pointToSegment(Coordinate p, Coordinate A,
+ Coordinate B)
+ {
+ // if start = end, then just compute distance to one of the endpoints
+ if (A.x == B.x && A.y == B.y)
+ return p.distance(A);
+
+ // otherwise use comp.graphics.algorithms Frequently Asked Questions method
+ /*
+ * (1) r = AC dot AB
+ * ---------
+ * ||AB||^2
+ *
+ * r has the following meaning:
+ * r=0 P = A
+ * r=1 P = B
+ * r<0 P is on the backward extension of AB
+ * r>1 P is on the forward extension of AB
+ * 0<r<1 P is interior to AB
+ */
+
+ double len2 = (B.x - A.x) * (B.x - A.x) + (B.y - A.y) * (B.y - A.y);
+ double r = ((p.x - A.x) * (B.x - A.x) + (p.y - A.y) * (B.y - A.y))
+ / len2;
+
+ if (r <= 0.0)
+ return p.distance(A);
+ if (r >= 1.0)
+ return p.distance(B);
+
+ /*
+ * (2) s = (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+ * -----------------------------
+ * L^2
+ *
+ * Then the distance from C to P = |s|*L.
+ *
+ * This is the same calculation as {@link #distancePointLinePerpendicular}.
+ * Unrolled here for performance.
+ */
+ double s = ((A.y - p.y) * (B.x - A.x) - (A.x - p.x) * (B.y - A.y))
+ / len2;
+ return Math.abs(s) * Math.sqrt(len2);
+ }
+
+ /**
+ * Computes the perpendicular distance from a point p to the (infinite) line
+ * containing the points AB
+ *
+ * @param p
+ * the point to compute the distance for
+ * @param A
+ * one point of the line
+ * @param B
+ * another point of the line (must be different to A)
+ * @return the distance from p to line AB
+ */
+ public static double pointToLinePerpendicular(Coordinate p,
+ Coordinate A, Coordinate B)
+ {
+ // use comp.graphics.algorithms Frequently Asked Questions method
+ /*
+ * (2) s = (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+ * -----------------------------
+ * L^2
+ *
+ * Then the distance from C to P = |s|*L.
+ */
+ double len2 = (B.x - A.x) * (B.x - A.x) + (B.y - A.y) * (B.y - A.y);
+ double s = ((A.y - p.y) * (B.x - A.x) - (A.x - p.x) * (B.y - A.y))
+ / len2;
+
+ return Math.abs(s) * Math.sqrt(len2);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/HCoordinate.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/HCoordinate.java
new file mode 100644
index 0000000..eb0df67
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/HCoordinate.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Represents a homogeneous coordinate in a 2-D coordinate space.
+ * In JTS {@link HCoordinate}s are used as a clean way
+ * of computing intersections between line segments.
+ *
+ * @author David Skea
+ * @version 1.7
+ */
+public class HCoordinate
+{
+
+ /**
+ * Computes the (approximate) intersection point between two line segments
+ * using homogeneous coordinates.
+ * <p>
+ * Note that this algorithm is
+ * not numerically stable; i.e. it can produce intersection points which
+ * lie outside the envelope of the line segments themselves. In order
+ * to increase the precision of the calculation input points should be normalized
+ * before passing them to this routine.
+ */
+ public static Coordinate intersection(
+ Coordinate p1, Coordinate p2,
+ Coordinate q1, Coordinate q2)
+ throws NotRepresentableException
+ {
+ // unrolled computation
+ double px = p1.y - p2.y;
+ double py = p2.x - p1.x;
+ double pw = p1.x * p2.y - p2.x * p1.y;
+
+ double qx = q1.y - q2.y;
+ double qy = q2.x - q1.x;
+ double qw = q1.x * q2.y - q2.x * q1.y;
+
+ double x = py * qw - qy * pw;
+ double y = qx * pw - px * qw;
+ double w = px * qy - qx * py;
+
+ double xInt = x/w;
+ double yInt = y/w;
+
+ if ((Double.isNaN(xInt)) || (Double.isInfinite(xInt)
+ || Double.isNaN(yInt)) || (Double.isInfinite(yInt))) {
+ throw new NotRepresentableException();
+ }
+
+ return new Coordinate(xInt, yInt);
+ }
+
+ /*
+ public static Coordinate OLDintersection(
+ Coordinate p1, Coordinate p2,
+ Coordinate q1, Coordinate q2)
+ throws NotRepresentableException
+ {
+ HCoordinate l1 = new HCoordinate(p1, p2);
+ HCoordinate l2 = new HCoordinate(q1, q2);
+ HCoordinate intHCoord = new HCoordinate(l1, l2);
+ Coordinate intPt = intHCoord.getCoordinate();
+ return intPt;
+ }
+ */
+
+ public double x,y,w;
+
+ public HCoordinate() {
+ x = 0.0;
+ y = 0.0;
+ w = 1.0;
+ }
+
+ public HCoordinate(double _x, double _y, double _w) {
+ x = _x;
+ y = _y;
+ w = _w;
+ }
+
+ public HCoordinate(double _x, double _y) {
+ x = _x;
+ y = _y;
+ w = 1.0;
+ }
+
+ public HCoordinate(Coordinate p) {
+ x = p.x;
+ y = p.y;
+ w = 1.0;
+ }
+
+ public HCoordinate(HCoordinate p1, HCoordinate p2)
+ {
+ x = p1.y * p2.w - p2.y * p1.w;
+ y = p2.x * p1.w - p1.x * p2.w;
+ w = p1.x * p2.y - p2.x * p1.y;
+ }
+
+ /**
+ * Constructs a homogeneous coordinate which is the intersection of the lines
+ * define by the homogenous coordinates represented by two
+ * {@link Coordinate}s.
+ *
+ * @param p1
+ * @param p2
+ */
+ public HCoordinate(Coordinate p1, Coordinate p2)
+ {
+ // optimization when it is known that w = 1
+ x = p1.y - p2.y;
+ y = p2.x - p1.x;
+ w = p1.x * p2.y - p2.x * p1.y;
+ }
+
+ public HCoordinate(Coordinate p1, Coordinate p2, Coordinate q1, Coordinate q2)
+ {
+ // unrolled computation
+ double px = p1.y - p2.y;
+ double py = p2.x - p1.x;
+ double pw = p1.x * p2.y - p2.x * p1.y;
+
+ double qx = q1.y - q2.y;
+ double qy = q2.x - q1.x;
+ double qw = q1.x * q2.y - q2.x * q1.y;
+
+ x = py * qw - qy * pw;
+ y = qx * pw - px * qw;
+ w = px * qy - qx * py;
+ }
+
+ public double getX() throws NotRepresentableException {
+ double a = x/w;
+ if ((Double.isNaN(a)) || (Double.isInfinite(a))) {
+ throw new NotRepresentableException();
+ }
+ return a;
+ }
+
+ public double getY() throws NotRepresentableException {
+ double a = y/w;
+ if ((Double.isNaN(a)) || (Double.isInfinite(a))) {
+ throw new NotRepresentableException();
+ }
+ return a;
+ }
+
+ public Coordinate getCoordinate() throws NotRepresentableException {
+ Coordinate p = new Coordinate();
+ p.x = getX();
+ p.y = getY();
+ return p;
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointArea.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointArea.java
new file mode 100644
index 0000000..72f813a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointArea.java
@@ -0,0 +1,246 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Computes a point in the interior of an areal geometry.
+ *
+ * <h2>Algorithm</h2>
+ * <ul>
+ * <li>Find a Y value which is close to the centre of
+ * the geometry's vertical extent but is different
+ * to any of it's Y ordinates.
+ * <li>Create a horizontal bisector line using the Y value
+ * and the geometry's horizontal extent
+ * <li>Find the intersection between the geometry
+ * and the horizontal bisector line.
+ * The intersection is a collection of lines and points.
+ * <li>Pick the midpoint of the largest intersection geometry
+ * </ul>
+ *
+ * <h3>KNOWN BUGS</h3>
+ * <ul>
+ * <li>If a fixed precision model is used,
+ * in some cases this method may return a point
+ * which does not lie in the interior.
+ * </ul>
+ *
+ * @version 1.7
+ */
+public class InteriorPointArea {
+
+ private static double avg(double a, double b)
+ {
+ return (a + b) / 2.0;
+ }
+
+ private GeometryFactory factory;
+ private Coordinate interiorPoint = null;
+ private double maxWidth = 0.0;
+
+ /**
+ * Creates a new interior point finder
+ * for an areal geometry.
+ *
+ * @param g an areal geometry
+ */
+ public InteriorPointArea(Geometry g)
+ {
+ factory = g.getFactory();
+ add(g);
+ }
+
+ /**
+ * Gets the computed interior point.
+ *
+ * @return the coordinate of an interior point
+ */
+ public Coordinate getInteriorPoint()
+ {
+ return interiorPoint;
+ }
+
+ /**
+ * Tests the interior vertices (if any)
+ * defined by an areal Geometry for the best inside point.
+ * If a component Geometry is not of dimension 2 it is not tested.
+ *
+ * @param geom the geometry to add
+ */
+ private void add(Geometry geom)
+ {
+ if (geom instanceof Polygon) {
+ addPolygon(geom);
+ }
+ else if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ add(gc.getGeometryN(i));
+ }
+ }
+ }
+
+ /**
+ * Finds an interior point of a Polygon.
+ * @param geometry the geometry to analyze
+ */
+ private void addPolygon(Geometry geometry) {
+ if (geometry.isEmpty())
+ return;
+
+ Coordinate intPt;
+ double width;
+
+ LineString bisector = horizontalBisector(geometry);
+ if (bisector.getLength() == 0.0) {
+ width = 0;
+ intPt = bisector.getCoordinate();
+ }
+ else {
+ Geometry intersections = bisector.intersection(geometry);
+ Geometry widestIntersection = widestGeometry(intersections);
+ width = widestIntersection.getEnvelopeInternal().getWidth();
+ intPt = centre(widestIntersection.getEnvelopeInternal());
+ }
+ if (interiorPoint == null || width > maxWidth) {
+ interiorPoint = intPt;
+ maxWidth = width;
+ }
+ }
+
+ //@return if geometry is a collection, the widest sub-geometry; otherwise,
+ //the geometry itself
+ private Geometry widestGeometry(Geometry geometry) {
+ if (!(geometry instanceof GeometryCollection)) {
+ return geometry;
+ }
+ return widestGeometry((GeometryCollection) geometry);
+ }
+
+ private Geometry widestGeometry(GeometryCollection gc) {
+ if (gc.isEmpty()) {
+ return gc;
+ }
+
+ Geometry widestGeometry = gc.getGeometryN(0);
+ // scan remaining geom components to see if any are wider
+ for (int i = 1; i < gc.getNumGeometries(); i++) {
+ if (gc.getGeometryN(i).getEnvelopeInternal().getWidth() >
+ widestGeometry.getEnvelopeInternal().getWidth()) {
+ widestGeometry = gc.getGeometryN(i);
+ }
+ }
+ return widestGeometry;
+ }
+
+ protected LineString horizontalBisector(Geometry geometry) {
+ Envelope envelope = geometry.getEnvelopeInternal();
+
+ /**
+ * Original algorithm. Fails when geometry contains a horizontal
+ * segment at the Y midpoint.
+ */
+ // Assert: for areas, minx <> maxx
+ //double avgY = avg(envelope.getMinY(), envelope.getMaxY());
+
+ double bisectY = SafeBisectorFinder.getBisectorY((Polygon) geometry);
+ return factory.createLineString(new Coordinate[] {
+ new Coordinate(envelope.getMinX(), bisectY),
+ new Coordinate(envelope.getMaxX(), bisectY)
+ });
+ }
+
+ /**
+ * Returns the centre point of the envelope.
+ * @param envelope the envelope to analyze
+ * @return the centre of the envelope
+ */
+ public static Coordinate centre(Envelope envelope) {
+ return new Coordinate(avg(envelope.getMinX(),
+ envelope.getMaxX()),
+ avg(envelope.getMinY(), envelope.getMaxY()));
+ }
+
+ /**
+ * Finds a safe bisector Y ordinate
+ * by projecting to the Y axis
+ * and finding the Y-ordinate interval
+ * which contains the centre of the Y extent.
+ * The centre of this interval is returned as the bisector Y-ordinate.
+ *
+ * @author mdavis
+ *
+ */
+ private static class SafeBisectorFinder
+ {
+ public static double getBisectorY(Polygon poly)
+ {
+ SafeBisectorFinder finder = new SafeBisectorFinder(poly);
+ return finder.getBisectorY();
+ }
+
+ private Polygon poly;
+
+ private double centreY;
+ private double hiY = Double.MAX_VALUE;
+ private double loY = -Double.MAX_VALUE;
+
+ public SafeBisectorFinder(Polygon poly) {
+ this.poly = poly;
+
+ // initialize using extremal values
+ hiY = poly.getEnvelopeInternal().getMaxY();
+ loY = poly.getEnvelopeInternal().getMinY();
+ centreY = avg(loY, hiY);
+ }
+
+ public double getBisectorY()
+ {
+ process(poly.getExteriorRing());
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ process(poly.getInteriorRingN(i));
+ }
+ double bisectY = avg(hiY, loY);
+ return bisectY;
+ }
+
+ private void process(LineString line) {
+ CoordinateSequence seq = line.getCoordinateSequence();
+ for (int i = 0; i < seq.size(); i++) {
+ double y = seq.getY(i);
+ updateInterval(y);
+ }
+ }
+
+ private void updateInterval(double y) {
+ if (y <= centreY) {
+ if (y > loY)
+ loY = y;
+ }
+ else if (y > centreY) {
+ if (y < hiY) {
+ hiY = y;
+ }
+ }
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointLine.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointLine.java
new file mode 100644
index 0000000..1971d5d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointLine.java
@@ -0,0 +1,109 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * Computes a point in the interior of an linear geometry.
+ * <h2>Algorithm</h2>
+ * <ul>
+ * <li>Find an interior vertex which is closest to
+ * the centroid of the linestring.
+ * <li>If there is no interior vertex, find the endpoint which is
+ * closest to the centroid.
+ * </ul>
+ *
+ * @version 1.7
+ */
+public class InteriorPointLine {
+
+ private Coordinate centroid;
+ private double minDistance = Double.MAX_VALUE;
+
+ private Coordinate interiorPoint = null;
+
+ public InteriorPointLine(Geometry g)
+ {
+ centroid = g.getCentroid().getCoordinate();
+ addInterior(g);
+ if (interiorPoint == null)
+ addEndpoints(g);
+ }
+
+ public Coordinate getInteriorPoint()
+ {
+ return interiorPoint;
+ }
+
+ /**
+ * Tests the interior vertices (if any)
+ * defined by a linear Geometry for the best inside point.
+ * If a Geometry is not of dimension 1 it is not tested.
+ * @param geom the geometry to add
+ */
+ private void addInterior(Geometry geom)
+ {
+ if (geom instanceof LineString) {
+ addInterior(geom.getCoordinates());
+ }
+ else if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ addInterior(gc.getGeometryN(i));
+ }
+ }
+ }
+ private void addInterior(Coordinate[] pts)
+ {
+ for (int i = 1; i < pts.length - 1; i++) {
+ add(pts[i]);
+ }
+ }
+ /**
+ * Tests the endpoint vertices
+ * defined by a linear Geometry for the best inside point.
+ * If a Geometry is not of dimension 1 it is not tested.
+ * @param geom the geometry to add
+ */
+ private void addEndpoints(Geometry geom)
+ {
+ if (geom instanceof LineString) {
+ addEndpoints(geom.getCoordinates());
+ }
+ else if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ addEndpoints(gc.getGeometryN(i));
+ }
+ }
+ }
+ private void addEndpoints(Coordinate[] pts)
+ {
+ add(pts[0]);
+ add(pts[pts.length - 1]);
+ }
+
+ private void add(Coordinate point)
+ {
+ double dist = point.distance(centroid);
+ if (dist < minDistance) {
+ interiorPoint = new Coordinate(point);
+ minDistance = dist;
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointPoint.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointPoint.java
new file mode 100644
index 0000000..71e14ce
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/InteriorPointPoint.java
@@ -0,0 +1,70 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * Computes a point in the interior of an point geometry.
+ * <h2>Algorithm</h2>
+ * Find a point which is closest to the centroid of the geometry.
+ *
+ * @version 1.7
+ */
+public class InteriorPointPoint {
+
+ private Coordinate centroid;
+ private double minDistance = Double.MAX_VALUE;
+
+ private Coordinate interiorPoint = null;
+
+ public InteriorPointPoint(Geometry g)
+ {
+ centroid = g.getCentroid().getCoordinate();
+ add(g);
+ }
+
+ /**
+ * Tests the point(s) defined by a Geometry for the best inside point.
+ * If a Geometry is not of dimension 0 it is not tested.
+ * @param geom the geometry to add
+ */
+ private void add(Geometry geom)
+ {
+ if (geom instanceof Point) {
+ add(geom.getCoordinate());
+ }
+ else if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ add(gc.getGeometryN(i));
+ }
+ }
+ }
+ private void add(Coordinate point)
+ {
+ double dist = point.distance(centroid);
+ if (dist < minDistance) {
+ interiorPoint = new Coordinate(point);
+ minDistance = dist;
+ }
+ }
+
+ public Coordinate getInteriorPoint()
+ {
+ return interiorPoint;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/Length.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/Length.java
new file mode 100644
index 0000000..9857bd7
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/Length.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+
+/**
+ * Functions for computing length.
+ *
+ * @author Martin Davis
+ *
+ */
+public class Length {
+
+ /**
+ * Computes the length of a linestring specified by a sequence of points.
+ *
+ * @param pts the points specifying the linestring
+ * @return the length of the linestring
+ */
+ public static double ofLine(CoordinateSequence pts)
+ {
+ // optimized for processing CoordinateSequences
+ int n = pts.size();
+ if (n <= 1)
+ return 0.0;
+
+ double len = 0.0;
+
+ Coordinate p = new Coordinate();
+ pts.getCoordinate(0, p);
+ double x0 = p.x;
+ double y0 = p.y;
+
+ for (int i = 1; i < n; i++) {
+ pts.getCoordinate(i, p);
+ double x1 = p.x;
+ double y1 = p.y;
+ double dx = x1 - x0;
+ double dy = y1 - y0;
+
+ len += Math.sqrt(dx * dx + dy * dy);
+
+ x0 = x1;
+ y0 = y1;
+ }
+ return len;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/LineIntersector.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/LineIntersector.java
new file mode 100644
index 0000000..64c038b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/LineIntersector.java
@@ -0,0 +1,418 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+/**
+ * @version 1.7
+ */
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A <code>LineIntersector</code> is an algorithm that can both test whether
+ * two line segments intersect and compute the intersection point(s)
+ * if they do.
+ * <p>
+ * There are three possible outcomes when determining whether two line segments intersect:
+ * <ul>
+ * <li>{@link #NO_INTERSECTION} - the segments do not intersect
+ * <li>{@link #POINT_INTERSECTION} - the segments intersect in a single point
+ * <li>{@link #COLLINEAR_INTERSECTION} - the segments are collinear and they intersect in a line segment
+ * </ul>
+ * For segments which intersect in a single point, the point may be either an endpoint
+ * or in the interior of each segment.
+ * If the point lies in the interior of both segments,
+ * this is termed a <i>proper intersection</i>.
+ * The method {@link #isProper()} test for this situation.
+ * <p>
+ * The intersection point(s) may be computed in a precise or non-precise manner.
+ * Computing an intersection point precisely involves rounding it
+ * via a supplied {@link PrecisionModel}.
+ * <p>
+ * LineIntersectors do not perform an initial envelope intersection test
+ * to determine if the segments are disjoint.
+ * This is because this class is likely to be used in a context where
+ * envelope overlap is already known to occur (or be likely).
+ *
+ * @version 1.7
+ */
+public abstract class LineIntersector
+{
+/**
+ * These are deprecated, due to ambiguous naming
+ */
+ public final static int DONT_INTERSECT = 0;
+ public final static int DO_INTERSECT = 1;
+ public final static int COLLINEAR = 2;
+
+ /**
+ * Indicates that line segments do not intersect
+ */
+ public final static int NO_INTERSECTION = 0;
+
+ /**
+ * Indicates that line segments intersect in a single point
+ */
+ public final static int POINT_INTERSECTION = 1;
+
+ /**
+ * Indicates that line segments intersect in a line segment
+ */
+ public final static int COLLINEAR_INTERSECTION = 2;
+
+ /**
+ * Computes the "edge distance" of an intersection point p along a segment.
+ * The edge distance is a metric of the point along the edge.
+ * The metric used is a robust and easy to compute metric function.
+ * It is <b>not</b> equivalent to the usual Euclidean metric.
+ * It relies on the fact that either the x or the y ordinates of the
+ * points in the edge are unique, depending on whether the edge is longer in
+ * the horizontal or vertical direction.
+ * <p>
+ * NOTE: This function may produce incorrect distances
+ * for inputs where p is not precisely on p1-p2
+ * (E.g. p = (139,9) p1 = (139,10), p2 = (280,1) produces distance 0.0, which is incorrect.
+ * <p>
+ * My hypothesis is that the function is safe to use for points which are the
+ * result of <b>rounding</b> points which lie on the line,
+ * but not safe to use for <b>truncated</b> points.
+ */
+ public static double computeEdgeDistance(
+ Coordinate p,
+ Coordinate p0,
+ Coordinate p1)
+ {
+ double dx = Math.abs(p1.x - p0.x);
+ double dy = Math.abs(p1.y - p0.y);
+
+ double dist = -1.0; // sentinel value
+ if (p.equals(p0)) {
+ dist = 0.0;
+ }
+ else if (p.equals(p1)) {
+ if (dx > dy)
+ dist = dx;
+ else
+ dist = dy;
+ }
+ else {
+ double pdx = Math.abs(p.x - p0.x);
+ double pdy = Math.abs(p.y - p0.y);
+ if (dx > dy)
+ dist = pdx;
+ else
+ dist = pdy;
+ // <FIX>
+ // hack to ensure that non-endpoints always have a non-zero distance
+ if (dist == 0.0 && ! p.equals(p0))
+ {
+ dist = Math.max(pdx, pdy);
+ }
+ }
+ Assert.isTrue(! (dist == 0.0 && ! p.equals(p0)), "Bad distance calculation");
+ return dist;
+ }
+
+ /**
+ * This function is non-robust, since it may compute the square of large numbers.
+ * Currently not sure how to improve this.
+ */
+ public static double nonRobustComputeEdgeDistance(
+ Coordinate p,
+ Coordinate p1,
+ Coordinate p2)
+ {
+ double dx = p.x - p1.x;
+ double dy = p.y - p1.y;
+ double dist = Math.sqrt(dx * dx + dy * dy); // dummy value
+ Assert.isTrue(! (dist == 0.0 && ! p.equals(p1)), "Invalid distance calculation");
+ return dist;
+ }
+
+ protected int result;
+ protected Coordinate[][] inputLines = new Coordinate[2][2];
+ protected Coordinate[] intPt = new Coordinate[2];
+ /**
+ * The indexes of the endpoints of the intersection lines, in order along
+ * the corresponding line
+ */
+ protected int[][] intLineIndex;
+ protected boolean isProper;
+ protected Coordinate pa;
+ protected Coordinate pb;
+ /**
+ * If makePrecise is true, computed intersection coordinates will be made precise
+ * using Coordinate#makePrecise
+ */
+ protected PrecisionModel precisionModel = null;
+//public int numIntersects = 0;
+
+ public LineIntersector() {
+ intPt[0] = new Coordinate();
+ intPt[1] = new Coordinate();
+ // alias the intersection points for ease of reference
+ pa = intPt[0];
+ pb = intPt[1];
+ result = 0;
+ }
+
+ /**
+ * Force computed intersection to be rounded to a given precision model
+ * @param precisionModel
+ * @deprecated use <code>setPrecisionModel</code> instead
+ */
+ public void setMakePrecise(PrecisionModel precisionModel)
+ {
+ this.precisionModel = precisionModel;
+ }
+
+ /**
+ * Force computed intersection to be rounded to a given precision model.
+ * No getter is provided, because the precision model is not required to be specified.
+ * @param precisionModel
+ */
+ public void setPrecisionModel(PrecisionModel precisionModel)
+ {
+ this.precisionModel = precisionModel;
+ }
+
+ /**
+ * Gets an endpoint of an input segment.
+ *
+ * @param segmentIndex the index of the input segment (0 or 1)
+ * @param ptIndex the index of the endpoint (0 or 1)
+ * @return the specified endpoint
+ */
+ public Coordinate getEndpoint(int segmentIndex, int ptIndex)
+ {
+ return inputLines[segmentIndex][ptIndex];
+ }
+
+ /**
+ * Compute the intersection of a point p and the line p1-p2.
+ * This function computes the boolean value of the hasIntersection test.
+ * The actual value of the intersection (if there is one)
+ * is equal to the value of <code>p</code>.
+ */
+ public abstract void computeIntersection(
+ Coordinate p,
+ Coordinate p1, Coordinate p2);
+
+ protected boolean isCollinear() {
+ return result == COLLINEAR_INTERSECTION;
+ }
+
+ /**
+ * Computes the intersection of the lines p1-p2 and p3-p4.
+ * This function computes both the boolean value of the hasIntersection test
+ * and the (approximate) value of the intersection point itself (if there is one).
+ */
+ public void computeIntersection(
+ Coordinate p1, Coordinate p2,
+ Coordinate p3, Coordinate p4) {
+ inputLines[0][0] = p1;
+ inputLines[0][1] = p2;
+ inputLines[1][0] = p3;
+ inputLines[1][1] = p4;
+ result = computeIntersect(p1, p2, p3, p4);
+//numIntersects++;
+ }
+
+ protected abstract int computeIntersect(
+ Coordinate p1, Coordinate p2,
+ Coordinate q1, Coordinate q2);
+
+/*
+ public String toString() {
+ String str = inputLines[0][0] + "-"
+ + inputLines[0][1] + " "
+ + inputLines[1][0] + "-"
+ + inputLines[1][1] + " : "
+ + getTopologySummary();
+ return str;
+ }
+*/
+
+ public String toString() {
+ return WKTWriter.toLineString(inputLines[0][0], inputLines[0][1]) + " - "
+ + WKTWriter.toLineString(inputLines[1][0], inputLines[1][1])
+ + getTopologySummary();
+ }
+
+ private String getTopologySummary()
+ {
+ StringBuilder catBuilder = new StringBuilder();
+ if (isEndPoint()) catBuilder.append(" endpoint");
+ if (isProper) catBuilder.append(" proper");
+ if (isCollinear()) catBuilder.append(" collinear");
+ return catBuilder.toString();
+ }
+
+ protected boolean isEndPoint() {
+ return hasIntersection() && !isProper;
+ }
+
+ /**
+ * Tests whether the input geometries intersect.
+ *
+ * @return true if the input geometries intersect
+ */
+ public boolean hasIntersection() {
+ return result != NO_INTERSECTION;
+ }
+
+ /**
+ * Returns the number of intersection points found. This will be either 0, 1 or 2.
+ *
+ * @return the number of intersection points found (0, 1, or 2)
+ */
+ public int getIntersectionNum() { return result; }
+
+ /**
+ * Returns the intIndex'th intersection point
+ *
+ * @param intIndex is 0 or 1
+ *
+ * @return the intIndex'th intersection point
+ */
+ public Coordinate getIntersection(int intIndex) { return intPt[intIndex]; }
+
+ protected void computeIntLineIndex() {
+ if (intLineIndex == null) {
+ intLineIndex = new int[2][2];
+ computeIntLineIndex(0);
+ computeIntLineIndex(1);
+ }
+ }
+
+ /**
+ * Test whether a point is a intersection point of two line segments.
+ * Note that if the intersection is a line segment, this method only tests for
+ * equality with the endpoints of the intersection segment.
+ * It does <b>not</b> return true if
+ * the input point is internal to the intersection segment.
+ *
+ * @return true if the input point is one of the intersection points.
+ */
+ public boolean isIntersection(Coordinate pt) {
+ for (int i = 0; i < result; i++) {
+ if (intPt[i].equals2D(pt)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether either intersection point is an interior point of one of the input segments.
+ *
+ * @return <code>true</code> if either intersection point is in the interior of one of the input segments
+ */
+ public boolean isInteriorIntersection()
+ {
+ if (isInteriorIntersection(0)) return true;
+ if (isInteriorIntersection(1)) return true;
+ return false;
+ }
+
+ /**
+ * Tests whether either intersection point is an interior point of the specified input segment.
+ *
+ * @return <code>true</code> if either intersection point is in the interior of the input segment
+ */
+ public boolean isInteriorIntersection(int inputLineIndex)
+ {
+ for (int i = 0; i < result; i++) {
+ if (! ( intPt[i].equals2D(inputLines[inputLineIndex][0])
+ || intPt[i].equals2D(inputLines[inputLineIndex][1]) )) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether an intersection is proper.
+ * <br>
+ * The intersection between two line segments is considered proper if
+ * they intersect in a single point in the interior of both segments
+ * (e.g. the intersection is a single point and is not equal to any of the
+ * endpoints).
+ * <p>
+ * The intersection between a point and a line segment is considered proper
+ * if the point lies in the interior of the segment (e.g. is not equal to
+ * either of the endpoints).
+ *
+ * @return true if the intersection is proper
+ */
+ public boolean isProper() {
+ return hasIntersection() && isProper;
+ }
+
+ /**
+ * Computes the intIndex'th intersection point in the direction of
+ * a specified input line segment
+ *
+ * @param segmentIndex is 0 or 1
+ * @param intIndex is 0 or 1
+ *
+ * @return the intIndex'th intersection point in the direction of the specified input line segment
+ */
+ public Coordinate getIntersectionAlongSegment(int segmentIndex, int intIndex) {
+ // lazily compute int line array
+ computeIntLineIndex();
+ return intPt[intLineIndex[segmentIndex][intIndex]];
+ }
+
+ /**
+ * Computes the index (order) of the intIndex'th intersection point in the direction of
+ * a specified input line segment
+ *
+ * @param segmentIndex is 0 or 1
+ * @param intIndex is 0 or 1
+ *
+ * @return the index of the intersection point along the input segment (0 or 1)
+ */
+ public int getIndexAlongSegment(int segmentIndex, int intIndex) {
+ computeIntLineIndex();
+ return intLineIndex[segmentIndex][intIndex];
+ }
+
+ protected void computeIntLineIndex(int segmentIndex) {
+ double dist0 = getEdgeDistance(segmentIndex, 0);
+ double dist1 = getEdgeDistance(segmentIndex, 1);
+ if (dist0 > dist1) {
+ intLineIndex[segmentIndex][0] = 0;
+ intLineIndex[segmentIndex][1] = 1;
+ }
+ else {
+ intLineIndex[segmentIndex][0] = 1;
+ intLineIndex[segmentIndex][1] = 0;
+ }
+ }
+
+ /**
+ * Computes the "edge distance" of an intersection point along the specified input line segment.
+ *
+ * @param segmentIndex is 0 or 1
+ * @param intIndex is 0 or 1
+ *
+ * @return the edge distance of the intersection point
+ */
+ public double getEdgeDistance(int segmentIndex, int intIndex) {
+ double dist = computeEdgeDistance(intPt[intIndex], inputLines[segmentIndex][0],
+ inputLines[segmentIndex][1]);
+ return dist;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/MinimumBoundingCircle.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/MinimumBoundingCircle.java
new file mode 100644
index 0000000..74c7582
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/MinimumBoundingCircle.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Triangle;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Computes the <b>Minimum Bounding Circle</b> (MBC)
+ * for the points in a {@link Geometry}.
+ * The MBC is the smallest circle which <tt>cover</tt>s
+ * all the input points
+ * (this is also known as the <b>Smallest Enclosing Circle</b>).
+ * This is equivalent to computing the Maximum Diameter
+ * of the input point set.
+ * <p>
+ * The computed circle can be specified in two equivalent ways,
+ * both of which are provide as output by this class:
+ * <ul>
+ * <li>As a centre point and a radius
+ * <li>By the set of points defining the circle.
+ * Depending on the number of points in the input
+ * and their relative positions, this
+ * will be specified by anywhere from 0 to 3 points.
+ * <ul>
+ * <li>0 or 1 points indicate an empty or trivial input point arrangement.
+ * <li>2 or 3 points define a circle which contains
+ * all the input points.
+ * </ul>
+ * </ul>
+ * The class can also output a {@link Geometry} which approximates the
+ * shape of the MBC (although as an approximation
+ * it is <b>not</b> guaranteed to <tt>cover</tt> all the input points.)
+ *
+ * @author Martin Davis
+ *
+ * @see MinimumDiameter
+ *
+ */
+public class MinimumBoundingCircle
+{
+ /*
+ * The algorithm used is based on the one by Jon Rokne in
+ * the article "An Easy Bounding Circle" in <i>Graphic Gems II</i>.
+ */
+
+ private Geometry input;
+ private Coordinate[] extremalPts = null;
+ private Coordinate centre = null;
+ private double radius = 0.0;
+
+ /**
+ * Creates a new object for computing the minimum bounding circle for the
+ * point set defined by the vertices of the given geometry.
+ *
+ * @param geom the geometry to use to obtain the point set
+ */
+ public MinimumBoundingCircle(Geometry geom)
+ {
+ this.input = geom;
+ }
+
+ /**
+ * Gets a geometry which represents the Minimum Bounding Circle.
+ * If the input is degenerate (empty or a single unique point),
+ * this method will return an empty geometry or a single Point geometry.
+ * Otherwise, a Polygon will be returned which approximates the
+ * Minimum Bounding Circle.
+ * (Note that because the computed polygon is only an approximation,
+ * it may not precisely contain all the input points.)
+ *
+ * @return a Geometry representing the Minimum Bounding Circle.
+ */
+ public Geometry getCircle()
+ {
+ //TODO: ensure the output circle contains the extermal points.
+ //TODO: or maybe even ensure that the returned geometry contains ALL the input points?
+
+ compute();
+ if (centre == null)
+ return input.getFactory().createPolygon();
+ Point centrePoint = input.getFactory().createPoint(centre);
+ if (radius == 0.0)
+ return centrePoint;
+ return centrePoint.buffer(radius);
+ }
+
+ /**
+ * Gets a geometry representing a line between the two farthest points
+ * in the input.
+ * These points will be two of the extremal points of the Minimum Bounding Circle.
+ * They also lie on the convex hull of the input.
+ *
+ * @return a LineString between the two farthest points of the input
+ * @return a empty LineString if the input is empty
+ * @return a Point if the input is a point
+ */
+ public Geometry getFarthestPoints() {
+ compute();
+ switch (extremalPts.length) {
+ case 0:
+ return input.getFactory().createLineString();
+ case 1:
+ return input.getFactory().createPoint(centre);
+ }
+ Coordinate p0 = extremalPts[0];
+ Coordinate p1 = extremalPts[extremalPts.length - 1];
+ return input.getFactory().createLineString(new Coordinate[] { p0, p1 });
+ }
+
+ /**
+ * Gets a geometry representing the diameter of the computed Minimum Bounding
+ * Circle.
+ *
+ * @return the diameter LineString of the Minimum Bounding Circle
+ * @return a empty LineString if the input is empty
+ * @return a Point if the input is a point
+ */
+ public Geometry getDiameter() {
+ compute();
+ switch (extremalPts.length) {
+ case 0:
+ return input.getFactory().createLineString();
+ case 1:
+ return input.getFactory().createPoint(centre);
+ }
+ // TODO: handle case of 3 extremal points, by computing a line from one of
+ // them through the centre point with len = 2*radius
+ Coordinate p0 = extremalPts[0];
+ Coordinate p1 = extremalPts[1];
+ return input.getFactory().createLineString(new Coordinate[] { p0, p1 });
+ }
+
+ /**
+ * Gets the extremal points which define the computed Minimum Bounding Circle.
+ * There may be zero, one, two or three of these points,
+ * depending on the number of points in the input
+ * and the geometry of those points.
+ *
+ * @return the points defining the Minimum Bounding Circle
+ */
+ public Coordinate[] getExtremalPoints()
+ {
+ compute();
+ return extremalPts;
+ }
+
+ /**
+ * Gets the centre point of the computed Minimum Bounding Circle.
+ *
+ * @return the centre point of the Minimum Bounding Circle
+ * @return null if the input is empty
+ */
+ public Coordinate getCentre()
+ {
+ compute();
+ return centre;
+ }
+
+ /**
+ * Gets the radius of the computed Minimum Bounding Circle.
+ *
+ * @return the radius of the Minimum Bounding Circle
+ */
+ public double getRadius()
+ {
+ compute();
+ return radius;
+ }
+
+ private void computeCentre()
+ {
+ switch (extremalPts.length) {
+ case 0:
+ centre = null;
+ break;
+ case 1:
+ centre = extremalPts[0];
+ break;
+ case 2:
+ centre = new Coordinate(
+ (extremalPts[0].x + extremalPts[1].x) / 2.0,
+ (extremalPts[0].y + extremalPts[1].y) / 2.0
+ );
+ break;
+ case 3:
+ centre = Triangle.circumcentre(extremalPts[0], extremalPts[1], extremalPts[2]);
+ break;
+ }
+ }
+
+ private void compute()
+ {
+ if (extremalPts != null) return;
+
+ computeCirclePoints();
+ computeCentre();
+ if (centre != null)
+ radius = centre.distance(extremalPts[0]);
+ }
+
+ private void computeCirclePoints()
+ {
+ // handle degenerate or trivial cases
+ if (input.isEmpty()) {
+ extremalPts = new Coordinate[0];
+ return;
+ }
+ if (input.getNumPoints() == 1) {
+ Coordinate[] pts = input.getCoordinates();
+ extremalPts = new Coordinate[] { new Coordinate(pts[0]) };
+ return;
+ }
+
+ /**
+ * The problem is simplified by reducing to the convex hull.
+ * Computing the convex hull also has the useful effect of eliminating duplicate points
+ */
+ Geometry convexHull = input.convexHull();
+
+ Coordinate[] hullPts = convexHull.getCoordinates();
+
+ // strip duplicate final point, if any
+ Coordinate[] pts = hullPts;
+ if (hullPts[0].equals2D(hullPts[hullPts.length - 1])) {
+ pts = new Coordinate[hullPts.length - 1];
+ CoordinateArrays.copyDeep(hullPts, 0, pts, 0, hullPts.length - 1);
+ }
+
+ /**
+ * Optimization for the trivial case where the CH has fewer than 3 points
+ */
+ if (pts.length <= 2) {
+ extremalPts = CoordinateArrays.copyDeep(pts);
+ return;
+ }
+
+ // find a point P with minimum Y ordinate
+ Coordinate P = lowestPoint(pts);
+
+ // find a point Q such that the angle that PQ makes with the x-axis is minimal
+ Coordinate Q = pointWitMinAngleWithX(pts, P);
+
+ /**
+ * Iterate over the remaining points to find
+ * a pair or triplet of points which determine the minimal circle.
+ * By the design of the algorithm,
+ * at most <tt>pts.length</tt> iterations are required to terminate
+ * with a correct result.
+ */
+ for (int i = 0; i < pts.length; i++) {
+ Coordinate R = pointWithMinAngleWithSegment(pts, P, Q);
+
+ // if PRQ is obtuse, then MBC is determined by P and Q
+ if (Angle.isObtuse(P, R, Q)) {
+ extremalPts = new Coordinate[] { new Coordinate(P), new Coordinate(Q) };
+ return;
+ }
+ // if RPQ is obtuse, update baseline and iterate
+ if (Angle.isObtuse(R, P, Q)) {
+ P = R;
+ continue;
+ }
+ // if RQP is obtuse, update baseline and iterate
+ if (Angle.isObtuse(R, Q, P)) {
+ Q = R;
+ continue;
+ }
+ // otherwise all angles are acute, and the MBC is determined by the triangle PQR
+ extremalPts = new Coordinate[] { new Coordinate(P), new Coordinate(Q), new Coordinate(R) };
+ return;
+ }
+ Assert.shouldNeverReachHere("Logic failure in Minimum Bounding Circle algorithm!");
+ }
+
+ private static Coordinate lowestPoint(Coordinate[] pts)
+ {
+ Coordinate min = pts[0];
+ for (int i = 1; i < pts.length; i++) {
+ if (pts[i].y < min.y)
+ min = pts[i];
+ }
+ return min;
+ }
+
+ private static Coordinate pointWitMinAngleWithX(Coordinate[] pts, Coordinate P)
+ {
+ double minSin = Double.MAX_VALUE;
+ Coordinate minAngPt = null;
+ for (int i = 0; i < pts.length; i++) {
+
+ Coordinate p = pts[i];
+ if (p == P) continue;
+
+ /**
+ * The sin of the angle is a simpler proxy for the angle itself
+ */
+ double dx = p.x - P.x;
+ double dy = p.y - P.y;
+ if (dy < 0) dy = -dy;
+ double len = Math.sqrt(dx * dx + dy * dy);
+ double sin = dy / len;
+
+ if (sin < minSin) {
+ minSin = sin;
+ minAngPt = p;
+ }
+ }
+ return minAngPt;
+ }
+
+ private static Coordinate pointWithMinAngleWithSegment(Coordinate[] pts, Coordinate P, Coordinate Q)
+ {
+ double minAng = Double.MAX_VALUE;
+ Coordinate minAngPt = null;
+ for (int i = 0; i < pts.length; i++) {
+
+ Coordinate p = pts[i];
+ if (p == P) continue;
+ if (p == Q) continue;
+
+ double ang = Angle.angleBetween(P, p, Q);
+ if (ang < minAng) {
+ minAng = ang;
+ minAngPt = p;
+ }
+ }
+ return minAngPt;
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/MinimumDiameter.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/MinimumDiameter.java
new file mode 100644
index 0000000..4c9db90
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/MinimumDiameter.java
@@ -0,0 +1,343 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Computes the minimum diameter of a {@link Geometry}.
+ * The minimum diameter is defined to be the
+ * width of the smallest band that
+ * contains the geometry,
+ * where a band is a strip of the plane defined
+ * by two parallel lines.
+ * This can be thought of as the smallest hole that the geometry can be
+ * moved through, with a single rotation.
+ * <p>
+ * The first step in the algorithm is computing the convex hull of the Geometry.
+ * If the input Geometry is known to be convex, a hint can be supplied to
+ * avoid this computation.
+ * <p>
+ * This class can also be used to compute a line segment representing
+ * the minimum diameter, the supporting line segment of the minimum diameter,
+ * and a minimum rectangle enclosing the input geometry.
+ * This rectangle will
+ * have width equal to the minimum diameter, and have one side
+ * parallel to the supporting segment.
+ *
+ * @see ConvexHull
+ *
+ * @version 1.7
+ */
+public class MinimumDiameter
+{
+ /**
+ * Gets the minimum rectangle enclosing a geometry.
+ *
+ * @param geom the geometry
+ * @return the minimum rectangle enclosing the geometry
+ */
+ public static Geometry getMinimumRectangle(Geometry geom) {
+ return (new MinimumDiameter(geom)).getMinimumRectangle();
+ }
+
+ /**
+ * Gets the length of the minimum diameter enclosing a geometry
+ * @param geom the geometry
+ * @return the length of the minimum diameter of the geometry
+ */
+ public static Geometry getMinimumDiameter(Geometry geom) {
+ return (new MinimumDiameter(geom)).getDiameter();
+ }
+
+ private final Geometry inputGeom;
+ private final boolean isConvex;
+
+ private Coordinate[] convexHullPts = null;
+ private LineSegment minBaseSeg = new LineSegment();
+ private Coordinate minWidthPt = null;
+ private int minPtIndex;
+ private double minWidth = 0.0;
+
+ /**
+ * Compute a minimum diameter for a given {@link Geometry}.
+ *
+ * @param inputGeom a Geometry
+ */
+ public MinimumDiameter(Geometry inputGeom)
+ {
+ this(inputGeom, false);
+ }
+
+ /**
+ * Compute a minimum diameter for a giver {@link Geometry},
+ * with a hint if
+ * the Geometry is convex
+ * (e.g. a convex Polygon or LinearRing,
+ * or a two-point LineString, or a Point).
+ *
+ * @param inputGeom a Geometry which is convex
+ * @param isConvex <code>true</code> if the input geometry is convex
+ */
+ public MinimumDiameter(Geometry inputGeom, boolean isConvex)
+ {
+ this.inputGeom = inputGeom;
+ this.isConvex = isConvex;
+ }
+
+ /**
+ * Gets the length of the minimum diameter of the input Geometry
+ *
+ * @return the length of the minimum diameter
+ */
+ public double getLength()
+ {
+ computeMinimumDiameter();
+ return minWidth;
+ }
+
+ /**
+ * Gets the {@link Coordinate} forming one end of the minimum diameter
+ *
+ * @return a coordinate forming one end of the minimum diameter
+ */
+ public Coordinate getWidthCoordinate()
+ {
+ computeMinimumDiameter();
+ return minWidthPt;
+ }
+
+ /**
+ * Gets the segment forming the base of the minimum diameter
+ *
+ * @return the segment forming the base of the minimum diameter
+ */
+ public LineString getSupportingSegment()
+ {
+ computeMinimumDiameter();
+ return inputGeom.getFactory().createLineString(new Coordinate[] { minBaseSeg.p0, minBaseSeg.p1 } );
+ }
+
+ /**
+ * Gets a {@link LineString} which is a minimum diameter
+ *
+ * @return a {@link LineString} which is a minimum diameter
+ */
+ public LineString getDiameter()
+ {
+ computeMinimumDiameter();
+
+ // return empty linestring if no minimum width calculated
+ if (minWidthPt == null)
+ return inputGeom.getFactory().createLineString();
+
+ Coordinate basePt = minBaseSeg.project(minWidthPt);
+ return inputGeom.getFactory().createLineString(new Coordinate[] { basePt, minWidthPt } );
+ }
+
+ private void computeMinimumDiameter()
+ {
+ // check if computation is cached
+ if (minWidthPt != null)
+ return;
+
+ if (isConvex)
+ computeWidthConvex(inputGeom);
+ else {
+ Geometry convexGeom = (new ConvexHull(inputGeom)).getConvexHull();
+ computeWidthConvex(convexGeom);
+ }
+ }
+
+ private void computeWidthConvex(Geometry convexGeom)
+ {
+//System.out.println("Input = " + geom);
+ if (convexGeom instanceof Polygon)
+ convexHullPts = ((Polygon) convexGeom).getExteriorRing().getCoordinates();
+ else
+ convexHullPts = convexGeom.getCoordinates();
+
+ // special cases for lines or points or degenerate rings
+ if (convexHullPts.length == 0) {
+ minWidth = 0.0;
+ minWidthPt = null;
+ minBaseSeg = null;
+ }
+ else if (convexHullPts.length == 1) {
+ minWidth = 0.0;
+ minWidthPt = convexHullPts[0];
+ minBaseSeg.p0 = convexHullPts[0];
+ minBaseSeg.p1 = convexHullPts[0];
+ }
+ else if (convexHullPts.length == 2 || convexHullPts.length == 3) {
+ minWidth = 0.0;
+ minWidthPt = convexHullPts[0];
+ minBaseSeg.p0 = convexHullPts[0];
+ minBaseSeg.p1 = convexHullPts[1];
+ }
+ else
+ computeConvexRingMinDiameter(convexHullPts);
+ }
+
+ /**
+ * Compute the width information for a ring of {@link Coordinate}s.
+ * Leaves the width information in the instance variables.
+ *
+ * @param pts
+ */
+ private void computeConvexRingMinDiameter(Coordinate[] pts)
+ {
+ // for each segment in the ring
+ minWidth = Double.MAX_VALUE;
+ int currMaxIndex = 1;
+
+ LineSegment seg = new LineSegment();
+ // compute the max distance for all segments in the ring, and pick the minimum
+ for (int i = 0; i < pts.length - 1; i++) {
+ seg.p0 = pts[i];
+ seg.p1 = pts[i + 1];
+ currMaxIndex = findMaxPerpDistance(pts, seg, currMaxIndex);
+ }
+ }
+
+ private int findMaxPerpDistance(Coordinate[] pts, LineSegment seg, int startIndex)
+ {
+ double maxPerpDistance = seg.distancePerpendicular(pts[startIndex]);
+ double nextPerpDistance = maxPerpDistance;
+ int maxIndex = startIndex;
+ int nextIndex = maxIndex;
+ while (nextPerpDistance >= maxPerpDistance) {
+ maxPerpDistance = nextPerpDistance;
+ maxIndex = nextIndex;
+
+ nextIndex = nextIndex(pts, maxIndex);
+ nextPerpDistance = seg.distancePerpendicular(pts[nextIndex]);
+ }
+ // found maximum width for this segment - update global min dist if appropriate
+ if (maxPerpDistance < minWidth) {
+ minPtIndex = maxIndex;
+ minWidth = maxPerpDistance;
+ minWidthPt = pts[minPtIndex];
+ minBaseSeg = new LineSegment(seg);
+// System.out.println(minBaseSeg);
+// System.out.println(minWidth);
+ }
+ return maxIndex;
+ }
+
+ private static int nextIndex(Coordinate[] pts, int index)
+ {
+ index++;
+ if (index >= pts.length) index = 0;
+ return index;
+ }
+
+ /**
+ * Gets the minimum rectangular {@link Polygon} which encloses the input geometry.
+ * The rectangle has width equal to the minimum diameter,
+ * and a longer length.
+ * If the convex hull of the input is degenerate (a line or point)
+ * a {@link LineString} or {@link Point} is returned.
+ * <p>
+ * The minimum rectangle can be used as an extremely generalized representation
+ * for the given geometry.
+ *
+ * @return the minimum rectangle enclosing the input (or a line or point if degenerate)
+ */
+ public Geometry getMinimumRectangle()
+ {
+ computeMinimumDiameter();
+
+ // check if minimum rectangle is degenerate (a point or line segment)
+ if (minWidth == 0.0) {
+ if (minBaseSeg.p0.equals2D(minBaseSeg.p1)) {
+ return inputGeom.getFactory().createPoint(minBaseSeg.p0);
+ }
+ return minBaseSeg.toGeometry(inputGeom.getFactory());
+ }
+
+ // deltas for the base segment of the minimum diameter
+ double dx = minBaseSeg.p1.x - minBaseSeg.p0.x;
+ double dy = minBaseSeg.p1.y - minBaseSeg.p0.y;
+
+ /*
+ double c0 = computeC(dx, dy, minBaseSeg.p0);
+ double c1 = computeC(dx, dy, minBaseSeg.p1);
+ */
+
+ double minPara = Double.MAX_VALUE;
+ double maxPara = -Double.MAX_VALUE;
+ double minPerp = Double.MAX_VALUE;
+ double maxPerp = -Double.MAX_VALUE;
+
+ // compute maxima and minima of lines parallel and perpendicular to base segment
+ for (int i = 0; i < convexHullPts.length; i++) {
+
+ double paraC = computeC(dx, dy, convexHullPts[i]);
+ if (paraC > maxPara) maxPara = paraC;
+ if (paraC < minPara) minPara = paraC;
+
+ double perpC = computeC(-dy, dx, convexHullPts[i]);
+ if (perpC > maxPerp) maxPerp = perpC;
+ if (perpC < minPerp) minPerp = perpC;
+ }
+
+ // compute lines along edges of minimum rectangle
+ LineSegment maxPerpLine = computeSegmentForLine(-dx, -dy, maxPerp);
+ LineSegment minPerpLine = computeSegmentForLine(-dx, -dy, minPerp);
+ LineSegment maxParaLine = computeSegmentForLine(-dy, dx, maxPara);
+ LineSegment minParaLine = computeSegmentForLine(-dy, dx, minPara);
+
+ // compute vertices of rectangle (where the para/perp max & min lines intersect)
+ Coordinate p0 = maxParaLine.lineIntersection(maxPerpLine);
+ Coordinate p1 = minParaLine.lineIntersection(maxPerpLine);
+ Coordinate p2 = minParaLine.lineIntersection(minPerpLine);
+ Coordinate p3 = maxParaLine.lineIntersection(minPerpLine);
+
+ LinearRing shell = inputGeom.getFactory().createLinearRing(
+ new Coordinate[] { p0, p1, p2, p3, p0 });
+ return inputGeom.getFactory().createPolygon(shell);
+
+ }
+
+ private static double computeC(double a, double b, Coordinate p)
+ {
+ return a * p.y - b * p.x;
+ }
+
+ private static LineSegment computeSegmentForLine(double a, double b, double c)
+ {
+ Coordinate p0;
+ Coordinate p1;
+ /*
+ * Line eqn is ax + by = c
+ * Slope is a/b.
+ * If slope is steep, use y values as the inputs
+ */
+ if (Math.abs(b) > Math.abs(a)) {
+ p0 = new Coordinate(0.0, c/b);
+ p1 = new Coordinate(1.0, c/b - a/b);
+ }
+ else {
+ p0 = new Coordinate(c/a, 0.0);
+ p1 = new Coordinate(c/a - b/a, 1.0);
+ }
+ return new LineSegment(p0, p1);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/NotRepresentableException.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/NotRepresentableException.java
new file mode 100644
index 0000000..63b6408
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/NotRepresentableException.java
@@ -0,0 +1,30 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+/**
+ * Indicates that a {@link HCoordinate} has been computed which is
+ * not representable on the Cartesian plane.
+ *
+ * @version 1.7
+ * @see HCoordinate
+ */
+public class NotRepresentableException extends Exception {
+
+ public NotRepresentableException() {
+ super("Projective point not representable on the Cartesian plane.");
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/Orientation.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/Orientation.java
new file mode 100644
index 0000000..90b7f0c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/Orientation.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Functions to compute the orientation of basic geometric structures
+ * including point triplets (triangles) and rings.
+ * Orientation is a fundamental property of planar geometries
+ * (and more generally geometry on two-dimensional manifolds).
+ * <p>
+ * Orientation is notoriously subject to numerical precision errors
+ * in the case of collinear or nearly collinear points.
+ * JTS uses extended-precision arithmetic to increase
+ * the robustness of the computation.
+ *
+ * @author Martin Davis
+ *
+ */
+public class Orientation {
+ /**
+ * A value that indicates an orientation of clockwise, or a right turn.
+ */
+ public static final int CLOCKWISE = -1;
+ /**
+ * A value that indicates an orientation of clockwise, or a right turn.
+ */
+ public static final int RIGHT = CLOCKWISE;
+ /**
+ * A value that indicates an orientation of counterclockwise, or a left turn.
+ */
+ public static final int COUNTERCLOCKWISE = 1;
+ /**
+ * A value that indicates an orientation of counterclockwise, or a left turn.
+ */
+ public static final int LEFT = COUNTERCLOCKWISE;
+ /**
+ * A value that indicates an orientation of collinear, or no turn (straight).
+ */
+ public static final int COLLINEAR = 0;
+ /**
+ * A value that indicates an orientation of collinear, or no turn (straight).
+ */
+ public static final int STRAIGHT = COLLINEAR;
+
+ /**
+ * Returns the orientation index of the direction of the point <code>q</code> relative to
+ * a directed infinite line specified by <code>p1-p2</code>.
+ * The index indicates whether the point lies to the {@link LEFT} or {@link #RIGHT}
+ * of the line, or lies on it {@link #COLLINEAR}.
+ * The index also indicates the orientation of the triangle formed by the three points
+ * ( {@link #COUNTERCLOCKWISE}, {@link #CLOCKWISE}, or {@link #STRAIGHT} )
+ *
+ * @param p1 the origin point of the line vector
+ * @param p2 the final point of the line vector
+ * @param q the point to compute the direction to
+ *
+ * @return -1 ( {@link #CLOCKWISE} or {@link #RIGHT} ) if q is clockwise (right) from p1-p2;
+ * 1 ( {@link #COUNTERCLOCKWISE} or {@link LEFT} ) if q is counter-clockwise (left) from p1-p2;
+ * 0 ( {@link #COLLINEAR} or {@link #STRAIGHT} ) if q is collinear with p1-p2
+ */
+ public static int index(Coordinate p1, Coordinate p2, Coordinate q)
+ {
+ /**
+ * MD - 9 Aug 2010 It seems that the basic algorithm is slightly orientation
+ * dependent, when computing the orientation of a point very close to a
+ * line. This is possibly due to the arithmetic in the translation to the
+ * origin.
+ *
+ * For instance, the following situation produces identical results in spite
+ * of the inverse orientation of the line segment:
+ *
+ * Coordinate p0 = new Coordinate(219.3649559090992, 140.84159161824724);
+ * Coordinate p1 = new Coordinate(168.9018919682399, -5.713787599646864);
+ *
+ * Coordinate p = new Coordinate(186.80814046338352, 46.28973405831556); int
+ * orient = orientationIndex(p0, p1, p); int orientInv =
+ * orientationIndex(p1, p0, p);
+ *
+ * A way to force consistent results is to normalize the orientation of the
+ * vector using the following code. However, this may make the results of
+ * orientationIndex inconsistent through the triangle of points, so it's not
+ * clear this is an appropriate patch.
+ *
+ */
+ return CGAlgorithmsDD.orientationIndex(p1, p2, q);
+ // testing only
+ //return ShewchuksDeterminant.orientationIndex(p1, p2, q);
+ // previous implementation - not quite fully robust
+ //return RobustDeterminant.orientationIndex(p1, p2, q);
+ }
+
+ /**
+ * Computes whether a ring defined by an array of {@link Coordinate}s is
+ * oriented counter-clockwise.
+ * <ul>
+ * <li>The list of points is assumed to have the first and last points equal.
+ * <li>This will handle coordinate lists which contain repeated points.
+ * </ul>
+ * This algorithm is <b>only</b> guaranteed to work with valid rings. If the
+ * ring is invalid (e.g. self-crosses or touches), the computed result may not
+ * be correct.
+ *
+ * @param ring
+ * an array of Coordinates forming a ring
+ * @return true if the ring is oriented counter-clockwise.
+ * @throws IllegalArgumentException
+ * if there are too few points to determine orientation (< 4)
+ */
+ public static boolean isCCW(Coordinate[] ring)
+ {
+ // # of points without closing endpoint
+ int nPts = ring.length - 1;
+ // sanity check
+ if (nPts < 3)
+ throw new IllegalArgumentException(
+ "Ring has fewer than 4 points, so orientation cannot be determined");
+
+ // find highest point
+ Coordinate hiPt = ring[0];
+ int hiIndex = 0;
+ for (int i = 1; i <= nPts; i++) {
+ Coordinate p = ring[i];
+ if (p.y > hiPt.y) {
+ hiPt = p;
+ hiIndex = i;
+ }
+ }
+
+ // find distinct point before highest point
+ int iPrev = hiIndex;
+ do {
+ iPrev = iPrev - 1;
+ if (iPrev < 0)
+ iPrev = nPts;
+ } while (ring[iPrev].equals2D(hiPt) && iPrev != hiIndex);
+
+ // find distinct point after highest point
+ int iNext = hiIndex;
+ do {
+ iNext = (iNext + 1) % nPts;
+ } while (ring[iNext].equals2D(hiPt) && iNext != hiIndex);
+
+ Coordinate prev = ring[iPrev];
+ Coordinate next = ring[iNext];
+
+ /**
+ * This check catches cases where the ring contains an A-B-A configuration
+ * of points. This can happen if the ring does not contain 3 distinct points
+ * (including the case where the input array has fewer than 4 elements), or
+ * it contains coincident line segments.
+ */
+ if (prev.equals2D(hiPt) || next.equals2D(hiPt) || prev.equals2D(next))
+ return false;
+
+ int disc = Orientation.index(prev, hiPt, next);
+
+ /**
+ * If disc is exactly 0, lines are collinear. There are two possible cases:
+ * (1) the lines lie along the x axis in opposite directions (2) the lines
+ * lie on top of one another
+ *
+ * (1) is handled by checking if next is left of prev ==> CCW (2) will never
+ * happen if the ring is valid, so don't check for it (Might want to assert
+ * this)
+ */
+ boolean isCCW;
+ if (disc == 0) {
+ // poly is CCW if prev x is right of next x
+ isCCW = (prev.x > next.x);
+ }
+ else {
+ // if area is positive, points are ordered CCW
+ isCCW = (disc > 0);
+ }
+ return isCCW;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/PointLocation.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/PointLocation.java
new file mode 100644
index 0000000..3b2bc14
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/PointLocation.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Location;
+
+/**
+ * Functions for locating points within basic geometric
+ * structures such as lines and rings.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PointLocation {
+
+ /**
+ * Tests whether a point lies on the line defined by a list of
+ * coordinates.
+ *
+ * @param p the point to test
+ * @param line the line coordinates
+ * @return true if the point is a vertex of the line or lies in the interior
+ * of a line segment in the line
+ */
+ public static boolean isOnLine(Coordinate p, Coordinate[] line)
+ {
+ LineIntersector lineIntersector = new RobustLineIntersector();
+ for (int i = 1; i < line.length; i++) {
+ Coordinate p0 = line[i - 1];
+ Coordinate p1 = line[i];
+ lineIntersector.computeIntersection(p, p0, p1);
+ if (lineIntersector.hasIntersection()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether a point lies on the line defined by a
+ * {@link CoordinateSequence}.
+ *
+ * @param p the point to test
+ * @param line the line coordinates
+ * @return true if the point is a vertex of the line or lies in the interior
+ * of a line segment in the line
+ */
+ public static boolean isOnLine(Coordinate p, CoordinateSequence line)
+ {
+ LineIntersector lineIntersector = new RobustLineIntersector();
+ Coordinate p0 = new Coordinate();
+ Coordinate p1 = new Coordinate();
+ int n = line.size();
+ for (int i = 1; i < n; i++) {
+ line.getCoordinate(i-1, p0);
+ line.getCoordinate(i, p1);
+ lineIntersector.computeIntersection(p, p0, p1);
+ if (lineIntersector.hasIntersection()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether a point lies inside or on a ring. The ring may be oriented in
+ * either direction. A point lying exactly on the ring boundary is considered
+ * to be inside the ring.
+ * <p>
+ * This method does <i>not</i> first check the point against the envelope of
+ * the ring.
+ *
+ * @param p
+ * point to check for ring inclusion
+ * @param ring
+ * an array of coordinates representing the ring (which must have
+ * first point identical to last point)
+ * @return true if p is inside ring
+ *
+ * @see locatePointInRing
+ */
+ public static boolean isInRing(Coordinate p, Coordinate[] ring)
+ {
+ return PointLocation.locateInRing(p, ring) != Location.EXTERIOR;
+ }
+
+ /**
+ * Determines whether a point lies in the interior, on the boundary, or in the
+ * exterior of a ring. The ring may be oriented in either direction.
+ * <p>
+ * This method does <i>not</i> first check the point against the envelope of
+ * the ring.
+ *
+ * @param p
+ * point to check for ring inclusion
+ * @param ring
+ * an array of coordinates representing the ring (which must have
+ * first point identical to last point)
+ * @return the {@link Location} of p relative to the ring
+ */
+ public static int locateInRing(Coordinate p, Coordinate[] ring)
+ {
+ return RayCrossingCounter.locatePointInRing(p, ring);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/PointLocator.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/PointLocator.java
new file mode 100644
index 0000000..27b3a6e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/PointLocator.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryCollectionIterator;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Computes the topological ({@link Location})
+ * of a single point to a {@link Geometry}.
+ * A {@link BoundaryNodeRule} may be specified
+ * to control the evaluation of whether the point lies on the boundary or not
+ * The default rule is to use the the <i>SFS Boundary Determination Rule</i>
+ * <p>
+ * Notes:
+ * <ul>
+ * <li>{@link LinearRing}s do not enclose any area - points inside the ring are still in the EXTERIOR of the ring.
+ * </ul>
+ * Instances of this class are not reentrant.
+ *
+ * @version 1.7
+ */
+public class PointLocator
+{
+ // default is to use OGC SFS rule
+ private BoundaryNodeRule boundaryRule =
+ //BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE;
+ BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE;
+
+ private boolean isIn; // true if the point lies in or on any Geometry element
+ private int numBoundaries; // the number of sub-elements whose boundaries the point lies in
+
+ public PointLocator() {
+ }
+
+ public PointLocator(BoundaryNodeRule boundaryRule)
+ {
+ if (boundaryRule == null)
+ throw new IllegalArgumentException("Rule must be non-null");
+ this.boundaryRule = boundaryRule;
+ }
+
+ /**
+ * Convenience method to test a point for intersection with
+ * a Geometry
+ * @param p the coordinate to test
+ * @param geom the Geometry to test
+ * @return <code>true</code> if the point is in the interior or boundary of the Geometry
+ */
+ public boolean intersects(Coordinate p, Geometry geom)
+ {
+ return locate(p, geom) != Location.EXTERIOR;
+ }
+
+ /**
+ * Computes the topological relationship ({@link Location}) of a single point
+ * to a Geometry.
+ * It handles both single-element
+ * and multi-element Geometries.
+ * The algorithm for multi-part Geometries
+ * takes into account the SFS Boundary Determination Rule.
+ *
+ * @return the {@link Location} of the point relative to the input Geometry
+ */
+ public int locate(Coordinate p, Geometry geom)
+ {
+ if (geom.isEmpty()) return Location.EXTERIOR;
+
+ if (geom instanceof LineString) {
+ return locateOnLineString(p, (LineString) geom);
+ }
+ else if (geom instanceof Polygon) {
+ return locateInPolygon(p, (Polygon) geom);
+ }
+
+ isIn = false;
+ numBoundaries = 0;
+ computeLocation(p, geom);
+ if (boundaryRule.isInBoundary(numBoundaries))
+ return Location.BOUNDARY;
+ if (numBoundaries > 0 || isIn)
+ return Location.INTERIOR;
+
+ return Location.EXTERIOR;
+ }
+
+ private void computeLocation(Coordinate p, Geometry geom)
+ {
+ if (geom instanceof Point) {
+ updateLocationInfo(locateOnPoint(p, (Point) geom));
+ }
+ if (geom instanceof LineString) {
+ updateLocationInfo(locateOnLineString(p, (LineString) geom));
+ }
+ else if (geom instanceof Polygon) {
+ updateLocationInfo(locateInPolygon(p, (Polygon) geom));
+ }
+ else if (geom instanceof MultiLineString) {
+ MultiLineString ml = (MultiLineString) geom;
+ for (int i = 0; i < ml.getNumGeometries(); i++) {
+ LineString l = (LineString) ml.getGeometryN(i);
+ updateLocationInfo(locateOnLineString(p, l));
+ }
+ }
+ else if (geom instanceof MultiPolygon) {
+ MultiPolygon mpoly = (MultiPolygon) geom;
+ for (int i = 0; i < mpoly.getNumGeometries(); i++) {
+ Polygon poly = (Polygon) mpoly.getGeometryN(i);
+ updateLocationInfo(locateInPolygon(p, poly));
+ }
+ }
+ else if (geom instanceof GeometryCollection) {
+ Iterator geomi = new GeometryCollectionIterator((GeometryCollection) geom);
+ while (geomi.hasNext()) {
+ Geometry g2 = (Geometry) geomi.next();
+ if (g2 != geom)
+ computeLocation(p, g2);
+ }
+ }
+ }
+
+ private void updateLocationInfo(int loc)
+ {
+ if (loc == Location.INTERIOR) isIn = true;
+ if (loc == Location.BOUNDARY) numBoundaries++;
+ }
+
+ private int locateOnPoint(Coordinate p, Point pt)
+ {
+ // no point in doing envelope test, since equality test is just as fast
+
+ Coordinate ptCoord = pt.getCoordinate();
+ if (ptCoord.equals2D(p))
+ return Location.INTERIOR;
+ return Location.EXTERIOR;
+ }
+
+ private int locateOnLineString(Coordinate p, LineString l)
+ {
+ // bounding-box check
+ if (! l.getEnvelopeInternal().intersects(p)) return Location.EXTERIOR;
+
+ CoordinateSequence seq = l.getCoordinateSequence();
+ if (! l.isClosed()) {
+ if (p.equals(seq.getCoordinate(0))
+ || p.equals(seq.getCoordinate(seq.size() - 1)) ) {
+ return Location.BOUNDARY;
+ }
+ }
+ if (PointLocation.isOnLine(p, seq)) {
+ return Location.INTERIOR;
+ }
+ return Location.EXTERIOR;
+ }
+
+ private int locateInPolygonRing(Coordinate p, LinearRing ring)
+ {
+ // bounding-box check
+ if (! ring.getEnvelopeInternal().intersects(p)) return Location.EXTERIOR;
+
+ return PointLocation.locateInRing(p, ring.getCoordinates());
+ }
+
+ private int locateInPolygon(Coordinate p, Polygon poly)
+ {
+ if (poly.isEmpty()) return Location.EXTERIOR;
+
+ LinearRing shell = (LinearRing) poly.getExteriorRing();
+
+ int shellLoc = locateInPolygonRing(p, shell);
+ if (shellLoc == Location.EXTERIOR) return Location.EXTERIOR;
+ if (shellLoc == Location.BOUNDARY) return Location.BOUNDARY;
+ // now test if the point lies in or on the holes
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ LinearRing hole = (LinearRing) poly.getInteriorRingN(i);
+ int holeLoc = locateInPolygonRing(p, hole);
+ if (holeLoc == Location.INTERIOR) return Location.EXTERIOR;
+ if (holeLoc == Location.BOUNDARY) return Location.BOUNDARY;
+ }
+ return Location.INTERIOR;
+ }
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/RayCrossingCounter.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/RayCrossingCounter.java
new file mode 100644
index 0000000..69cda2a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/RayCrossingCounter.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygonal;
+
+/**
+ * Counts the number of segments crossed by a horizontal ray extending to the right
+ * from a given point, in an incremental fashion.
+ * This can be used to determine whether a point lies in a {@link Polygonal} geometry.
+ * The class determines the situation where the point lies exactly on a segment.
+ * When being used for Point-In-Polygon determination, this case allows short-circuiting
+ * the evaluation.
+ * <p>
+ * This class handles polygonal geometries with any number of shells and holes.
+ * The orientation of the shell and hole rings is unimportant.
+ * In order to compute a correct location for a given polygonal geometry,
+ * it is essential that <b>all</b> segments are counted which
+ * <ul>
+ * <li>touch the ray
+ * <li>lie in in any ring which may contain the point
+ * </ul>
+ * The only exception is when the point-on-segment situation is detected, in which
+ * case no further processing is required.
+ * The implication of the above rule is that segments
+ * which can be a priori determined to <i>not</i> touch the ray
+ * (i.e. by a test of their bounding box or Y-extent)
+ * do not need to be counted. This allows for optimization by indexing.
+ * <p>
+ * This implementation uses the extended-precision orientation test,
+ * to provide maximum robustness and consistency within
+ * other algorithms.
+ *
+ * @author Martin Davis
+ *
+ */
+public class RayCrossingCounter
+{
+ /**
+ * Determines the {@link Location} of a point in a ring.
+ * This method is an exemplar of how to use this class.
+ *
+ * @param p the point to test
+ * @param ring an array of Coordinates forming a ring
+ * @return the location of the point in the ring
+ */
+ public static int locatePointInRing(Coordinate p, Coordinate[] ring)
+ {
+ RayCrossingCounter counter = new RayCrossingCounter(p);
+
+ for (int i = 1; i < ring.length; i++) {
+ Coordinate p1 = ring[i];
+ Coordinate p2 = ring[i-1];
+ counter.countSegment(p1, p2);
+ if (counter.isOnSegment())
+ return counter.getLocation();
+ }
+ return counter.getLocation();
+ }
+
+ /**
+ * Determines the {@link Location} of a point in a ring.
+ *
+ * @param p
+ * the point to test
+ * @param ring
+ * a coordinate sequence forming a ring
+ * @return the location of the point in the ring
+ */
+ public static int locatePointInRing(Coordinate p, CoordinateSequence ring) {
+ RayCrossingCounter counter = new RayCrossingCounter(p);
+
+ Coordinate p1 = new Coordinate();
+ Coordinate p2 = new Coordinate();
+ for (int i = 1; i < ring.size(); i++) {
+ ring.getCoordinate(i, p1);
+ ring.getCoordinate(i - 1, p2);
+ counter.countSegment(p1, p2);
+ if (counter.isOnSegment())
+ return counter.getLocation();
+ }
+ return counter.getLocation();
+ }
+
+ private Coordinate p;
+ private int crossingCount = 0;
+ // true if the test point lies on an input segment
+ private boolean isPointOnSegment = false;
+
+ public RayCrossingCounter(Coordinate p)
+ {
+ this.p = p;
+ }
+
+ /**
+ * Counts a segment
+ *
+ * @param p1 an endpoint of the segment
+ * @param p2 another endpoint of the segment
+ */
+ public void countSegment(Coordinate p1, Coordinate p2) {
+ /**
+ * For each segment, check if it crosses
+ * a horizontal ray running from the test point in the positive x direction.
+ */
+
+ // check if the segment is strictly to the left of the test point
+ if (p1.x < p.x && p2.x < p.x)
+ return;
+
+ // check if the point is equal to the current ring vertex
+ if (p.x == p2.x && p.y == p2.y) {
+ isPointOnSegment = true;
+ return;
+ }
+ /**
+ * For horizontal segments, check if the point is on the segment.
+ * Otherwise, horizontal segments are not counted.
+ */
+ if (p1.y == p.y && p2.y == p.y) {
+ double minx = p1.x;
+ double maxx = p2.x;
+ if (minx > maxx) {
+ minx = p2.x;
+ maxx = p1.x;
+ }
+ if (p.x >= minx && p.x <= maxx) {
+ isPointOnSegment = true;
+ }
+ return;
+ }
+ /**
+ * Evaluate all non-horizontal segments which cross a horizontal ray to the
+ * right of the test pt. To avoid double-counting shared vertices, we use the
+ * convention that
+ * <ul>
+ * <li>an upward edge includes its starting endpoint, and excludes its
+ * final endpoint
+ * <li>a downward edge excludes its starting endpoint, and includes its
+ * final endpoint
+ * </ul>
+ */
+ if (((p1.y > p.y) && (p2.y <= p.y))
+ || ((p2.y > p.y) && (p1.y <= p.y))) {
+ int orient = Orientation.index(p1, p2, p);
+ if (orient == Orientation.COLLINEAR) {
+ isPointOnSegment = true;
+ return;
+ }
+ // Re-orient the result if needed to ensure effective segment direction is upwards
+ if (p2.y < p1.y) {
+ orient = -orient;
+ }
+ // The upward segment crosses the ray if the test point lies to the left (CCW) of the segment.
+ if (orient == Orientation.LEFT) {
+ crossingCount++;
+ }
+ }
+ }
+
+/**
+ * Reports whether the point lies exactly on one of the supplied segments.
+ * This method may be called at any time as segments are processed.
+ * If the result of this method is <tt>true</tt>,
+ * no further segments need be supplied, since the result
+ * will never change again.
+ *
+ * @return true if the point lies exactly on a segment
+ */
+ public boolean isOnSegment() { return isPointOnSegment; }
+
+ /**
+ * Gets the {@link Location} of the point relative to
+ * the ring, polygon
+ * or multipolygon from which the processed segments were provided.
+ * <p>
+ * This method only determines the correct location
+ * if <b>all</b> relevant segments must have been processed.
+ *
+ * @return the Location of the point
+ */
+ public int getLocation()
+ {
+ if (isPointOnSegment)
+ return Location.BOUNDARY;
+
+ // The point is in the interior of the ring if the number of X-crossings is
+ // odd.
+ if ((crossingCount % 2) == 1) {
+ return Location.INTERIOR;
+ }
+ return Location.EXTERIOR;
+ }
+
+ /**
+ * Tests whether the point lies in or on
+ * the ring, polygon
+ * or multipolygon from which the processed segments were provided.
+ * <p>
+ * This method only determines the correct location
+ * if <b>all</b> relevant segments must have been processed.
+ *
+ * @return true if the point lies in or on the supplied polygon
+ */
+ public boolean isPointInPolygon()
+ {
+ return getLocation() != Location.EXTERIOR;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/RectangleLineIntersector.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/RectangleLineIntersector.java
new file mode 100644
index 0000000..9024070
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/RectangleLineIntersector.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+
+/**
+ * Computes whether a rectangle intersects line segments.
+ * <p>
+ * Rectangles contain a large amount of inherent symmetry
+ * (or to put it another way, although they contain four
+ * coordinates they only actually contain 4 ordinates
+ * worth of information).
+ * The algorithm used takes advantage of the symmetry of
+ * the geometric situation
+ * to optimize performance by minimizing the number
+ * of line intersection tests.
+ *
+ * @author Martin Davis
+ *
+ */
+public class RectangleLineIntersector
+{
+ // for intersection testing, don't need to set precision model
+ private LineIntersector li = new RobustLineIntersector();
+
+ private Envelope rectEnv;
+
+ private Coordinate diagUp0;
+ private Coordinate diagUp1;
+ private Coordinate diagDown0;
+ private Coordinate diagDown1;
+
+ /**
+ * Creates a new intersector for the given query rectangle,
+ * specified as an {@link Envelope}.
+ *
+ *
+ * @param rectEnv the query rectangle, specified as an Envelope
+ */
+ public RectangleLineIntersector(Envelope rectEnv)
+ {
+ this.rectEnv = rectEnv;
+
+ /**
+ * Up and Down are the diagonal orientations
+ * relative to the Left side of the rectangle.
+ * Index 0 is the left side, 1 is the right side.
+ */
+ diagUp0 = new Coordinate(rectEnv.getMinX(), rectEnv.getMinY());
+ diagUp1 = new Coordinate(rectEnv.getMaxX(), rectEnv.getMaxY());
+ diagDown0 = new Coordinate(rectEnv.getMinX(), rectEnv.getMaxY());
+ diagDown1 = new Coordinate(rectEnv.getMaxX(), rectEnv.getMinY());
+ }
+
+ /**
+ * Tests whether the query rectangle intersects a
+ * given line segment.
+ *
+ * @param p0 the first endpoint of the segment
+ * @param p1 the second endpoint of the segment
+ * @return true if the rectangle intersects the segment
+ */
+ public boolean intersects(Coordinate p0, Coordinate p1)
+ {
+ // TODO: confirm that checking envelopes first is faster
+
+ /**
+ * If the segment envelope is disjoint from the
+ * rectangle envelope, there is no intersection
+ */
+ Envelope segEnv = new Envelope(p0, p1);
+ if (! rectEnv.intersects(segEnv))
+ return false;
+
+ /**
+ * If either segment endpoint lies in the rectangle,
+ * there is an intersection.
+ */
+ if (rectEnv.intersects(p0)) return true;
+ if (rectEnv.intersects(p1)) return true;
+
+ /**
+ * Normalize segment.
+ * This makes p0 less than p1,
+ * so that the segment runs to the right,
+ * or vertically upwards.
+ */
+ if (p0.compareTo(p1) > 0) {
+ Coordinate tmp = p0;
+ p0 = p1;
+ p1 = tmp;
+ }
+ /**
+ * Compute angle of segment.
+ * Since the segment is normalized to run left to right,
+ * it is sufficient to simply test the Y ordinate.
+ * "Upwards" means relative to the left end of the segment.
+ */
+ boolean isSegUpwards = false;
+ if (p1.y > p0.y)
+ isSegUpwards = true;
+
+ /**
+ * Since we now know that neither segment endpoint
+ * lies in the rectangle, there are two possible
+ * situations:
+ * 1) the segment is disjoint to the rectangle
+ * 2) the segment crosses the rectangle completely.
+ *
+ * In the case of a crossing, the segment must intersect
+ * a diagonal of the rectangle.
+ *
+ * To distinguish these two cases, it is sufficient
+ * to test intersection with
+ * a single diagonal of the rectangle,
+ * namely the one with slope "opposite" to the slope
+ * of the segment.
+ * (Note that if the segment is axis-parallel,
+ * it must intersect both diagonals, so this is
+ * still sufficient.)
+ */
+ if (isSegUpwards) {
+ li.computeIntersection(p0, p1, diagDown0, diagDown1);
+ }
+ else {
+ li.computeIntersection(p0, p1, diagUp0, diagUp1);
+ }
+ if (li.hasIntersection())
+ return true;
+ return false;
+
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/RobustDeterminant.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/RobustDeterminant.java
new file mode 100644
index 0000000..d382e82
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/RobustDeterminant.java
@@ -0,0 +1,402 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * @version 1.7
+ */
+
+/**
+ * Implements an algorithm to compute the
+ * sign of a 2x2 determinant for double precision values robustly.
+ * It is a direct translation of code developed by Olivier Devillers.
+ * <p>
+ * The original code carries the following copyright notice:
+ *
+ * <pre>
+ *************************************************************************
+ * Author : Olivier Devillers
+ * Olivier.Devillers at sophia.inria.fr
+ * http:/www.inria.fr:/prisme/personnel/devillers/anglais/determinant.html
+ *
+ * Relicensed under EDL and EPL with Permission from Olivier Devillers
+ *
+ **************************************************************************
+ *
+ **************************************************************************
+ * Copyright (c) 1995 by INRIA Prisme Project
+ * BP 93 06902 Sophia Antipolis Cedex, France.
+ * All rights reserved
+ **************************************************************************
+ * </pre>
+ *
+ * @version 1.7
+ */
+public class RobustDeterminant {
+
+ //public static int callCount = 0; // debugging only
+
+ /*
+ // test point to allow injecting test code
+ public static int signOfDet2x2(double x1, double y1, double x2, double y2)
+ {
+ int d1 = originalSignOfDet2x2(x1, y1, x2, y2);
+ int d2 = -originalSignOfDet2x2(y1, x1, x2, y2);
+ assert d1 == -d2;
+ return d1;
+ }
+ */
+
+ /*
+ * Test code to force a standard ordering of input ordinates.
+ * A possible fix for a rare problem where evaluation is order-dependent.
+ */
+ /*
+ public static int signOfDet2x2(double x1, double y1, double x2, double y2)
+ {
+ if (x1 > x2) {
+ return -signOfDet2x2ordX(x2, y2, x1, y1);
+ }
+ return signOfDet2x2ordX(x1, y1, x2, y2);
+ }
+
+ private static int signOfDet2x2ordX(double x1, double y1, double x2, double y2)
+ {
+ if (y1 > y2) {
+ return -originalSignOfDet2x2(y1, x1, y2, x2);
+ }
+ return originalSignOfDet2x2(x1, y1, x2, y2);
+ }
+ // */
+
+ /**
+ * Computes the sign of the determinant of the 2x2 matrix
+ * with the given entries, in a robust way.
+ *
+ * @return -1 if the determinant is negative,
+ * @return 1 if the determinant is positive,
+ * @return 0 if the determinant is 0.
+ */
+ //private static int originalSignOfDet2x2(double x1, double y1, double x2, double y2) {
+ public static int signOfDet2x2(double x1, double y1, double x2, double y2) {
+ // returns -1 if the determinant is negative,
+ // returns 1 if the determinant is positive,
+ // returns 0 if the determinant is null.
+ int sign;
+ double swap;
+ double k;
+ long count = 0;
+
+ //callCount++; // debugging only
+
+ sign = 1;
+
+ /*
+ * testing null entries
+ */
+ if ((x1 == 0.0) || (y2 == 0.0)) {
+ if ((y1 == 0.0) || (x2 == 0.0)) {
+ return 0;
+ }
+ else if (y1 > 0) {
+ if (x2 > 0) {
+ return -sign;
+ }
+ else {
+ return sign;
+ }
+ }
+ else {
+ if (x2 > 0) {
+ return sign;
+ }
+ else {
+ return -sign;
+ }
+ }
+ }
+ if ((y1 == 0.0) || (x2 == 0.0)) {
+ if (y2 > 0) {
+ if (x1 > 0) {
+ return sign;
+ }
+ else {
+ return -sign;
+ }
+ }
+ else {
+ if (x1 > 0) {
+ return -sign;
+ }
+ else {
+ return sign;
+ }
+ }
+ }
+
+ /*
+ * making y coordinates positive and permuting the entries
+ */
+ /*
+ * so that y2 is the biggest one
+ */
+ if (0.0 < y1) {
+ if (0.0 < y2) {
+ if (y1 <= y2) {
+ ;
+ }
+ else {
+ sign = -sign;
+ swap = x1;
+ x1 = x2;
+ x2 = swap;
+ swap = y1;
+ y1 = y2;
+ y2 = swap;
+ }
+ }
+ else {
+ if (y1 <= -y2) {
+ sign = -sign;
+ x2 = -x2;
+ y2 = -y2;
+ }
+ else {
+ swap = x1;
+ x1 = -x2;
+ x2 = swap;
+ swap = y1;
+ y1 = -y2;
+ y2 = swap;
+ }
+ }
+ }
+ else {
+ if (0.0 < y2) {
+ if (-y1 <= y2) {
+ sign = -sign;
+ x1 = -x1;
+ y1 = -y1;
+ }
+ else {
+ swap = -x1;
+ x1 = x2;
+ x2 = swap;
+ swap = -y1;
+ y1 = y2;
+ y2 = swap;
+ }
+ }
+ else {
+ if (y1 >= y2) {
+ x1 = -x1;
+ y1 = -y1;
+ x2 = -x2;
+ y2 = -y2;
+ ;
+ }
+ else {
+ sign = -sign;
+ swap = -x1;
+ x1 = -x2;
+ x2 = swap;
+ swap = -y1;
+ y1 = -y2;
+ y2 = swap;
+ }
+ }
+ }
+
+ /*
+ * making x coordinates positive
+ */
+ /*
+ * if |x2| < |x1| one can conclude
+ */
+ if (0.0 < x1) {
+ if (0.0 < x2) {
+ if (x1 <= x2) {
+ ;
+ }
+ else {
+ return sign;
+ }
+ }
+ else {
+ return sign;
+ }
+ }
+ else {
+ if (0.0 < x2) {
+ return -sign;
+ }
+ else {
+ if (x1 >= x2) {
+ sign = -sign;
+ x1 = -x1;
+ x2 = -x2;
+ ;
+ }
+ else {
+ return -sign;
+ }
+ }
+ }
+
+ /*
+ * all entries strictly positive x1 <= x2 and y1 <= y2
+ */
+ while (true) {
+ count = count + 1;
+ // MD - UNSAFE HACK for testing only!
+// k = (int) (x2 / x1);
+ k = Math.floor(x2 / x1);
+ x2 = x2 - k * x1;
+ y2 = y2 - k * y1;
+
+ /*
+ * testing if R (new U2) is in U1 rectangle
+ */
+ if (y2 < 0.0) {
+ return -sign;
+ }
+ if (y2 > y1) {
+ return sign;
+ }
+
+ /*
+ * finding R'
+ */
+ if (x1 > x2 + x2) {
+ if (y1 < y2 + y2) {
+ return sign;
+ }
+ }
+ else {
+ if (y1 > y2 + y2) {
+ return -sign;
+ }
+ else {
+ x2 = x1 - x2;
+ y2 = y1 - y2;
+ sign = -sign;
+ }
+ }
+ if (y2 == 0.0) {
+ if (x2 == 0.0) {
+ return 0;
+ }
+ else {
+ return -sign;
+ }
+ }
+ if (x2 == 0.0) {
+ return sign;
+ }
+
+ /*
+ * exchange 1 and 2 role.
+ */
+ // MD - UNSAFE HACK for testing only!
+// k = (int) (x1 / x2);
+ k = Math.floor(x1 / x2);
+ x1 = x1 - k * x2;
+ y1 = y1 - k * y2;
+
+ /*
+ * testing if R (new U1) is in U2 rectangle
+ */
+ if (y1 < 0.0) {
+ return sign;
+ }
+ if (y1 > y2) {
+ return -sign;
+ }
+
+ /*
+ * finding R'
+ */
+ if (x2 > x1 + x1) {
+ if (y2 < y1 + y1) {
+ return -sign;
+ }
+ }
+ else {
+ if (y2 > y1 + y1) {
+ return sign;
+ }
+ else {
+ x1 = x2 - x1;
+ y1 = y2 - y1;
+ sign = -sign;
+ }
+ }
+ if (y1 == 0.0) {
+ if (x1 == 0.0) {
+ return 0;
+ }
+ else {
+ return sign;
+ }
+ }
+ if (x1 == 0.0) {
+ return -sign;
+ }
+ }
+
+ }
+
+ /**
+ * Returns the index of the direction of the point <code>q</code> relative to
+ * a vector specified by <code>p1-p2</code>.
+ *
+ * @param p1 the origin point of the vector
+ * @param p2 the final point of the vector
+ * @param q the point to compute the direction to
+ *
+ * @return 1 if q is counter-clockwise (left) from p1-p2
+ * @return -1 if q is clockwise (right) from p1-p2
+ * @return 0 if q is collinear with p1-p2
+ */
+ public static int orientationIndex(Coordinate p1, Coordinate p2, Coordinate q)
+ {
+ /**
+ * MD - 9 Aug 2010 It seems that the basic algorithm is slightly orientation
+ * dependent, when computing the orientation of a point very close to a
+ * line. This is possibly due to the arithmetic in the translation to the
+ * origin.
+ *
+ * For instance, the following situation produces identical results in spite
+ * of the inverse orientation of the line segment:
+ *
+ * Coordinate p0 = new Coordinate(219.3649559090992, 140.84159161824724);
+ * Coordinate p1 = new Coordinate(168.9018919682399, -5.713787599646864);
+ *
+ * Coordinate p = new Coordinate(186.80814046338352, 46.28973405831556); int
+ * orient = orientationIndex(p0, p1, p); int orientInv =
+ * orientationIndex(p1, p0, p);
+ *
+ *
+ */
+
+ double dx1 = p2.x - p1.x;
+ double dy1 = p2.y - p1.y;
+ double dx2 = q.x - p2.x;
+ double dy2 = q.y - p2.y;
+ return signOfDet2x2(dx1, dy1, dx2, dy2);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/RobustLineIntersector.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/RobustLineIntersector.java
new file mode 100644
index 0000000..b54e475
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/RobustLineIntersector.java
@@ -0,0 +1,459 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+/**
+ *@version 1.7
+ */
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+
+/**
+ * A robust version of {@link LineIntersector}.
+ *
+ * @version 1.7
+ */
+public class RobustLineIntersector
+ extends LineIntersector
+{
+
+ public RobustLineIntersector() {
+ }
+
+ public void computeIntersection(Coordinate p, Coordinate p1, Coordinate p2) {
+ isProper = false;
+ // do between check first, since it is faster than the orientation test
+ if (Envelope.intersects(p1, p2, p)) {
+ if ((Orientation.index(p1, p2, p) == 0)
+ && (Orientation.index(p2, p1, p) == 0)) {
+ isProper = true;
+ if (p.equals(p1) || p.equals(p2)) {
+ isProper = false;
+ }
+ result = POINT_INTERSECTION;
+ return;
+ }
+ }
+ result = NO_INTERSECTION;
+ }
+
+ protected int computeIntersect(
+ Coordinate p1, Coordinate p2,
+ Coordinate q1, Coordinate q2 ) {
+ isProper = false;
+
+ // first try a fast test to see if the envelopes of the lines intersect
+ if (! Envelope.intersects(p1, p2, q1, q2))
+ return NO_INTERSECTION;
+
+ // for each endpoint, compute which side of the other segment it lies
+ // if both endpoints lie on the same side of the other segment,
+ // the segments do not intersect
+ int Pq1 = Orientation.index(p1, p2, q1);
+ int Pq2 = Orientation.index(p1, p2, q2);
+
+ if ((Pq1>0 && Pq2>0) || (Pq1<0 && Pq2<0)) {
+ return NO_INTERSECTION;
+ }
+
+ int Qp1 = Orientation.index(q1, q2, p1);
+ int Qp2 = Orientation.index(q1, q2, p2);
+
+ if ((Qp1>0 && Qp2>0) || (Qp1<0 && Qp2<0)) {
+ return NO_INTERSECTION;
+ }
+
+ boolean collinear = Pq1 == 0
+ && Pq2 == 0
+ && Qp1 == 0
+ && Qp2 == 0;
+ if (collinear) {
+ return computeCollinearIntersection(p1, p2, q1, q2);
+ }
+
+ /**
+ * At this point we know that there is a single intersection point
+ * (since the lines are not collinear).
+ */
+
+ /**
+ * Check if the intersection is an endpoint. If it is, copy the endpoint as
+ * the intersection point. Copying the point rather than computing it
+ * ensures the point has the exact value, which is important for
+ * robustness. It is sufficient to simply check for an endpoint which is on
+ * the other line, since at this point we know that the inputLines must
+ * intersect.
+ */
+ if (Pq1 == 0 || Pq2 == 0 || Qp1 == 0 || Qp2 == 0) {
+ isProper = false;
+
+ /**
+ * Check for two equal endpoints.
+ * This is done explicitly rather than by the orientation tests
+ * below in order to improve robustness.
+ *
+ * [An example where the orientation tests fail to be consistent is
+ * the following (where the true intersection is at the shared endpoint
+ * POINT (19.850257749638203 46.29709338043669)
+ *
+ * LINESTRING ( 19.850257749638203 46.29709338043669, 20.31970698357233 46.76654261437082 )
+ * and
+ * LINESTRING ( -48.51001596420236 -22.063180333403878, 19.850257749638203 46.29709338043669 )
+ *
+ * which used to produce the INCORRECT result: (20.31970698357233, 46.76654261437082, NaN)
+ *
+ */
+ if (p1.equals2D(q1)
+ || p1.equals2D(q2)) {
+ intPt[0] = p1;
+ }
+ else if (p2.equals2D(q1)
+ || p2.equals2D(q2)) {
+ intPt[0] = p2;
+ }
+
+ /**
+ * Now check to see if any endpoint lies on the interior of the other segment.
+ */
+ else if (Pq1 == 0) {
+ intPt[0] = new Coordinate(q1);
+ }
+ else if (Pq2 == 0) {
+ intPt[0] = new Coordinate(q2);
+ }
+ else if (Qp1 == 0) {
+ intPt[0] = new Coordinate(p1);
+ }
+ else if (Qp2 == 0) {
+ intPt[0] = new Coordinate(p2);
+ }
+ }
+ else {
+ isProper = true;
+ intPt[0] = intersection(p1, p2, q1, q2);
+ }
+ return POINT_INTERSECTION;
+ }
+
+ private int computeCollinearIntersection(Coordinate p1, Coordinate p2,
+ Coordinate q1, Coordinate q2) {
+ boolean p1q1p2 = Envelope.intersects(p1, p2, q1);
+ boolean p1q2p2 = Envelope.intersects(p1, p2, q2);
+ boolean q1p1q2 = Envelope.intersects(q1, q2, p1);
+ boolean q1p2q2 = Envelope.intersects(q1, q2, p2);
+
+ if (p1q1p2 && p1q2p2) {
+ intPt[0] = q1;
+ intPt[1] = q2;
+ return COLLINEAR_INTERSECTION;
+ }
+ if (q1p1q2 && q1p2q2) {
+ intPt[0] = p1;
+ intPt[1] = p2;
+ return COLLINEAR_INTERSECTION;
+ }
+ if (p1q1p2 && q1p1q2) {
+ intPt[0] = q1;
+ intPt[1] = p1;
+ return q1.equals(p1) && !p1q2p2 && !q1p2q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
+ }
+ if (p1q1p2 && q1p2q2) {
+ intPt[0] = q1;
+ intPt[1] = p2;
+ return q1.equals(p2) && !p1q2p2 && !q1p1q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
+ }
+ if (p1q2p2 && q1p1q2) {
+ intPt[0] = q2;
+ intPt[1] = p1;
+ return q2.equals(p1) && !p1q1p2 && !q1p2q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
+ }
+ if (p1q2p2 && q1p2q2) {
+ intPt[0] = q2;
+ intPt[1] = p2;
+ return q2.equals(p2) && !p1q1p2 && !q1p1q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
+ }
+ return NO_INTERSECTION;
+ }
+
+ /**
+ * This method computes the actual value of the intersection point.
+ * To obtain the maximum precision from the intersection calculation,
+ * the coordinates are normalized by subtracting the minimum
+ * ordinate values (in absolute value). This has the effect of
+ * removing common significant digits from the calculation to
+ * maintain more bits of precision.
+ */
+ private Coordinate intersection(
+ Coordinate p1, Coordinate p2, Coordinate q1, Coordinate q2)
+ {
+ Coordinate intPt = intersectionWithNormalization(p1, p2, q1, q2);
+
+ /*
+ // TESTING ONLY
+ Coordinate intPtDD = CGAlgorithmsDD.intersection(p1, p2, q1, q2);
+ double dist = intPt.distance(intPtDD);
+ System.out.println(intPt + " - " + intPtDD + " dist = " + dist);
+ //intPt = intPtDD;
+ */
+
+ /**
+ * Due to rounding it can happen that the computed intersection is
+ * outside the envelopes of the input segments. Clearly this
+ * is inconsistent.
+ * This code checks this condition and forces a more reasonable answer
+ *
+ * MD - May 4 2005 - This is still a problem. Here is a failure case:
+ *
+ * LINESTRING (2089426.5233462777 1180182.3877339689, 2085646.6891757075 1195618.7333999649)
+ * LINESTRING (1889281.8148903656 1997547.0560044837, 2259977.3672235999 483675.17050843034)
+ * int point = (2097408.2633752143,1144595.8008114607)
+ *
+ * MD - Dec 14 2006 - This does not seem to be a failure case any longer
+ */
+ if (! isInSegmentEnvelopes(intPt)) {
+// System.out.println("Intersection outside segment envelopes: " + intPt);
+
+ // compute a safer result
+ // copy the coordinate, since it may be rounded later
+ intPt = new Coordinate(nearestEndpoint(p1, p2, q1, q2));
+// intPt = CentralEndpointIntersector.getIntersection(p1, p2, q1, q2);
+
+// System.out.println("Segments: " + this);
+// System.out.println("Snapped to " + intPt);
+// checkDD(p1, p2, q1, q2, intPt);
+ }
+ if (precisionModel != null) {
+ precisionModel.makePrecise(intPt);
+ }
+ return intPt;
+ }
+
+ private void checkDD(Coordinate p1, Coordinate p2, Coordinate q1,
+ Coordinate q2, Coordinate intPt)
+ {
+ Coordinate intPtDD = CGAlgorithmsDD.intersection(p1, p2, q1, q2);
+ boolean isIn = isInSegmentEnvelopes(intPtDD);
+ System.out.println( "DD in env = " + isIn + " --------------------- " + intPtDD);
+ if (intPt.distance(intPtDD) > 0.0001) {
+ System.out.println("Distance = " + intPt.distance(intPtDD));
+ }
+ }
+
+ private Coordinate intersectionWithNormalization(
+ Coordinate p1, Coordinate p2, Coordinate q1, Coordinate q2)
+ {
+ Coordinate n1 = new Coordinate(p1);
+ Coordinate n2 = new Coordinate(p2);
+ Coordinate n3 = new Coordinate(q1);
+ Coordinate n4 = new Coordinate(q2);
+ Coordinate normPt = new Coordinate();
+ normalizeToEnvCentre(n1, n2, n3, n4, normPt);
+
+ Coordinate intPt = safeHCoordinateIntersection(n1, n2, n3, n4);
+
+ intPt.x += normPt.x;
+ intPt.y += normPt.y;
+
+ return intPt;
+ }
+
+ /**
+ * Computes a segment intersection using homogeneous coordinates.
+ * Round-off error can cause the raw computation to fail,
+ * (usually due to the segments being approximately parallel).
+ * If this happens, a reasonable approximation is computed instead.
+ *
+ * @param p1 a segment endpoint
+ * @param p2 a segment endpoint
+ * @param q1 a segment endpoint
+ * @param q2 a segment endpoint
+ * @return the computed intersection point
+ */
+ private Coordinate safeHCoordinateIntersection(Coordinate p1, Coordinate p2, Coordinate q1, Coordinate q2)
+ {
+ Coordinate intPt = null;
+ try {
+ intPt = HCoordinate.intersection(p1, p2, q1, q2);
+ }
+ catch (NotRepresentableException e) {
+// System.out.println("Not calculable: " + this);
+ // compute an approximate result
+// intPt = CentralEndpointIntersector.getIntersection(p1, p2, q1, q2);
+ intPt = nearestEndpoint(p1, p2, q1, q2);
+ // System.out.println("Snapped to " + intPt);
+ }
+ return intPt;
+ }
+
+ /**
+ * Normalize the supplied coordinates so that
+ * their minimum ordinate values lie at the origin.
+ * NOTE: this normalization technique appears to cause
+ * large errors in the position of the intersection point for some cases.
+ *
+ * @param n1
+ * @param n2
+ * @param n3
+ * @param n4
+ * @param normPt
+ */
+ private void normalizeToMinimum(
+ Coordinate n1,
+ Coordinate n2,
+ Coordinate n3,
+ Coordinate n4,
+ Coordinate normPt)
+ {
+ normPt.x = smallestInAbsValue(n1.x, n2.x, n3.x, n4.x);
+ normPt.y = smallestInAbsValue(n1.y, n2.y, n3.y, n4.y);
+ n1.x -= normPt.x; n1.y -= normPt.y;
+ n2.x -= normPt.x; n2.y -= normPt.y;
+ n3.x -= normPt.x; n3.y -= normPt.y;
+ n4.x -= normPt.x; n4.y -= normPt.y;
+ }
+
+ /**
+ * Normalize the supplied coordinates to
+ * so that the midpoint of their intersection envelope
+ * lies at the origin.
+ *
+ * @param n00
+ * @param n01
+ * @param n10
+ * @param n11
+ * @param normPt
+ */
+ private void normalizeToEnvCentre(
+ Coordinate n00,
+ Coordinate n01,
+ Coordinate n10,
+ Coordinate n11,
+ Coordinate normPt)
+ {
+ double minX0 = n00.x < n01.x ? n00.x : n01.x;
+ double minY0 = n00.y < n01.y ? n00.y : n01.y;
+ double maxX0 = n00.x > n01.x ? n00.x : n01.x;
+ double maxY0 = n00.y > n01.y ? n00.y : n01.y;
+
+ double minX1 = n10.x < n11.x ? n10.x : n11.x;
+ double minY1 = n10.y < n11.y ? n10.y : n11.y;
+ double maxX1 = n10.x > n11.x ? n10.x : n11.x;
+ double maxY1 = n10.y > n11.y ? n10.y : n11.y;
+
+ double intMinX = minX0 > minX1 ? minX0 : minX1;
+ double intMaxX = maxX0 < maxX1 ? maxX0 : maxX1;
+ double intMinY = minY0 > minY1 ? minY0 : minY1;
+ double intMaxY = maxY0 < maxY1 ? maxY0 : maxY1;
+
+ double intMidX = (intMinX + intMaxX) / 2.0;
+ double intMidY = (intMinY + intMaxY) / 2.0;
+ normPt.x = intMidX;
+ normPt.y = intMidY;
+
+ /*
+ // equilavalent code using more modular but slower method
+ Envelope env0 = new Envelope(n00, n01);
+ Envelope env1 = new Envelope(n10, n11);
+ Envelope intEnv = env0.intersection(env1);
+ Coordinate intMidPt = intEnv.centre();
+
+ normPt.x = intMidPt.x;
+ normPt.y = intMidPt.y;
+ */
+
+ n00.x -= normPt.x; n00.y -= normPt.y;
+ n01.x -= normPt.x; n01.y -= normPt.y;
+ n10.x -= normPt.x; n10.y -= normPt.y;
+ n11.x -= normPt.x; n11.y -= normPt.y;
+ }
+
+ private double smallestInAbsValue(double x1, double x2, double x3, double x4)
+ {
+ double x = x1;
+ double xabs = Math.abs(x);
+ if (Math.abs(x2) < xabs) {
+ x = x2;
+ xabs = Math.abs(x2);
+ }
+ if (Math.abs(x3) < xabs) {
+ x = x3;
+ xabs = Math.abs(x3);
+ }
+ if (Math.abs(x4) < xabs) {
+ x = x4;
+ }
+ return x;
+ }
+
+ /**
+ * Tests whether a point lies in the envelopes of both input segments.
+ * A correctly computed intersection point should return <code>true</code>
+ * for this test.
+ * Since this test is for debugging purposes only, no attempt is
+ * made to optimize the envelope test.
+ *
+ * @return <code>true</code> if the input point lies within both input segment envelopes
+ */
+ private boolean isInSegmentEnvelopes(Coordinate intPt)
+ {
+ Envelope env0 = new Envelope(inputLines[0][0], inputLines[0][1]);
+ Envelope env1 = new Envelope(inputLines[1][0], inputLines[1][1]);
+ return env0.contains(intPt) && env1.contains(intPt);
+ }
+
+ /**
+ * Finds the endpoint of the segments P and Q which
+ * is closest to the other segment.
+ * This is a reasonable surrogate for the true
+ * intersection points in ill-conditioned cases
+ * (e.g. where two segments are nearly coincident,
+ * or where the endpoint of one segment lies almost on the other segment).
+ * <p>
+ * This replaces the older CentralEndpoint heuristic,
+ * which chose the wrong endpoint in some cases
+ * where the segments had very distinct slopes
+ * and one endpoint lay almost on the other segment.
+ *
+ * @param p1 an endpoint of segment P
+ * @param p2 an endpoint of segment P
+ * @param q1 an endpoint of segment Q
+ * @param q2 an endpoint of segment Q
+ * @return the nearest endpoint to the other segment
+ */
+ private static Coordinate nearestEndpoint(Coordinate p1, Coordinate p2,
+ Coordinate q1, Coordinate q2)
+ {
+ Coordinate nearestPt = p1;
+ double minDist = Distance.pointToSegment(p1, q1, q2);
+
+ double dist = Distance.pointToSegment(p2, q1, q2);
+ if (dist < minDist) {
+ minDist = dist;
+ nearestPt = p2;
+ }
+ dist = Distance.pointToSegment(q1, p1, p2);
+ if (dist < minDist) {
+ minDist = dist;
+ nearestPt = q1;
+ }
+ dist = Distance.pointToSegment(q2, p1, p2);
+ if (dist < minDist) {
+ minDist = dist;
+ nearestPt = q2;
+ }
+ return nearestPt;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistance.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistance.java
new file mode 100644
index 0000000..774802b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistance.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm.distance;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * An algorithm for computing a distance metric
+ * which is an approximation to the Hausdorff Distance
+ * based on a discretization of the input {@link Geometry}.
+ * The algorithm computes the Hausdorff distance restricted to discrete points
+ * for one of the geometries.
+ * The points can be either the vertices of the geometries (the default),
+ * or the geometries with line segments densified by a given fraction.
+ * Also determines two points of the Geometries which are separated by the computed distance.
+* <p>
+ * This algorithm is an approximation to the standard Hausdorff distance.
+ * Specifically,
+ * <pre>
+ * for all geometries a, b: DHD(a, b) <= HD(a, b)
+ * </pre>
+ * The approximation can be made as close as needed by densifying the input geometries.
+ * In the limit, this value will approach the true Hausdorff distance:
+ * <pre>
+ * DHD(A, B, densifyFactor) -> HD(A, B) as densifyFactor -> 0.0
+ * </pre>
+ * The default approximation is exact or close enough for a large subset of useful cases.
+ * Examples of these are:
+ * <ul>
+ * <li>computing distance between Linestrings that are roughly parallel to each other,
+ * and roughly equal in length. This occurs in matching linear networks.
+ * <li>Testing similarity of geometries.
+ * </ul>
+ * An example where the default approximation is not close is:
+ * <pre>
+ * A = LINESTRING (0 0, 100 0, 10 100, 10 100)
+ * B = LINESTRING (0 100, 0 10, 80 10)
+ *
+ * DHD(A, B) = 22.360679774997898
+ * HD(A, B) ~= 47.8
+ * </pre>
+ */
+public class DiscreteHausdorffDistance
+{
+ public static double distance(Geometry g0, Geometry g1)
+ {
+ DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(g0, g1);
+ return dist.distance();
+ }
+
+ public static double distance(Geometry g0, Geometry g1, double densifyFrac)
+ {
+ DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(g0, g1);
+ dist.setDensifyFraction(densifyFrac);
+ return dist.distance();
+ }
+
+ private Geometry g0;
+ private Geometry g1;
+ private PointPairDistance ptDist = new PointPairDistance();
+
+ /**
+ * Value of 0.0 indicates that no densification should take place
+ */
+ private double densifyFrac = 0.0;
+
+ public DiscreteHausdorffDistance(Geometry g0, Geometry g1)
+ {
+ this.g0 = g0;
+ this.g1 = g1;
+ }
+
+ /**
+ * Sets the fraction by which to densify each segment.
+ * Each segment will be (virtually) split into a number of equal-length
+ * subsegments, whose fraction of the total length is closest
+ * to the given fraction.
+ *
+ * @param densifyFrac
+ */
+ public void setDensifyFraction(double densifyFrac)
+ {
+ if (densifyFrac > 1.0
+ || densifyFrac <= 0.0)
+ throw new IllegalArgumentException("Fraction is not in range (0.0 - 1.0]");
+
+ this.densifyFrac = densifyFrac;
+ }
+
+ public double distance()
+ {
+ compute(g0, g1);
+ return ptDist.getDistance();
+ }
+
+ public double orientedDistance()
+ {
+ computeOrientedDistance(g0, g1, ptDist);
+ return ptDist.getDistance();
+ }
+
+ public Coordinate[] getCoordinates() { return ptDist.getCoordinates(); }
+
+ private void compute(Geometry g0, Geometry g1)
+ {
+ computeOrientedDistance(g0, g1, ptDist);
+ computeOrientedDistance(g1, g0, ptDist);
+ }
+
+ private void computeOrientedDistance(Geometry discreteGeom, Geometry geom, PointPairDistance ptDist)
+ {
+ MaxPointDistanceFilter distFilter = new MaxPointDistanceFilter(geom);
+ discreteGeom.apply(distFilter);
+ ptDist.setMaximum(distFilter.getMaxPointDistance());
+
+ if (densifyFrac > 0) {
+ MaxDensifiedByFractionDistanceFilter fracFilter = new MaxDensifiedByFractionDistanceFilter(geom, densifyFrac);
+ discreteGeom.apply(fracFilter);
+ ptDist.setMaximum(fracFilter.getMaxPointDistance());
+
+ }
+ }
+
+ public static class MaxPointDistanceFilter
+ implements CoordinateFilter
+ {
+ private PointPairDistance maxPtDist = new PointPairDistance();
+ private PointPairDistance minPtDist = new PointPairDistance();
+ private DistanceToPoint euclideanDist = new DistanceToPoint();
+ private Geometry geom;
+
+ public MaxPointDistanceFilter(Geometry geom)
+ {
+ this.geom = geom;
+ }
+
+ public void filter(Coordinate pt)
+ {
+ minPtDist.initialize();
+ DistanceToPoint.computeDistance(geom, pt, minPtDist);
+ maxPtDist.setMaximum(minPtDist);
+ }
+
+ public PointPairDistance getMaxPointDistance() { return maxPtDist; }
+ }
+
+ public static class MaxDensifiedByFractionDistanceFilter
+ implements CoordinateSequenceFilter
+ {
+ private PointPairDistance maxPtDist = new PointPairDistance();
+ private PointPairDistance minPtDist = new PointPairDistance();
+ private Geometry geom;
+ private int numSubSegs = 0;
+
+ public MaxDensifiedByFractionDistanceFilter(Geometry geom, double fraction) {
+ this.geom = geom;
+ numSubSegs = (int) Math.rint(1.0/fraction);
+ }
+
+ public void filter(CoordinateSequence seq, int index)
+ {
+ /**
+ * This logic also handles skipping Point geometries
+ */
+ if (index == 0)
+ return;
+
+ Coordinate p0 = seq.getCoordinate(index - 1);
+ Coordinate p1 = seq.getCoordinate(index);
+
+ double delx = (p1.x - p0.x)/numSubSegs;
+ double dely = (p1.y - p0.y)/numSubSegs;
+
+ for (int i = 0; i < numSubSegs; i++) {
+ double x = p0.x + i*delx;
+ double y = p0.y + i*dely;
+ Coordinate pt = new Coordinate(x, y);
+ minPtDist.initialize();
+ DistanceToPoint.computeDistance(geom, pt, minPtDist);
+ maxPtDist.setMaximum(minPtDist);
+ }
+
+
+ }
+
+ public boolean isGeometryChanged() { return false; }
+
+ public boolean isDone() { return false; }
+
+ public PointPairDistance getMaxPointDistance() {
+ return maxPtDist;
+ }
+}
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DistanceToPoint.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DistanceToPoint.java
new file mode 100644
index 0000000..b76ee05
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DistanceToPoint.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm.distance;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Computes the Euclidean distance (L2 metric) from a {@link Coordinate} to a {@link Geometry}.
+ * Also computes two points on the geometry which are separated by the distance found.
+ */
+public class DistanceToPoint
+{
+
+ public DistanceToPoint() {
+ }
+
+ public static void computeDistance(Geometry geom, Coordinate pt, PointPairDistance ptDist)
+ {
+ if (geom instanceof LineString) {
+ computeDistance((LineString) geom, pt, ptDist);
+ }
+ else if (geom instanceof Polygon) {
+ computeDistance((Polygon) geom, pt, ptDist);
+ }
+ else if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = gc.getGeometryN(i);
+ computeDistance(g, pt, ptDist);
+ }
+ }
+ else { // assume geom is Point
+ ptDist.setMinimum(geom.getCoordinate(), pt);
+ }
+ }
+
+ public static void computeDistance(LineString line, Coordinate pt, PointPairDistance ptDist)
+ {
+ LineSegment tempSegment = new LineSegment();
+ Coordinate[] coords = line.getCoordinates();
+ for (int i = 0; i < coords.length - 1; i++) {
+ tempSegment.setCoordinates(coords[i], coords[i + 1]);
+ // this is somewhat inefficient - could do better
+ Coordinate closestPt = tempSegment.closestPoint(pt);
+ ptDist.setMinimum(closestPt, pt);
+ }
+ }
+
+ public static void computeDistance(LineSegment segment, Coordinate pt, PointPairDistance ptDist)
+ {
+ Coordinate closestPt = segment.closestPoint(pt);
+ ptDist.setMinimum(closestPt, pt);
+ }
+
+ public static void computeDistance(Polygon poly, Coordinate pt, PointPairDistance ptDist)
+ {
+ computeDistance(poly.getExteriorRing(), pt, ptDist);
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ computeDistance(poly.getInteriorRingN(i), pt, ptDist);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/PointPairDistance.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/PointPairDistance.java
new file mode 100644
index 0000000..4728274
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/PointPairDistance.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm.distance;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.io.WKTWriter;
+
+/**
+ * Contains a pair of points and the distance between them.
+ * Provides methods to update with a new point pair with
+ * either maximum or minimum distance.
+ */
+public class PointPairDistance {
+
+ private Coordinate[] pt = { new Coordinate(), new Coordinate() };
+ private double distance = Double.NaN;
+ private boolean isNull = true;
+
+ public PointPairDistance()
+ {
+ }
+
+ public void initialize() { isNull = true; }
+
+ public void initialize(Coordinate p0, Coordinate p1)
+ {
+ pt[0].setCoordinate(p0);
+ pt[1].setCoordinate(p1);
+ distance = p0.distance(p1);
+ isNull = false;
+ }
+
+ /**
+ * Initializes the points, avoiding recomputing the distance.
+ * @param p0
+ * @param p1
+ * @param distance the distance between p0 and p1
+ */
+ private void initialize(Coordinate p0, Coordinate p1, double distance)
+ {
+ pt[0].setCoordinate(p0);
+ pt[1].setCoordinate(p1);
+ this.distance = distance;
+ isNull = false;
+ }
+
+ public double getDistance() { return distance; }
+
+ public Coordinate[] getCoordinates() { return pt; }
+
+ public Coordinate getCoordinate(int i) { return pt[i]; }
+
+ public void setMaximum(PointPairDistance ptDist)
+ {
+ setMaximum(ptDist.pt[0], ptDist.pt[1]);
+ }
+
+ public void setMaximum(Coordinate p0, Coordinate p1)
+ {
+ if (isNull) {
+ initialize(p0, p1);
+ return;
+ }
+ double dist = p0.distance(p1);
+ if (dist > distance)
+ initialize(p0, p1, dist);
+ }
+
+ public void setMinimum(PointPairDistance ptDist)
+ {
+ setMinimum(ptDist.pt[0], ptDist.pt[1]);
+ }
+
+ public void setMinimum(Coordinate p0, Coordinate p1)
+ {
+ if (isNull) {
+ initialize(p0, p1);
+ return;
+ }
+ double dist = p0.distance(p1);
+ if (dist < distance)
+ initialize(p0, p1, dist);
+ }
+
+ public String toString()
+ {
+ return WKTWriter.toLineString(pt[0], pt[1]);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/package.html b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/package.html
new file mode 100644
index 0000000..b1caa99
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to compute distance metrics between geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocator.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocator.java
new file mode 100644
index 0000000..c75d1a5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocator.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm.locate;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.RayCrossingCounter;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.index.ArrayListVisitor;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.index.intervalrtree.SortedPackedIntervalRTree;
+
+
+/**
+ * Determines the {@link Location} of {@link Coordinate}s relative to
+ * an areal geometry, using indexing for efficiency.
+ * This algorithm is suitable for use in cases where
+ * many points will be tested against a given area.
+ * <p>
+ * The Location is computed precisely, in that points
+ * located on the geometry boundary or segments will
+ * return {@link Location.BOUNDARY}.
+ * <p>
+ * {@link Polygonal} and {@link LinearRing} geometries
+ * are supported.
+ *
+ * Thread-safe and immutable.
+ *
+ * @author Martin Davis
+ *
+ */
+public class IndexedPointInAreaLocator
+ implements PointOnGeometryLocator
+{
+ private final IntervalIndexedGeometry index;
+
+ /**
+ * Creates a new locator for a given {@link Geometry}.
+ * {@link Polygonal} and {@link LinearRing} geometries
+ * are supported.
+ *
+ * @param g the Geometry to locate in
+ */
+ public IndexedPointInAreaLocator(Geometry g)
+ {
+ if (! (g instanceof Polygonal || g instanceof LinearRing))
+ throw new IllegalArgumentException("Argument must be Polygonal or LinearRing");
+ index = new IntervalIndexedGeometry(g);
+ }
+
+ /**
+ * Determines the {@link Location} of a point in an areal {@link Geometry}.
+ *
+ * @param p the point to test
+ * @return the location of the point in the geometry
+ */
+ public int locate(Coordinate p)
+ {
+ RayCrossingCounter rcc = new RayCrossingCounter(p);
+
+ SegmentVisitor visitor = new SegmentVisitor(rcc);
+ index.query(p.y, p.y, visitor);
+
+ /*
+ // MD - slightly slower alternative
+ List segs = index.query(p.y, p.y);
+ countSegs(rcc, segs);
+ */
+
+ return rcc.getLocation();
+ }
+
+ private static class SegmentVisitor
+ implements ItemVisitor
+ {
+ private RayCrossingCounter counter;
+
+ public SegmentVisitor(RayCrossingCounter counter)
+ {
+ this.counter = counter;
+ }
+
+ public void visitItem(Object item)
+ {
+ LineSegment seg = (LineSegment) item;
+ counter.countSegment(seg.getCoordinate(0), seg.getCoordinate(1));
+ }
+ }
+
+ private static class IntervalIndexedGeometry
+ {
+ private final SortedPackedIntervalRTree index= new SortedPackedIntervalRTree();
+
+ public IntervalIndexedGeometry(Geometry geom)
+ {
+ init(geom);
+ }
+
+ private void init(Geometry geom)
+ {
+ List lines = LinearComponentExtracter.getLines(geom);
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ Coordinate[] pts = line.getCoordinates();
+ addLine(pts);
+ }
+ }
+
+ private void addLine(Coordinate[] pts)
+ {
+ for (int i = 1; i < pts.length; i++) {
+ LineSegment seg = new LineSegment(pts[i-1], pts[i]);
+ double min = Math.min(seg.p0.y, seg.p1.y);
+ double max = Math.max(seg.p0.y, seg.p1.y);
+ index.insert(min, max, seg);
+ }
+ }
+
+ public List query(double min, double max)
+ {
+ ArrayListVisitor visitor = new ArrayListVisitor();
+ index.query(min, max, visitor);
+ return visitor.getItems();
+ }
+
+ public void query(double min, double max, ItemVisitor visitor)
+ {
+ index.query(min, max, visitor);
+ }
+ }
+
+}
+
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/PointOnGeometryLocator.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/PointOnGeometryLocator.java
new file mode 100644
index 0000000..3eefc6d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/PointOnGeometryLocator.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm.locate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Location;
+
+/**
+ * An interface for classes which determine the {@link Location} of
+ * points in a {@link Geometry}.
+ *
+ * @author Martin Davis
+ */
+public interface PointOnGeometryLocator
+{
+ /**
+ * Determines the {@link Location} of a point in the {@link Geometry}.
+ *
+ * @param p the point to test
+ * @return the location of the point in the geometry
+ */
+ int locate(Coordinate p);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocator.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocator.java
new file mode 100644
index 0000000..b5cd518
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocator.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm.locate;
+
+import java.util.Iterator;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryCollectionIterator;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Polygonal;
+
+
+/**
+ * Computes the location of points
+ * relative to a {@link Polygonal} {@link Geometry},
+ * using a simple O(n) algorithm.
+ * This algorithm is suitable for use in cases where
+ * only one or a few points will be tested against a given area.
+ * <p>
+ * The algorithm used is only guaranteed to return correct results
+ * for points which are <b>not</b> on the boundary of the Geometry.
+ *
+ * @version 1.7
+ */
+public class SimplePointInAreaLocator
+ implements PointOnGeometryLocator
+{
+
+ /**
+ * Determines the {@link Location} of a point in an areal {@link Geometry}.
+ * Computes {@link Location.BOUNDARY} if the point lies exactly
+ * on a geometry line segment.
+ *
+ * @param p the point to test
+ * @param geom the areal geometry to test
+ * @return the Location of the point in the geometry
+ */
+ public static int locate(Coordinate p, Geometry geom)
+ {
+ if (geom.isEmpty()) return Location.EXTERIOR;
+ return locateInGeometry(p, geom);
+ }
+
+ private static int locateInGeometry(Coordinate p, Geometry geom)
+ {
+ if (geom instanceof Polygon) {
+ return locatePointInPolygon(p, (Polygon) geom);
+ }
+ else if (geom instanceof GeometryCollection) {
+ Iterator geomi = new GeometryCollectionIterator((GeometryCollection) geom);
+ while (geomi.hasNext()) {
+ Geometry g2 = (Geometry) geomi.next();
+ if (g2 != geom) {
+ int loc = locateInGeometry(p, g2);
+ if (loc != Location.EXTERIOR) return loc;
+ }
+ }
+ }
+ return Location.EXTERIOR;
+ }
+
+ /**
+ * Determines the {@link Location} of a point in a {@link Polygon}.
+ * Computes {@link Location.BOUNDARY} if the point lies exactly
+ * on the polygon boundary.
+ *
+ * @param p the point to test
+ * @param poly the geometry to test
+ * @return the Location of the point in the polygon
+ */
+ public static int locatePointInPolygon(Coordinate p, Polygon poly)
+ {
+ if (poly.isEmpty()) return Location.EXTERIOR;
+ LinearRing shell = (LinearRing) poly.getExteriorRing();
+ int shellLoc = locatePointInRing(p, shell);
+ if (shellLoc != Location.INTERIOR) return shellLoc;
+
+ // now test if the point lies in or on the holes
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ LinearRing hole = (LinearRing) poly.getInteriorRingN(i);
+ int holeLoc = locatePointInRing(p, hole);
+ if (holeLoc == Location.BOUNDARY) return Location.BOUNDARY;
+ if (holeLoc == Location.INTERIOR) return Location.EXTERIOR;
+ // if in EXTERIOR of this hole keep checking the other ones
+ }
+ // If not in any hole must be inside polygon
+ return Location.INTERIOR;
+ }
+
+ /**
+ * Determines whether a point lies in a {@link Polygon}.
+ * If the point lies on the polygon boundary it is
+ * considered to be inside.
+ *
+ * @param p the point to test
+ * @param poly the geometry to test
+ * @return true if the point lies in or on the polygon
+ */
+ public static boolean containsPointInPolygon(Coordinate p, Polygon poly) {
+ return Location.EXTERIOR != locatePointInPolygon(p, poly);
+ }
+
+ /**
+ * Determines whether a point lies in a LinearRing,
+ * using the ring envelope to short-circuit if possible.
+ *
+ * @param p the point to test
+ * @param ring a linear ring
+ * @return true if the point lies inside the ring
+ */
+ private static int locatePointInRing(Coordinate p, LinearRing ring)
+ {
+ // short-circuit if point is not in ring envelope
+ if (! ring.getEnvelopeInternal().intersects(p))
+ return Location.EXTERIOR;
+ return PointLocation.locateInRing(p, ring.getCoordinates());
+ }
+
+ private Geometry geom;
+
+ public SimplePointInAreaLocator(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public int locate(Coordinate p) {
+ return SimplePointInAreaLocator.locate(p, geom);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/package.html b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/package.html
new file mode 100644
index 0000000..9826ba6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to determine the topological location of points in geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/match/AreaSimilarityMeasure.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/AreaSimilarityMeasure.java
new file mode 100644
index 0000000..8f3841c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/AreaSimilarityMeasure.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm.match;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Measures the degree of similarity between two {@link Geometry}s
+ * using the area of intersection between the geometries.
+ * The measure is normalized to lie in the range [0, 1].
+ * Higher measures indicate a great degree of similarity.
+ * <p>
+ * NOTE: Currently experimental and incomplete.
+ *
+ * @author mbdavis
+ *
+ */
+public class AreaSimilarityMeasure
+ implements SimilarityMeasure
+{
+ /*
+ public static double measure(Geometry a, Geometry b)
+ {
+ AreaSimilarityMeasure gv = new AreaSimilarityMeasure(a, b);
+ return gv.measure();
+ }
+ */
+
+ public AreaSimilarityMeasure()
+ {
+ }
+
+ public double measure(Geometry g1, Geometry g2)
+ {
+ double areaInt = g1.intersection(g2).getArea();
+ double areaUnion = g1.union(g2).getArea();
+ return areaInt / areaUnion;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/match/HausdorffSimilarityMeasure.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/HausdorffSimilarityMeasure.java
new file mode 100644
index 0000000..31ffaed
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/HausdorffSimilarityMeasure.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm.match;
+
+import org.locationtech.jts.algorithm.distance.DiscreteHausdorffDistance;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Measures the degree of similarity between two {@link Geometry}s
+ * using the Hausdorff distance metric.
+ * The measure is normalized to lie in the range [0, 1].
+ * Higher measures indicate a great degree of similarity.
+ * <p>
+ * The measure is computed by computing the Hausdorff distance
+ * between the input geometries, and then normalizing
+ * this by dividing it by the diagonal distance across
+ * the envelope of the combined geometries.
+ *
+ * @author mbdavis
+ *
+ */
+public class HausdorffSimilarityMeasure
+ implements SimilarityMeasure
+{
+ /*
+ public static double measure(Geometry a, Geometry b)
+ {
+ HausdorffSimilarityMeasure gv = new HausdorffSimilarityMeasure(a, b);
+ return gv.measure();
+ }
+ */
+
+ public HausdorffSimilarityMeasure()
+ {
+ }
+
+ /*
+ * Densify a small amount to increase accuracy of Hausdorff distance
+ */
+ private static final double DENSIFY_FRACTION = 0.25;
+
+ public double measure(Geometry g1, Geometry g2)
+ {
+ double distance = DiscreteHausdorffDistance.distance(g1, g2, DENSIFY_FRACTION);
+
+ Envelope env = new Envelope(g1.getEnvelopeInternal());
+ env.expandToInclude(g2.getEnvelopeInternal());
+ double envSize = diagonalSize(env);
+ // normalize so that more similarity produces a measure closer to 1
+ double measure = 1 - distance / envSize;
+
+ //System.out.println("Hausdorff distance = " + distance + ", measure = " + measure);
+ return measure;
+ }
+
+ public static double diagonalSize(Envelope env)
+ {
+ if (env.isNull()) return 0.0;
+
+ double width = env.getWidth();
+ double hgt = env.getHeight();
+ return Math.sqrt(width * width + hgt * hgt);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/match/SimilarityMeasure.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/SimilarityMeasure.java
new file mode 100644
index 0000000..d7886cf
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/SimilarityMeasure.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm.match;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * An interface for classes which measures the degree of similarity between two {@link Geometry}s.
+ * The computed measure lies in the range [0, 1].
+ * Higher measures indicate a great degree of similarity.
+ * A measure of 1.0 indicates that the input geometries are identical
+ * A measure of 0.0 indicates that the geometries
+ * have essentially no similarity.
+ * The precise definition of "identical" and "no similarity" may depend on the
+ * exact algorithm being used.
+ *
+ * @author mbdavis
+ *
+ */
+public interface SimilarityMeasure
+{
+
+ double measure(Geometry g1, Geometry g2);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/match/SimilarityMeasureCombiner.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/SimilarityMeasureCombiner.java
new file mode 100644
index 0000000..f6d34b8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/SimilarityMeasureCombiner.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm.match;
+
+/**
+ * Provides methods to mathematically combine {@link SimilarityMeasure} values.
+ *
+ * @author Martin Davis
+ *
+ */
+public class SimilarityMeasureCombiner
+{
+ public static double combine(double measure1, double measure2)
+ {
+ return Math.min(measure1, measure2);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/match/package.html b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/package.html
new file mode 100644
index 0000000..f4f0fb0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to compute matching metrics between geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/package.html b/modules/core/src/main/java/org/locationtech/jts/algorithm/package.html
new file mode 100644
index 0000000..db0faac
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/package.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes and interfaces implementing fundamental computational geometry algorithms.
+
+<H3>Robustness</H3>
+
+Geometrical algorithms involve a combination of combinatorial and numerical computation. As with
+all numerical computation using finite-precision numbers, the algorithms chosen are susceptible to
+problems of robustness. A robustness problem occurs when a numerical calculation produces an
+incorrect answer for some inputs due to round-off errors. Robustness problems are especially
+serious in geometric computation, since they can result in errors during topology building.
+<P>
+There are many approaches to dealing with the problem of robustness in geometrical computation.
+Not surprisingly, most robust algorithms are substantially more complex and less performant than
+the non-robust versions. Fortunately, JTS is sensitive to robustness problems in only a few key
+functions (such as line intersection and the point-in-polygon test). There are efficient robust
+algorithms available for these functions, and these algorithms are implemented in JTS.
+
+<H3>Computational Performance</H3>
+
+Runtime performance is an important consideration for a production-quality implementation of
+geometric algorithms. The most computationally intensive algorithm used in JTS is intersection
+detection. JTS methods need to determine both all intersection between the line segments in a
+single Geometry (self-intersection) and all intersections between the line segments of two different
+Geometries.
+<P>
+The obvious naive algorithm for intersection detection (comparing every segment with every other)
+has unacceptably slow performance. There is a large literature of faster algorithms for intersection
+detection. Unfortunately, many of them involve substantial code complexity. JTS tries to balance code
+simplicity with performance gains. It uses some simple techniques to produce substantial performance
+gains for common types of input data.
+
+
+<h2>Package Specification</h2>
+
+<ul>
+ <li>Java Topology Suite Technical Specifications
+ <li><A HREF="http://www.opengis.org/techno/specs.htm">
+ OpenGIS Simple Features Specification for SQL</A>
+</ul>
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/FontGlyphReader.java b/modules/core/src/main/java/org/locationtech/jts/awt/FontGlyphReader.java
new file mode 100644
index 0000000..4cdadc5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/FontGlyphReader.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.awt;
+
+import java.awt.Font;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.util.AffineTransformation;
+
+/**
+ * Provides methods to read {@link Font} glyphs for strings
+ * into {@link Polygonal} geometry.
+ * <p>
+ * It is suggested to use larger point sizes to render fonts glyphs,
+ * to reduce the effects of scale-dependent hints.
+ * The result geometry is in the base coordinate system of the font.
+ * The geometry can be further transformed as necessary using
+ * {@link AffineTransformation}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public class FontGlyphReader
+{
+ /**
+ * The font name of the Java logical font Serif.
+ */
+ public static final String FONT_SERIF = "Serif";
+
+ /**
+ * The font name of the Java logical font SansSerif.
+ * <p>
+ * DEPRECATED - use FONT_SANSSERIF
+ */
+ public static final String FONT_SANSERIF = "SansSerif";
+
+
+ /**
+ * The font name of the Java logical font SansSerif.
+ */
+ public static final String FONT_SANSSERIF = "SansSerif";
+
+ /**
+ * The font name of the Java logical font Monospaced.
+ */
+
+ public static final String FONT_MONOSPACED = "Monospaced";
+
+ // a flatness factor empirically determined to provide good results
+ private static final double FLATNESS_FACTOR = 400;
+
+ private FontGlyphReader() {}
+
+ /**
+ * Converts text rendered in the given font and pointsize to a {@link Geometry}
+ * using a standard flatness factor.
+ *
+ * @param text the text to render
+ * @param fontName the name of the font
+ * @param pointSize the pointSize to render at
+ * @param geomFact the geometryFactory to use to create the result
+ * @return a polygonal geometry representing the rendered text
+ */
+ public static Geometry read(String text, String fontName, int pointSize, GeometryFactory geomFact)
+ {
+ return read(text, new Font(fontName, Font.PLAIN, pointSize), geomFact);
+ }
+
+ /**
+ * Converts text rendered in the given {@link Font} to a {@link Geometry}
+ * using a standard flatness factor.
+ *
+ * @param text the text to render
+ * @param font the font to render with
+ * @param geomFact the geometryFactory to use to create the result
+ * @return a polygonal geometry representing the rendered text
+ */
+ public static Geometry read(String text, Font font, GeometryFactory geomFact)
+ {
+ double flatness = font.getSize() / FLATNESS_FACTOR;
+ return read(text, font, flatness, geomFact);
+ }
+
+ /**
+ * Converts text rendered in the given {@link Font} to a {@link Geometry}
+ *
+ * @param text the text to render
+ * @param font the font to render with
+ * @param flatness the flatness factor to use
+ * @param geomFact the geometryFactory to use to create the result
+ * @return a polygonal geometry representing the rendered text
+ */
+ public static Geometry read(String text, Font font, double flatness, GeometryFactory geomFact)
+ {
+ char[] chs = text.toCharArray();
+ FontRenderContext fontContext = new FontRenderContext(null, false, true);
+ GlyphVector gv = font.createGlyphVector(fontContext, chs);
+ List polys = new ArrayList();
+ for (int i = 0; i < gv.getNumGlyphs(); i++) {
+ Geometry geom = ShapeReader.read(gv.getGlyphOutline(i), flatness, geomFact);
+ for (int j = 0; j < geom.getNumGeometries(); j++) {
+ polys.add(geom.getGeometryN(j));
+ }
+ }
+ return geomFact.buildGeometry(polys);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/GeometryCollectionShape.java b/modules/core/src/main/java/org/locationtech/jts/awt/GeometryCollectionShape.java
new file mode 100644
index 0000000..d0a331b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/GeometryCollectionShape.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.awt;
+
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.PathIterator;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * A {@link Shape} which contains a heterogeneous collection of other shapes
+ * representing JTS {@link Geometry}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryCollectionShape implements Shape {
+ private ArrayList shapes = new ArrayList();
+
+ public GeometryCollectionShape() {
+ }
+
+ public void add(Shape shape) {
+ shapes.add(shape);
+ }
+
+ public Rectangle getBounds() {
+ /**@todo Implement this java.awt.Shape method*/
+ throw new java.lang.UnsupportedOperationException(
+ "Method getBounds() not yet implemented.");
+ }
+
+ public Rectangle2D getBounds2D() {
+ Rectangle2D rectangle = null;
+
+ for (Iterator i = shapes.iterator(); i.hasNext();) {
+ Shape shape = (Shape) i.next();
+
+ if (rectangle == null) {
+ rectangle = shape.getBounds2D();
+ } else {
+ rectangle.add(shape.getBounds2D());
+ }
+ }
+
+ return rectangle;
+ }
+
+ public boolean contains(double x, double y) {
+ /**@todo Implement this java.awt.Shape method*/
+ throw new java.lang.UnsupportedOperationException(
+ "Method contains() not yet implemented.");
+ }
+
+ public boolean contains(Point2D p) {
+ /**@todo Implement this java.awt.Shape method*/
+ throw new java.lang.UnsupportedOperationException(
+ "Method contains() not yet implemented.");
+ }
+
+ public boolean intersects(double x, double y, double w, double h) {
+ /**@todo Implement this java.awt.Shape method*/
+ throw new java.lang.UnsupportedOperationException(
+ "Method intersects() not yet implemented.");
+ }
+
+ public boolean intersects(Rectangle2D r) {
+ /**@todo Implement this java.awt.Shape method*/
+ throw new java.lang.UnsupportedOperationException(
+ "Method intersects() not yet implemented.");
+ }
+
+ public boolean contains(double x, double y, double w, double h) {
+ /**@todo Implement this java.awt.Shape method*/
+ throw new java.lang.UnsupportedOperationException(
+ "Method contains() not yet implemented.");
+ }
+
+ public boolean contains(Rectangle2D r) {
+ /**@todo Implement this java.awt.Shape method*/
+ throw new java.lang.UnsupportedOperationException(
+ "Method contains() not yet implemented.");
+ }
+
+ public PathIterator getPathIterator(AffineTransform at) {
+ return new ShapeCollectionPathIterator(shapes, at);
+ }
+
+ public PathIterator getPathIterator(AffineTransform at, double flatness) {
+ // since Geometry is linear, can simply delegate to the simple method
+ return getPathIterator(at);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/IdentityPointTransformation.java b/modules/core/src/main/java/org/locationtech/jts/awt/IdentityPointTransformation.java
new file mode 100644
index 0000000..18fc12f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/IdentityPointTransformation.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.awt;
+
+import java.awt.geom.Point2D;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Copies point ordinates with no transformation.
+ *
+ * @author Martin Davis
+ *
+ */
+public class IdentityPointTransformation
+implements PointTransformation
+{
+ public void transform(Coordinate model, Point2D view)
+ {
+ view.setLocation(model.x, model.y);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/PointShapeFactory.java b/modules/core/src/main/java/org/locationtech/jts/awt/PointShapeFactory.java
new file mode 100644
index 0000000..54a1746
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/PointShapeFactory.java
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.awt;
+
+import java.awt.Shape;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+/**
+ * An interface for classes which create {@link Shape}s to represent
+ * {@link Point}
+ * geometries. Java2D does not provide an actual point shape, so some other
+ * shape must be used to render points (e.g. such as a Rectangle or Ellipse).
+ *
+ * @author Martin Davis
+ *
+ */
+public interface PointShapeFactory {
+ /**
+ * Creates a shape representing a {@link Point}.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ Shape createPoint(Point2D point);
+
+ public static abstract class BasePointShapeFactory implements
+ PointShapeFactory {
+ /**
+ * The default size of the shape
+ */
+ public static final double DEFAULT_SIZE = 3.0;
+
+ protected double size = DEFAULT_SIZE;
+
+ /**
+ * Creates a new factory for points with default size.
+ *
+ */
+ public BasePointShapeFactory() {
+ }
+
+ /**
+ * Creates a factory for points of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public BasePointShapeFactory(double size) {
+ this.size = size;
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public abstract Shape createPoint(Point2D point);
+ }
+
+ public static class Point extends BasePointShapeFactory {
+ /**
+ * Creates a new factory for points with default size.
+ *
+ */
+ public Point() {
+ super();
+ }
+
+ /**
+ * Creates a factory for points of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public Point(double size) {
+ super(size);
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public Shape createPoint(Point2D point) {
+ Line2D.Double pointMarker =
+ new Line2D.Double(
+ point.getX(),
+ point.getY(),
+ point.getX(),
+ point.getY());
+ return pointMarker;
+ }
+ }
+
+ public static class Square extends BasePointShapeFactory {
+ /**
+ * Creates a new factory for squares with default size.
+ *
+ */
+ public Square() {
+ super();
+ }
+
+ /**
+ * Creates a factory for squares of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public Square(double size) {
+ super(size);
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public Shape createPoint(Point2D point) {
+ Rectangle2D.Double pointMarker =
+ new Rectangle2D.Double(
+ 0.0,
+ 0.0,
+ size,
+ size);
+ pointMarker.x = (point.getX() - (size / 2));
+ pointMarker.y = (point.getY() - (size / 2));
+
+ return pointMarker;
+ }
+ }
+
+ public static class Star extends BasePointShapeFactory {
+ /**
+ * Creates a new factory for points with default size.
+ *
+ */
+ public Star() {
+ super();
+ }
+
+ /**
+ * Creates a factory for points of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public Star(double size) {
+ super(size);
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public Shape createPoint(Point2D point) {
+ GeneralPath path = new GeneralPath();
+ path.moveTo((float) point.getX(), (float) (point.getY() - size/2));
+ path.lineTo((float) (point.getX() + size * 1/8), (float) (point.getY() - size * 1/8));
+ path.lineTo((float) (point.getX() + size/2), (float) (point.getY() - size * 1/8));
+ path.lineTo((float) (point.getX() + size * 2/8), (float) (point.getY() + size * 1/8));
+ path.lineTo((float) (point.getX() + size * 3/8), (float) (point.getY() + size/2));
+ path.lineTo((float) (point.getX()), (float) (point.getY() + size * 2/8));
+ path.lineTo((float) (point.getX() - size * 3/8), (float) (point.getY() + size/2));
+ path.lineTo((float) (point.getX() - size * 2/8), (float) (point.getY() + size * 1/8));
+ path.lineTo((float) (point.getX() - size/2), (float) (point.getY() - size * 1/8));
+ path.lineTo((float) (point.getX() - size * 1/8), (float) (point.getY() - size * 1/8));
+ path.closePath();
+ return path;
+ }
+ }
+
+ public static class Triangle extends BasePointShapeFactory {
+ /**
+ * Creates a new factory for points with default size.
+ *
+ */
+ public Triangle() {
+ super();
+ }
+
+ /**
+ * Creates a factory for points of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public Triangle(double size) {
+ super(size);
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public Shape createPoint(Point2D point) {
+
+ GeneralPath path = new GeneralPath();
+ path.moveTo((float) (point.getX()), (float) (point.getY() - size / 2));
+ path.lineTo((float) (point.getX() + size / 2), (float) (point.getY() + size / 2));
+ path.lineTo((float) (point.getX() - size / 2), (float) (point.getY() + size / 2));
+ path.lineTo((float) (point.getX()), (float) (point.getY() - size / 2));
+
+ return path;
+ }
+
+ }
+ public static class Circle extends BasePointShapeFactory {
+ /**
+ * Creates a new factory for points with default size.
+ *
+ */
+ public Circle() {
+ super();
+ }
+
+ /**
+ * Creates a factory for points of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public Circle(double size) {
+ super(size);
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public Shape createPoint(Point2D point) {
+ Ellipse2D.Double pointMarker =
+ new Ellipse2D.Double(
+ 0.0,
+ 0.0,
+ size,
+ size);
+ pointMarker.x = (point.getX() - (size / 2));
+ pointMarker.y = (point.getY() - (size / 2));
+
+ return pointMarker;
+ }
+
+ }
+ public static class Cross extends BasePointShapeFactory {
+ /**
+ * Creates a new factory for points with default size.
+ *
+ */
+ public Cross() {
+ super();
+ }
+
+ /**
+ * Creates a factory for points of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public Cross(double size) {
+ super(size);
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public Shape createPoint(Point2D point) {
+
+ float x1 = (float) (point.getX() - size/2f);
+ float x2 = (float) (point.getX() - size/4f);
+ float x3 = (float) (point.getX() + size/4f);
+ float x4 = (float) (point.getX() + size/2f);
+
+ float y1 = (float) (point.getY() - size/2f);
+ float y2 = (float) (point.getY() - size/4f);
+ float y3 = (float) (point.getY() + size/4f);
+ float y4 = (float) (point.getY() + size/2f);
+
+ GeneralPath path = new GeneralPath();
+ path.moveTo(x2, y1);
+ path.lineTo(x3, y1);
+ path.lineTo(x3, y2);
+ path.lineTo(x4, y2);
+ path.lineTo(x4, y3);
+ path.lineTo(x3, y3);
+ path.lineTo(x3, y4);
+ path.lineTo(x2, y4);
+ path.lineTo(x2, y3);
+ path.lineTo(x1, y3);
+ path.lineTo(x1, y2);
+ path.lineTo(x2, y2);
+ path.lineTo(x2, y1);
+
+ return path;
+ }
+
+ }
+ public static class X extends BasePointShapeFactory {
+ /**
+ * Creates a new factory for points with default size.
+ *
+ */
+ public X() {
+ super();
+ }
+
+ /**
+ * Creates a factory for points of given size.
+ *
+ * @param size
+ * the size of the points
+ */
+ public X(double size) {
+ super(size);
+ }
+
+ /**
+ * Creates a shape representing a point.
+ *
+ * @param point
+ * the location of the point
+ * @return a shape
+ */
+ public Shape createPoint(Point2D point) {
+ GeneralPath path = new GeneralPath();
+ path.moveTo((float) (point.getX()), (float) (point.getY() - size * 1/8));
+ path.lineTo((float) (point.getX() + size * 2/8), (float) (point.getY() - size/2));
+ path.lineTo((float) (point.getX() + size/2), (float) (point.getY() - size/2));
+ path.lineTo((float) (point.getX() + size * 1/8), (float) (point.getY()));
+ path.lineTo((float) (point.getX() + size/2), (float) (point.getY() + size/2));
+ path.lineTo((float) (point.getX() + size * 2/8), (float) (point.getY() + size/2));
+ path.lineTo((float) (point.getX()), (float) (point.getY() + size * 1/8));
+ path.lineTo((float) (point.getX() - size * 2/8), (float) (point.getY() + size/2));
+ path.lineTo((float) (point.getX() - size/2), (float) (point.getY() + size/2));
+ path.lineTo((float) (point.getX() - size * 1/8), (float) (point.getY()));
+ path.lineTo((float) (point.getX() - size/2), (float) (point.getY() - size/2));
+ path.lineTo((float) (point.getX() - size * 2/8), (float) (point.getY() - size/2));
+ path.closePath();
+ return path;
+ }
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/PointTransformation.java b/modules/core/src/main/java/org/locationtech/jts/awt/PointTransformation.java
new file mode 100644
index 0000000..c439fc8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/PointTransformation.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.awt;
+
+import java.awt.geom.Point2D;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * Transforms a geometry {@link Coordinate} into a Java2D {@link Point},
+ * possibly with a mathematical transformation of the ordinate values.
+ * Transformation from a model coordinate system to a view coordinate system
+ * can be efficiently performed by supplying an appropriate transformation.
+ *
+ * @author Martin Davis
+ */
+public interface PointTransformation {
+ /**
+ * Transforms a {@link Coordinate} into a Java2D {@link Point}.
+ *
+ * @param src the source Coordinate
+ * @param dest the destination Point
+ */
+ public void transform(Coordinate src, Point2D dest);
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/PolygonShape.java b/modules/core/src/main/java/org/locationtech/jts/awt/PolygonShape.java
new file mode 100644
index 0000000..3bb9d43
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/PolygonShape.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.awt;
+
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.PathIterator;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Coordinate;
+
+
+/**
+ * A {@link Shape} which represents a polygon which may contain holes.
+ * Provided because the standard AWT Polygon class does not support holes.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PolygonShape implements Shape
+{
+ // use a GeneralPath with a winding rule, since it supports floating point coordinates
+ private GeneralPath polygonPath;
+ private GeneralPath ringPath;
+
+ /**
+ * Creates a new polygon {@link Shape}.
+ *
+ * @param shellVertices the vertices of the shell
+ * @param holeVerticesCollection a collection of Coordinate[] for each hole
+ */
+ public PolygonShape(Coordinate[] shellVertices,
+ Collection holeVerticesCollection)
+ {
+ polygonPath = toPath(shellVertices);
+
+ for (Iterator i = holeVerticesCollection.iterator(); i.hasNext();) {
+ Coordinate[] holeVertices = (Coordinate[]) i.next();
+ polygonPath.append(toPath(holeVertices), false);
+ }
+ }
+
+ public PolygonShape()
+ {
+ }
+
+ void addToRing(Point2D p)
+ {
+ if (ringPath == null) {
+ ringPath = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ ringPath.moveTo((float) p.getX(), (float) p.getY());
+ }
+ else {
+ ringPath.lineTo((float) p.getX(), (float) p.getY());
+ }
+ }
+
+ void endRing()
+ {
+ ringPath.closePath();
+ if (polygonPath == null) {
+ polygonPath = ringPath;
+ }
+ else {
+ polygonPath.append(ringPath, false);
+ }
+ ringPath = null;
+ }
+
+ /**
+ * Creates a GeneralPath representing a polygon ring
+ * having the given coordinate sequence.
+ * Uses the GeneralPath.WIND_EVEN_ODD winding rule.
+ *
+ * @param coordinates a coordinate sequence
+ * @return the path for the coordinate sequence
+ */
+ private GeneralPath toPath(Coordinate[] coordinates) {
+ GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD, coordinates.length);
+
+ if (coordinates.length > 0) {
+ path.moveTo((float) coordinates[0].x, (float) coordinates[0].y);
+ for (int i = 0; i < coordinates.length; i++) {
+ path.lineTo((float) coordinates[i].x, (float) coordinates[i].y);
+ }
+ }
+ return path;
+ }
+
+ public Rectangle getBounds() {
+ return polygonPath.getBounds();
+ }
+
+ public Rectangle2D getBounds2D() {
+ return polygonPath.getBounds2D();
+ }
+
+ public boolean contains(double x, double y) {
+ return polygonPath.contains(x, y);
+ }
+
+ public boolean contains(Point2D p) {
+ return polygonPath.contains(p);
+ }
+
+ public boolean intersects(double x, double y, double w, double h) {
+ return polygonPath.intersects(x, y, w, h);
+ }
+
+ public boolean intersects(Rectangle2D r) {
+ return polygonPath.intersects(r);
+ }
+
+ public boolean contains(double x, double y, double w, double h) {
+ return polygonPath.contains(x, y, w, h);
+ }
+
+ public boolean contains(Rectangle2D r) {
+ return polygonPath.contains(r);
+ }
+
+ public PathIterator getPathIterator(AffineTransform at) {
+ return polygonPath.getPathIterator(at);
+ }
+
+ public PathIterator getPathIterator(AffineTransform at, double flatness) {
+ return getPathIterator(at, flatness);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/ShapeCollectionPathIterator.java b/modules/core/src/main/java/org/locationtech/jts/awt/ShapeCollectionPathIterator.java
new file mode 100644
index 0000000..0627fae
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/ShapeCollectionPathIterator.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.awt;
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.PathIterator;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * A {@link PathIterator} which provides paths for a collection of {@link Shape}s.
+ *
+ * @author Martin Davis
+ */
+public class ShapeCollectionPathIterator implements PathIterator {
+ private Iterator shapeIterator;
+
+ // initialize with a no-op iterator
+ private PathIterator currentPathIterator = new PathIterator() {
+ public int getWindingRule() {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isDone() {
+ return true;
+ }
+
+ public void next() {
+ }
+
+ public int currentSegment(float[] coords) {
+ throw new UnsupportedOperationException();
+ }
+
+ public int currentSegment(double[] coords) {
+ throw new UnsupportedOperationException();
+ }
+ };
+
+ private AffineTransform affineTransform;
+ private boolean done = false;
+
+ /**
+ * Creates a new path iterator for a collection of {@link Shape}s.
+ *
+ * @param shapes the Shapes in the collection
+ * @param affineTransform a optional transformation to be applied to the coordinates in the path (may be null)
+ */
+ public ShapeCollectionPathIterator(Collection shapes,
+ AffineTransform affineTransform) {
+ shapeIterator = shapes.iterator();
+ this.affineTransform = affineTransform;
+ next();
+ }
+
+ public int getWindingRule() {
+ /**
+ * WIND_NON_ZERO is more accurate than WIND_EVEN_ODD, and can be comparable
+ * in speed. (See http://www.geometryalgorithms.com/Archive/algorithm_0103/algorithm_0103.htm#Winding%20Number)
+ * However, WIND_NON_ZERO requires that the
+ * shell and holes be oriented in a certain way.
+ * So use WIND_EVEN_ODD.
+ */
+ return PathIterator.WIND_EVEN_ODD;
+ }
+
+ public boolean isDone() {
+ return done;
+ }
+
+ public void next() {
+ currentPathIterator.next();
+
+ if (currentPathIterator.isDone() && !shapeIterator.hasNext()) {
+ done = true;
+ return;
+ }
+ if (currentPathIterator.isDone()) {
+ currentPathIterator = ((Shape) shapeIterator.next()).getPathIterator(affineTransform);
+ }
+ }
+
+ public int currentSegment(float[] coords) {
+ return currentPathIterator.currentSegment(coords);
+ }
+
+ public int currentSegment(double[] coords) {
+ return currentPathIterator.currentSegment(coords);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/ShapeReader.java b/modules/core/src/main/java/org/locationtech/jts/awt/ShapeReader.java
new file mode 100644
index 0000000..006d4c9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/ShapeReader.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.awt;
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.PathIterator;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+
+
+/**
+ * Converts a Java2D {@link Shape}
+ * or the more general {@link PathIterator} into a {@link Geometry}.
+ * <p>
+ * The coordinate system for Java2D is typically screen coordinates,
+ * which has the Y axis inverted
+ * relative to the usual JTS coordinate system.
+ * This is rectified during conversion.
+ * <p>
+ * PathIterators to be converted are expected to be linear or flat.
+ * That is, they should contain only <tt>SEG_MOVETO</tt>, <tt>SEG_LINETO</tt>, and <tt>SEG_CLOSE</tt> segment types.
+ * Any other segment types will cause an exception.
+ *
+ * @author Martin Davis
+ *
+ */
+public class ShapeReader
+{
+ private static final AffineTransform INVERT_Y = AffineTransform.getScaleInstance(1, -1);
+
+ /**
+ * Converts a flat path to a {@link Geometry}.
+ *
+ * @param pathIt the path to convert
+ * @param geomFact the GeometryFactory to use
+ * @return a Geometry representing the path
+ */
+ public static Geometry read(PathIterator pathIt, GeometryFactory geomFact)
+ {
+ ShapeReader pc = new ShapeReader(geomFact);
+ return pc.read(pathIt);
+ }
+
+ /**
+ * Converts a Shape to a Geometry, flattening it first.
+ *
+ * @param shp the Java2D shape
+ * @param flatness the flatness parameter to use
+ * @param geomFact the GeometryFactory to use
+ * @return a Geometry representing the shape
+ */
+ public static Geometry read(Shape shp, double flatness, GeometryFactory geomFact)
+ {
+ PathIterator pathIt = shp.getPathIterator(INVERT_Y, flatness);
+ return ShapeReader.read(pathIt, geomFact);
+ }
+
+ private GeometryFactory geometryFactory;
+
+ public ShapeReader(GeometryFactory geometryFactory) {
+ this.geometryFactory = geometryFactory;
+ }
+
+ /**
+ * Converts a flat path to a {@link Geometry}.
+ *
+ * @param pathIt the path to convert
+ * @return a Geometry representing the path
+ */
+ public Geometry read(PathIterator pathIt)
+ {
+ List pathPtSeq = toCoordinates(pathIt);
+
+ List polys = new ArrayList();
+ int seqIndex = 0;
+ while (seqIndex < pathPtSeq.size()) {
+ // assume next seq is shell
+ // TODO: test this
+ Coordinate[] pts = (Coordinate[]) pathPtSeq.get(seqIndex);
+ LinearRing shell = geometryFactory.createLinearRing(pts);
+ seqIndex++;
+
+ List holes = new ArrayList();
+ // add holes as long as rings are CCW
+ while (seqIndex < pathPtSeq.size() && isHole((Coordinate[]) pathPtSeq.get(seqIndex))) {
+ Coordinate[] holePts = (Coordinate[]) pathPtSeq.get(seqIndex);
+ LinearRing hole = geometryFactory.createLinearRing(holePts);
+ holes.add(hole);
+ seqIndex++;
+ }
+ LinearRing[] holeArray = GeometryFactory.toLinearRingArray(holes);
+ polys.add(geometryFactory.createPolygon(shell, holeArray));
+ }
+ return geometryFactory.buildGeometry(polys);
+ }
+
+ private boolean isHole(Coordinate[] pts)
+ {
+ return Orientation.isCCW(pts);
+ }
+
+ /**
+ * Extracts the points of the paths in a flat {@link PathIterator} into
+ * a list of Coordinate arrays.
+ *
+ * @param pathIt a path iterator
+ * @return a List of Coordinate arrays
+ * @throws IllegalArgumentException if a non-linear segment type is encountered
+ */
+ public static List toCoordinates(PathIterator pathIt)
+ {
+ List coordArrays = new ArrayList();
+ while (! pathIt.isDone()) {
+ Coordinate[] pts = nextCoordinateArray(pathIt);
+ if (pts == null)
+ break;
+ coordArrays.add(pts);
+ }
+ return coordArrays;
+ }
+
+ private static Coordinate[] nextCoordinateArray(PathIterator pathIt)
+ {
+ double[] pathPt = new double[6];
+ CoordinateList coordList = null;
+ boolean isDone = false;
+ while (! pathIt.isDone()) {
+ int segType = pathIt.currentSegment(pathPt);
+ switch (segType) {
+ case PathIterator.SEG_MOVETO:
+ if (coordList != null) {
+ // don't advance pathIt, to retain start of next path if any
+ isDone = true;
+ }
+ else {
+ coordList = new CoordinateList();
+ coordList.add(new Coordinate(pathPt[0], pathPt[1]));
+ pathIt.next();
+ }
+ break;
+ case PathIterator.SEG_LINETO:
+ coordList.add(new Coordinate(pathPt[0], pathPt[1]));
+ pathIt.next();
+ break;
+ case PathIterator.SEG_CLOSE:
+ coordList.closeRing();
+ pathIt.next();
+ isDone = true;
+ break;
+ default:
+ throw new IllegalArgumentException("unhandled (non-linear) segment type encountered");
+ }
+ if (isDone)
+ break;
+ }
+ return coordList.toCoordinateArray();
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/ShapeWriter.java b/modules/core/src/main/java/org/locationtech/jts/awt/ShapeWriter.java
new file mode 100644
index 0000000..e415f08
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/ShapeWriter.java
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.awt;
+
+import java.awt.Shape;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+
+
+/**
+ * Writes {@link Geometry}s into Java2D {@link Shape} objects
+ * of the appropriate type.
+ * This supports rendering geometries using Java2D.
+ * The ShapeWriter allows supplying a {@link PointTransformation}
+ * class, to transform coordinates from model space into view space.
+ * This is useful if a client is providing its own transformation
+ * logic, rather than relying on Java2D <tt>AffineTransform</tt>s.
+ * <p>
+ * The writer supports removing duplicate consecutive points
+ * (via the {@link #setRemoveDuplicatePoints(boolean)} method)
+ * as well as true <b>decimation</b>
+ * (via the {@link #setDecimation(double)} method.
+ * Enabling one of these strategies can substantially improve
+ * rendering speed for large geometries.
+ * It is only necessary to enable one strategy.
+ * Using decimation is preferred, but this requires
+ * determining a distance below which input geometry vertices
+ * can be considered unique (which may not always be feasible).
+ * If neither strategy is enabled, all vertices
+ * of the input <tt>Geometry</tt>
+ * will be represented in the output <tt>Shape</tt>.
+ * <p>
+ *
+ */
+public class ShapeWriter
+{
+ /**
+ * The point transformation used by default.
+ */
+ public static final PointTransformation DEFAULT_POINT_TRANSFORMATION = new IdentityPointTransformation();
+
+ /**
+ * The point shape factory used by default.
+ */
+ public static final PointShapeFactory DEFAULT_POINT_FACTORY = new PointShapeFactory.Square(3.0);
+
+ private PointTransformation pointTransformer = DEFAULT_POINT_TRANSFORMATION;
+ private PointShapeFactory pointFactory = DEFAULT_POINT_FACTORY;
+
+ /**
+ * Cache a Point2D object to use to transfer coordinates into shape
+ */
+ private Point2D transPoint = new Point2D.Double();
+
+ /**
+ * If true, decimation will be used to reduce the number of vertices
+ * by removing consecutive duplicates.
+ *
+ */
+ private boolean doRemoveDuplicatePoints = false;
+
+ private double decimationDistance = 0;
+
+ /**
+ * Creates a new ShapeWriter with a specified point transformation
+ * and point shape factory.
+ *
+ * @param pointTransformer a transformation from model to view space to use
+ * @param pointFactory the PointShapeFactory to use
+ */
+ public ShapeWriter(PointTransformation pointTransformer, PointShapeFactory pointFactory)
+ {
+ if (pointTransformer != null)
+ this.pointTransformer = pointTransformer;
+ if (pointFactory != null)
+ this.pointFactory = pointFactory;
+ }
+
+ /**
+ * Creates a new ShapeWriter with a specified point transformation
+ * and the default point shape factory.
+ *
+ * @param pointTransformer a transformation from model to view space to use
+ */
+ public ShapeWriter(PointTransformation pointTransformer)
+ {
+ this(pointTransformer, null);
+ }
+
+ /**
+ * Creates a new ShapeWriter with the default (identity) point transformation.
+ *
+ */
+ public ShapeWriter() {
+ }
+
+ /**
+ * Sets whether duplicate consecutive points should be eliminated.
+ * This can reduce the size of the generated Shapes
+ * and improve rendering speed, especially in situations
+ * where a transform reduces the extent of the geometry.
+ * <p>
+ * The default is <tt>false</tt>.
+ *
+ * @param doDecimation whether decimation is to be used
+ */
+ public void setRemoveDuplicatePoints(boolean doRemoveDuplicatePoints)
+ {
+ this.doRemoveDuplicatePoints = doRemoveDuplicatePoints;
+ }
+
+ /**
+ * Sets the decimation distance used to determine
+ * whether vertices of the input geometry are
+ * considered to be duplicate and thus removed.
+ * The distance is axis distance, not Euclidean distance.
+ * The distance is specified in the input geometry coordinate system
+ * (NOT the transformed output coordinate system).
+ * <p>
+ * When rendering to a screen image, a suitably small distance should be used
+ * to avoid obvious rendering defects.
+ * A distance equivalent to the equivalent of 1.5 pixels or less is recommended
+ * (and perhaps even smaller to avoid any chance of visible artifacts).
+ * <p>
+ * The default distance is 0.0, which disables decimation.
+ *
+ * @param decimationDistance the distance below which vertices are considered to be duplicates
+ */
+ public void setDecimation(double decimationDistance)
+ {
+ this.decimationDistance = decimationDistance;
+ }
+
+ /**
+ * Creates a {@link Shape} representing a {@link Geometry},
+ * according to the specified PointTransformation
+ * and PointShapeFactory (if relevant).
+ * <p>
+ * Note that Shapes do not
+ * preserve information about which elements in heterogeneous collections
+ * are 1D and which are 2D.
+ * For example, a GeometryCollection containing a ring and a
+ * disk will render as two disks if Graphics.fill is used,
+ * or as two rings if Graphics.draw is used.
+ * To avoid this issue use separate shapes for the components.
+ *
+ * @param geometry the geometry to convert
+ * @return a Shape representing the geometry
+ */
+ public Shape toShape(Geometry geometry)
+ {
+ if (geometry.isEmpty()) return new GeneralPath();
+ if (geometry instanceof Polygon) return toShape((Polygon) geometry);
+ if (geometry instanceof LineString) return toShape((LineString) geometry);
+ if (geometry instanceof MultiLineString) return toShape((MultiLineString) geometry);
+ if (geometry instanceof Point) return toShape((Point) geometry);
+ if (geometry instanceof GeometryCollection) return toShape((GeometryCollection) geometry);
+
+ throw new IllegalArgumentException(
+ "Unrecognized Geometry class: " + geometry.getClass());
+ }
+
+ private Shape toShape(Polygon p)
+ {
+ PolygonShape poly = new PolygonShape();
+
+ appendRing(poly, p.getExteriorRing().getCoordinates());
+ for (int j = 0; j < p.getNumInteriorRing(); j++) {
+ appendRing(poly, p.getInteriorRingN(j).getCoordinates());
+ }
+
+ return poly;
+ }
+
+ private void appendRing(PolygonShape poly, Coordinate[] coords)
+ {
+ double prevx = Double.NaN;
+ double prevy = Double.NaN;
+ Coordinate prev = null;
+
+ int n = coords.length - 1;
+ /**
+ * Don't include closing point.
+ * Ring path will be closed explicitly, which provides a
+ * more accurate path representation.
+ */
+ for (int i = 0; i < n; i++) {
+
+ if (decimationDistance > 0.0) {
+ boolean isDecimated = prev != null
+ && Math.abs(coords[i].x - prev.x) < decimationDistance
+ && Math.abs(coords[i].y - prev.y) < decimationDistance;
+ if (i < n && isDecimated)
+ continue;
+ prev = coords[i];
+ }
+
+ transformPoint(coords[i], transPoint);
+
+ if (doRemoveDuplicatePoints) {
+ // skip duplicate points (except the last point)
+ boolean isDup = transPoint.getX() == prevx && transPoint.getY() == prevy;
+ if (i < n && isDup)
+ continue;
+ prevx = transPoint.getX();
+ prevy = transPoint.getY();
+ }
+ poly.addToRing(transPoint);
+ }
+ // handle closing point
+ poly.endRing();
+ }
+
+ private Shape toShape(GeometryCollection gc)
+ {
+ GeometryCollectionShape shape = new GeometryCollectionShape();
+ // add components to GC shape
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = (Geometry) gc.getGeometryN(i);
+ shape.add(toShape(g));
+ }
+ return shape;
+ }
+
+ private GeneralPath toShape(MultiLineString mls)
+ {
+ GeneralPath path = new GeneralPath();
+
+ for (int i = 0; i < mls.getNumGeometries(); i++) {
+ LineString lineString = (LineString) mls.getGeometryN(i);
+ path.append(toShape(lineString), false);
+ }
+ return path;
+ }
+
+ private GeneralPath toShape(LineString lineString)
+ {
+ GeneralPath shape = new GeneralPath();
+
+ Coordinate prev = lineString.getCoordinateN(0);
+ transformPoint(prev, transPoint);
+ shape.moveTo((float) transPoint.getX(), (float) transPoint.getY());
+
+ double prevx = transPoint.getX();
+ double prevy = transPoint.getY();
+
+ int n = lineString.getNumPoints() - 1;
+ //int count = 0;
+ for (int i = 1; i <= n; i++) {
+ Coordinate currentCoord = lineString.getCoordinateN(i);
+ if (decimationDistance > 0.0) {
+ boolean isDecimated = prev != null
+ && Math.abs(currentCoord.x - prev.x) < decimationDistance
+ && Math.abs(currentCoord.y - prev.y) < decimationDistance;
+ if (i < n && isDecimated) {
+ continue;
+ }
+ prev = currentCoord;
+ }
+
+ transformPoint(currentCoord, transPoint);
+
+ if (doRemoveDuplicatePoints) {
+ // skip duplicate points (except the last point)
+ boolean isDup = transPoint.getX() == prevx && transPoint.getY() == prevy;
+ if (i < n && isDup)
+ continue;
+ prevx = transPoint.getX();
+ prevy = transPoint.getY();
+ //count++;
+ }
+ shape.lineTo((float) transPoint.getX(), (float) transPoint.getY());
+ }
+ //System.out.println(count);
+ return shape;
+ }
+
+ private Shape toShape(Point point)
+ {
+ Point2D viewPoint = transformPoint(point.getCoordinate());
+ return pointFactory.createPoint(viewPoint);
+ }
+
+ private Point2D transformPoint(Coordinate model) {
+ return transformPoint(model, new Point2D.Double());
+ }
+
+ private Point2D transformPoint(Coordinate model, Point2D view) {
+ pointTransformer.transform(model, view);
+ return view;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/package.html b/modules/core/src/main/java/org/locationtech/jts/awt/package.html
new file mode 100644
index 0000000..d3b657a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/awt/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to perform conversions from Java2D shape objects.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/densify/Densifier.java b/modules/core/src/main/java/org/locationtech/jts/densify/Densifier.java
new file mode 100644
index 0000000..24beb29
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/densify/Densifier.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.densify;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.GeometryTransformer;
+
+/**
+ * Densifies a {@link Geometry} by inserting extra vertices along the line segments
+ * contained in the geometry.
+ * All segments in the created densified geometry will be no longer than
+ * than the given distance tolerance.
+ * Densified polygonal geometries are guaranteed to be topologically correct.
+ * The coordinates created during densification respect the input geometry's
+ * {@link PrecisionModel}.
+ * <p>
+ * <b>Note:</b> At some future point this class will
+ * offer a variety of densification strategies.
+ *
+ * @author Martin Davis
+ */
+public class Densifier {
+ /**
+ * Densifies a geometry using a given distance tolerance,
+ * and respecting the input geometry's {@link PrecisionModel}.
+ *
+ * @param geom the geometry to densify
+ * @param distanceTolerance the distance tolerance to densify
+ * @return the densified geometry
+ */
+ public static Geometry densify(Geometry geom, double distanceTolerance) {
+ Densifier densifier = new Densifier(geom);
+ densifier.setDistanceTolerance(distanceTolerance);
+ return densifier.getResultGeometry();
+ }
+
+ /**
+ * Densifies a coordinate sequence.
+ *
+ * @param pts
+ * @param distanceTolerance
+ * @return the densified coordinate sequence
+ */
+ private static Coordinate[] densifyPoints(Coordinate[] pts,
+ double distanceTolerance, PrecisionModel precModel) {
+ LineSegment seg = new LineSegment();
+ CoordinateList coordList = new CoordinateList();
+ for (int i = 0; i < pts.length - 1; i++) {
+ seg.p0 = pts[i];
+ seg.p1 = pts[i + 1];
+ coordList.add(seg.p0, false);
+ double len = seg.getLength();
+ int densifiedSegCount = (int) (len / distanceTolerance) + 1;
+ if (densifiedSegCount > 1) {
+ double densifiedSegLen = len / densifiedSegCount;
+ for (int j = 1; j < densifiedSegCount; j++) {
+ double segFract = (j * densifiedSegLen) / len;
+ Coordinate p = seg.pointAlong(segFract);
+ precModel.makePrecise(p);
+ coordList.add(p, false);
+ }
+ }
+ }
+ coordList.add(pts[pts.length - 1], false);
+ return coordList.toCoordinateArray();
+ }
+
+ private Geometry inputGeom;
+
+ private double distanceTolerance;
+
+ /**
+ * Creates a new densifier instance.
+ *
+ * @param inputGeom
+ */
+ public Densifier(Geometry inputGeom) {
+ this.inputGeom = inputGeom;
+ }
+
+ /**
+ * Sets the distance tolerance for the densification. All line segments
+ * in the densified geometry will be no longer than the distance tolerance.
+ * simplified geometry will be within this distance of the original geometry.
+ * The distance tolerance must be positive.
+ *
+ * @param distanceTolerance
+ * the densification tolerance to use
+ */
+ public void setDistanceTolerance(double distanceTolerance) {
+ if (distanceTolerance <= 0.0)
+ throw new IllegalArgumentException("Tolerance must be positive");
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ /**
+ * Gets the densified geometry.
+ *
+ * @return the densified geometry
+ */
+ public Geometry getResultGeometry() {
+ return (new DensifyTransformer(distanceTolerance)).transform(inputGeom);
+ }
+
+ static class DensifyTransformer extends GeometryTransformer {
+ double distanceTolerance;
+
+ DensifyTransformer(double distanceTolerance) {
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ protected CoordinateSequence transformCoordinates(
+ CoordinateSequence coords, Geometry parent) {
+ Coordinate[] inputPts = coords.toCoordinateArray();
+ Coordinate[] newPts = Densifier
+ .densifyPoints(inputPts, distanceTolerance, parent.getPrecisionModel());
+ // prevent creation of invalid linestrings
+ if (parent instanceof LineString && newPts.length == 1) {
+ newPts = new Coordinate[0];
+ }
+ return factory.getCoordinateSequenceFactory().create(newPts);
+ }
+
+ protected Geometry transformPolygon(Polygon geom, Geometry parent) {
+ Geometry roughGeom = super.transformPolygon(geom, parent);
+ // don't try and correct if the parent is going to do this
+ if (parent instanceof MultiPolygon) {
+ return roughGeom;
+ }
+ return createValidArea(roughGeom);
+ }
+
+ protected Geometry transformMultiPolygon(MultiPolygon geom, Geometry parent) {
+ Geometry roughGeom = super.transformMultiPolygon(geom, parent);
+ return createValidArea(roughGeom);
+ }
+
+ /**
+ * Creates a valid area geometry from one that possibly has bad topology
+ * (i.e. self-intersections). Since buffer can handle invalid topology, but
+ * always returns valid geometry, constructing a 0-width buffer "corrects"
+ * the topology. Note this only works for area geometries, since buffer
+ * always returns areas. This also may return empty geometries, if the input
+ * has no actual area.
+ *
+ * @param roughAreaGeom
+ * an area geometry possibly containing self-intersections
+ * @return a valid area geometry
+ */
+ private Geometry createValidArea(Geometry roughAreaGeom) {
+ return roughAreaGeom.buffer(0.0);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/densify/package.html b/modules/core/src/main/java/org/locationtech/jts/densify/package.html
new file mode 100644
index 0000000..348dbc0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/densify/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to perform densification on geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/dissolve/DissolveEdgeGraph.java b/modules/core/src/main/java/org/locationtech/jts/dissolve/DissolveEdgeGraph.java
new file mode 100644
index 0000000..bf9f9ea
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/dissolve/DissolveEdgeGraph.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.dissolve;
+
+import org.locationtech.jts.edgegraph.EdgeGraph;
+import org.locationtech.jts.edgegraph.HalfEdge;
+import org.locationtech.jts.geom.Coordinate;
+
+
+/**
+ * A graph containing {@link DissolveHalfEdge}s.
+ *
+ * @author Martin Davis
+ *
+ */
+class DissolveEdgeGraph extends EdgeGraph
+{
+ protected HalfEdge createEdge(Coordinate p0)
+ {
+ return new DissolveHalfEdge(p0);
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/dissolve/DissolveHalfEdge.java b/modules/core/src/main/java/org/locationtech/jts/dissolve/DissolveHalfEdge.java
new file mode 100644
index 0000000..86d9e12
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/dissolve/DissolveHalfEdge.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.dissolve;
+
+import org.locationtech.jts.edgegraph.MarkHalfEdge;
+import org.locationtech.jts.geom.Coordinate;
+
+
+/**
+ * A HalfEdge which carries information
+ * required to support {@link LineDissolver}.
+ *
+ * @author Martin Davis
+ *
+ */
+class DissolveHalfEdge extends MarkHalfEdge
+{
+ private boolean isStart = false;
+
+ public DissolveHalfEdge(Coordinate orig) {
+ super(orig);
+ }
+
+ /**
+ * Tests whether this edge is the starting segment
+ * in a LineString being dissolved.
+ *
+ * @return true if this edge is a start segment
+ */
+ public boolean isStart()
+ {
+ return isStart;
+ }
+
+ /**
+ * Sets this edge to be the start segment of an input LineString.
+ */
+ public void setStart()
+ {
+ isStart = true;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/dissolve/LineDissolver.java b/modules/core/src/main/java/org/locationtech/jts/dissolve/LineDissolver.java
new file mode 100644
index 0000000..e52112f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/dissolve/LineDissolver.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.dissolve;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+
+import org.locationtech.jts.edgegraph.HalfEdge;
+import org.locationtech.jts.edgegraph.MarkHalfEdge;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+
+
+
+/**
+ * Dissolves the linear components
+ * from a collection of {@link Geometry}s
+ * into a set of maximal-length {@link Linestring}s
+ * in which every unique segment appears once only.
+ * The output linestrings run between node vertices
+ * of the input, which are vertices which have
+ * either degree 1, or degree 3 or greater.
+ * <p>
+ * Use cases for dissolving linear components
+ * include generalization
+ * (in particular, simplifying polygonal coverages),
+ * and visualization
+ * (in particular, avoiding symbology conflicts when
+ * depicting shared polygon boundaries).
+ * <p>
+ * This class does <b>not</b> node the input lines.
+ * If there are line segments crossing in the input,
+ * they will still cross in the output.
+ *
+ * @author Martin Davis
+ *
+ */
+public class LineDissolver
+{
+ /**
+ * Dissolves the linear components in a geometry.
+ *
+ * @param g the geometry to dissolve
+ * @return the dissolved lines
+ */
+ public static Geometry dissolve(Geometry g)
+ {
+ LineDissolver d = new LineDissolver();
+ d.add(g);
+ return d.getResult();
+ }
+
+ private Geometry result;
+ private GeometryFactory factory;
+ private DissolveEdgeGraph graph;
+ private List lines = new ArrayList();
+
+ public LineDissolver()
+ {
+ graph = new DissolveEdgeGraph();
+ }
+
+ /**
+ * Adds a {@link Geometry} to be dissolved.
+ * Any number of geometries may be added by calling this method multiple times.
+ * Any type of Geometry may be added. The constituent linework will be
+ * extracted to be dissolved.
+ *
+ * @param geometry geometry to be line-merged
+ */
+ public void add(Geometry geometry) {
+ geometry.apply(new GeometryComponentFilter() {
+ public void filter(Geometry component) {
+ if (component instanceof LineString) {
+ add((LineString)component);
+ }
+ }
+ });
+ }
+ /**
+ * Adds a collection of Geometries to be processed. May be called multiple times.
+ * Any dimension of Geometry may be added; the constituent linework will be
+ * extracted.
+ *
+ * @param geometries the geometries to be line-merged
+ */
+ public void add(Collection geometries)
+ {
+ for (Iterator i = geometries.iterator(); i.hasNext(); ) {
+ Geometry geometry = (Geometry) i.next();
+ add(geometry);
+ }
+ }
+
+ private void add(LineString lineString) {
+ if (factory == null) {
+ this.factory = lineString.getFactory();
+ }
+ CoordinateSequence seq = lineString.getCoordinateSequence();
+ boolean doneStart = false;
+ for (int i = 1; i < seq.size(); i++) {
+ DissolveHalfEdge e = (DissolveHalfEdge) graph.addEdge(seq.getCoordinate(i-1), seq.getCoordinate(i));
+ // skip zero-length edges
+ if (e == null) continue;
+ /**
+ * Record source initial segments, so that they can be reflected in output when needed
+ * (i.e. during formation of isolated rings)
+ */
+ if (! doneStart) {
+ e.setStart();
+ doneStart = true;
+ }
+ }
+ }
+
+ /**
+ * Gets the dissolved result as a MultiLineString.
+ *
+ * @return the dissolved lines
+ */
+ public Geometry getResult()
+ {
+ if (result == null)
+ computeResult();
+ return result;
+ }
+
+ private void computeResult() {
+ Collection edges = graph.getVertexEdges();
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ HalfEdge e = (HalfEdge) i.next();
+ if (MarkHalfEdge.isMarked(e)) continue;
+ process(e);
+ }
+ result = factory.buildGeometry(lines);
+ }
+
+ private Stack nodeEdgeStack = new Stack();
+
+ private void process(HalfEdge e) {
+ HalfEdge eNode = e.prevNode();
+ // if edge is in a ring, just process this edge
+ if (eNode == null)
+ eNode = e;
+ stackEdges(eNode);
+ // extract lines from node edges in stack
+ buildLines();
+ }
+
+ /**
+ * For each edge in stack
+ * (which must originate at a node)
+ * extracts the line it initiates.
+ */
+ private void buildLines() {
+ while (! nodeEdgeStack.empty()) {
+ HalfEdge e = (HalfEdge) nodeEdgeStack.pop();
+ if (MarkHalfEdge.isMarked(e))
+ continue;
+ buildLine(e);
+ }
+ }
+
+ private DissolveHalfEdge ringStartEdge;
+
+ /**
+ * Updates the tracked ringStartEdge
+ * if the given edge has a lower origin
+ * (using the standard {@link Coordinate} ordering).
+ *
+ * Identifying the lowest starting node meets two goals:
+ * <ul>
+ * <li>It ensures that isolated input rings are created using the original node and orientation
+ * <li>For isolated rings formed from multiple input linestrings,
+ * it provides a canonical node and orientation for the output
+ * (rather than essentially random, and thus hard to test).
+ * </ul>
+ *
+ * @param e
+ */
+ private void updateRingStartEdge(DissolveHalfEdge e)
+ {
+ if (! e.isStart()) {
+ e = (DissolveHalfEdge) e.sym();
+ if (! e.isStart()) return;
+ }
+ // here e is known to be a start edge
+ if (ringStartEdge == null) {
+ ringStartEdge = e;
+ return;
+ }
+ if (e.orig().compareTo(ringStartEdge.orig()) < 0) {
+ ringStartEdge = e;
+ }
+ }
+
+ /**
+ * Builds a line starting from the given edge.
+ * The start edge origin is a node (valence = 1 or >= 3),
+ * unless it is part of a pure ring.
+ * A pure ring has no other incident lines.
+ * In this case the start edge may occur anywhere on the ring.
+ *
+ * The line is built up to the next node encountered,
+ * or until the start edge is re-encountered
+ * (which happens if the edges form a ring).
+ *
+ * @param eStart
+ */
+ private void buildLine(HalfEdge eStart) {
+ CoordinateList line = new CoordinateList();
+ DissolveHalfEdge e = (DissolveHalfEdge) eStart;
+ ringStartEdge = null;
+
+ MarkHalfEdge.markBoth(e);
+ line.add(e.orig().copy(), false);
+ // scan along the path until a node is found (if one exists)
+ while (e.sym().degree() == 2) {
+ updateRingStartEdge(e);
+ DissolveHalfEdge eNext = (DissolveHalfEdge) e.next();
+ // check if edges form a ring - if so, we're done
+ if (eNext == eStart) {
+ buildRing(ringStartEdge);
+ return;
+ }
+ // add point to line, and move to next edge
+ line.add(eNext.orig().copy(), false);
+ e = eNext;
+ MarkHalfEdge.markBoth(e);
+ }
+ // add final node
+ line.add(e.dest().clone(), false);
+
+ // queue up the final node edges
+ stackEdges(e.sym());
+ // store the scanned line
+ addLine(line);
+ }
+
+ private void buildRing(HalfEdge eStartRing) {
+ CoordinateList line = new CoordinateList();
+ HalfEdge e = eStartRing;
+
+ line.add(e.orig().copy(), false);
+ // scan along the path until a node is found (if one exists)
+ while (e.sym().degree() == 2) {
+ HalfEdge eNext = e.next();
+ // check if edges form a ring - if so, we're done
+ if (eNext == eStartRing)
+ break;
+
+ // add point to line, and move to next edge
+ line.add(eNext.orig().copy(), false);
+ e = eNext;
+ }
+ // add final node
+ line.add(e.dest().copy(), false);
+
+ // store the scanned line
+ addLine(line);
+ }
+
+ private void addLine(CoordinateList line) {
+ lines.add(factory.createLineString(line.toCoordinateArray()));
+ }
+
+ /**
+ * Adds edges around this node to the stack.
+ *
+ * @param node
+ */
+ private void stackEdges(HalfEdge node) {
+ HalfEdge e = node;
+ do {
+ if (! MarkHalfEdge.isMarked(e))
+ nodeEdgeStack.add(e);
+ e = e.oNext();
+ } while (e != node);
+
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/edgegraph/EdgeGraph.java b/modules/core/src/main/java/org/locationtech/jts/edgegraph/EdgeGraph.java
new file mode 100644
index 0000000..abc2cb5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/edgegraph/EdgeGraph.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.edgegraph;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.locationtech.jts.geom.Coordinate;
+
+
+/**
+ * A graph comprised of {@link HalfEdge}s.
+ * It supports tracking the vertices in the graph
+ * via edges incident on them,
+ * to allow efficient lookup of edges and vertices.
+ * <p>
+ * This class may be subclassed to use a
+ * different subclass of HalfEdge,
+ * by overriding {@link #createEdge(Coordinate)}.
+ * If additional logic is required to initialize
+ * edges then {@link EdgeGraph#addEdge(Coordinate, Coordinate)}
+ * can be overridden as well.
+ *
+ * @author Martin Davis
+ *
+ */
+public class EdgeGraph
+{
+ private Map vertexMap = new HashMap();
+
+ public EdgeGraph() {
+ }
+
+ /**
+ * Creates a single HalfEdge.
+ * Override to use a different HalfEdge subclass.
+ *
+ * @param orig the origin location
+ * @return a new HalfEdge with the given origin
+ */
+ protected HalfEdge createEdge(Coordinate orig)
+ {
+ return new HalfEdge(orig);
+ }
+
+ private HalfEdge create(Coordinate p0, Coordinate p1)
+ {
+ HalfEdge e0 = createEdge(p0);
+ HalfEdge e1 = createEdge(p1);
+ HalfEdge.init(e0, e1);
+ return e0;
+ }
+
+ /**
+ * Adds an edge between the coordinates orig and dest
+ * to this graph.
+ * Only valid edges can be added (in particular, zero-length segments cannot be added)
+ *
+ * @param orig the edge origin location
+ * @param dest the edge destination location.
+ * @return the created edge
+ * @return null if the edge was invalid and not added
+ *
+ * @see #isValidEdge(Coordinate, Coordinate)
+ */
+ public HalfEdge addEdge(Coordinate orig, Coordinate dest) {
+ if (! isValidEdge(orig, dest)) return null;
+
+ /**
+ * Attempt to find the edge already in the graph.
+ * Return it if found.
+ * Otherwise, use a found edge with same origin (if any) to construct new edge.
+ */
+ HalfEdge eAdj = (HalfEdge) vertexMap.get(orig);
+ HalfEdge eSame = null;
+ if (eAdj != null) {
+ eSame = eAdj.find(dest);
+ }
+ if (eSame != null) {
+ return eSame;
+ }
+
+ HalfEdge e = insert(orig, dest, eAdj);
+ return e;
+ }
+
+ /**
+ * Tests if the given coordinates form a valid edge (with non-zero length).
+ *
+ * @param orig the start coordinate
+ * @param dest the end coordinate
+ * @return true if the edge formed is valid
+ */
+ public static boolean isValidEdge(Coordinate orig, Coordinate dest) {
+ int cmp = dest.compareTo(orig);
+ return cmp != 0;
+ }
+
+ /**
+ * Inserts an edge not already present into the graph.
+ *
+ * @param orig the edge origin location
+ * @param dest the edge destination location
+ * @param eAdj an existing edge with same orig (if any)
+ * @return the created edge
+ */
+ private HalfEdge insert(Coordinate orig, Coordinate dest, HalfEdge eAdj) {
+ // edge does not exist, so create it and insert in graph
+ HalfEdge e = create(orig, dest);
+ if (eAdj != null) {
+ eAdj.insert(e);
+ }
+ else {
+ // add halfedges to to map
+ vertexMap.put(orig, e);
+ }
+
+ HalfEdge eAdjDest = (HalfEdge) vertexMap.get(dest);
+ if (eAdjDest != null) {
+ eAdjDest.insert(e.sym());
+ }
+ else {
+ vertexMap.put(dest, e.sym());
+ }
+ return e;
+ }
+
+ public Collection getVertexEdges()
+ {
+ return vertexMap.values();
+ }
+
+ /**
+ * Finds an edge in this graph with the given origin
+ * and destination, if one exists.
+ *
+ * @param orig the origin location
+ * @param dest the destination location.
+ * @return an edge with the given orig and dest, or null if none exists
+ */
+ public HalfEdge findEdge(Coordinate orig, Coordinate dest) {
+ HalfEdge e = (HalfEdge) vertexMap.get(orig);
+ if (e == null) return null;
+ return e.find(dest);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/edgegraph/EdgeGraphBuilder.java b/modules/core/src/main/java/org/locationtech/jts/edgegraph/EdgeGraphBuilder.java
new file mode 100644
index 0000000..9558504
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/edgegraph/EdgeGraphBuilder.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.edgegraph;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.LineString;
+
+
+/**
+ * Builds an edge graph from geometries containing edges.
+ *
+ * @author mdavis
+ *
+ */
+public class EdgeGraphBuilder
+{
+ public static EdgeGraph build(Collection geoms) {
+ EdgeGraphBuilder builder = new EdgeGraphBuilder();
+ builder.add(geoms);
+ return builder.getGraph();
+ }
+
+ private EdgeGraph graph = new EdgeGraph();
+
+ public EdgeGraphBuilder()
+ {
+
+ }
+
+ public EdgeGraph getGraph()
+ {
+ return graph;
+ }
+
+ /**
+ * Adds the edges of a Geometry to the graph.
+ * May be called multiple times.
+ * Any dimension of Geometry may be added; the constituent edges are
+ * extracted.
+ *
+ * @param geometry geometry to be added
+ */
+ public void add(Geometry geometry) {
+ geometry.apply(new GeometryComponentFilter() {
+ public void filter(Geometry component) {
+ if (component instanceof LineString) {
+ add((LineString)component);
+ }
+ }
+ });
+ }
+ /**
+ * Adds the edges in a collection of {@link Geometry}s to the graph.
+ * May be called multiple times.
+ * Any dimension of Geometry may be added.
+ *
+ * @param geometries the geometries to be added
+ */
+ public void add(Collection geometries)
+ {
+ for (Iterator i = geometries.iterator(); i.hasNext(); ) {
+ Geometry geometry = (Geometry) i.next();
+ add(geometry);
+ }
+ }
+
+ private void add(LineString lineString) {
+ CoordinateSequence seq = lineString.getCoordinateSequence();
+ for (int i = 1; i < seq.size(); i++) {
+ graph.addEdge(seq.getCoordinate(i-1), seq.getCoordinate(i));
+ }
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/edgegraph/HalfEdge.java b/modules/core/src/main/java/org/locationtech/jts/edgegraph/HalfEdge.java
new file mode 100644
index 0000000..1c5d425
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/edgegraph/HalfEdge.java
@@ -0,0 +1,363 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.edgegraph;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Quadrant;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Represents a directed component of an edge in an {@link EdgeGraph}.
+ * HalfEdges link vertices whose locations are defined by {@link Coordinate}s.
+ * HalfEdges start at an <b>origin</b> vertex,
+ * and terminate at a <b>destination</b> vertex.
+ * HalfEdges always occur in symmetric pairs, with the {@link #sym()} method
+ * giving access to the oppositely-oriented component.
+ * HalfEdges and the methods on them form an edge algebra,
+ * which can be used to traverse and query the topology
+ * of the graph formed by the edges.
+ * <p>
+ * By design HalfEdges carry minimal information
+ * about the actual usage of the graph they represent.
+ * They can be subclassed to carry more information if required.
+ * <p>
+ * HalfEdges form a complete and consistent data structure by themselves,
+ * but an {@link EdgeGraph} is useful to allow retrieving edges
+ * by vertex and edge location, as well as ensuring
+ * edges are created and linked appropriately.
+ *
+ * @author Martin Davis
+ *
+ */
+public class HalfEdge {
+
+ /**
+ * Creates a HalfEdge pair representing an edge
+ * between two vertices located at coordinates p0 and p1.
+ *
+ * @param p0 a vertex coordinate
+ * @param p1 a vertex coordinate
+ * @return the HalfEdge with origin at p0
+ */
+ public static HalfEdge create(Coordinate p0, Coordinate p1) {
+ HalfEdge e0 = new HalfEdge(p0);
+ HalfEdge e1 = new HalfEdge(p1);
+ e0.init(e1);
+ return e0;
+ }
+
+ /**
+ * Initialize a symmetric pair of halfedges.
+ * Intended for use by {@link EdgeGraph} subclasses.
+ * The edges are initialized to have each other
+ * as the {@link sym} edge, and to have {@link next} pointers
+ * which point to edge other.
+ * This effectively creates a graph containing a single edge.
+ *
+ * @param e0 a halfedge
+ * @param e1 a symmetric halfedge
+ * @return the initialized edge e0
+ */
+ public static HalfEdge init(HalfEdge e0, HalfEdge e1)
+ {
+ // ensure only newly created edges can be initialized, to prevent information loss
+ if (e0.sym != null || e1.sym != null
+ || e0.next != null || e1.next != null)
+ throw new IllegalStateException("Edges are already initialized");
+ e0.init(e1);
+ return e0;
+ }
+
+ private Coordinate orig;
+ private HalfEdge sym;
+ private HalfEdge next;
+
+ /**
+ * Creates an edge originating from a given coordinate.
+ *
+ * @param orig the origin coordinate
+ */
+ public HalfEdge(Coordinate orig) {
+ this.orig = orig;
+ }
+
+ protected void init(HalfEdge e)
+ {
+ setSym(e);
+ e.setSym(this);
+ // set next ptrs for a single segment
+ setNext(e);
+ e.setNext(this);
+ }
+
+ /**
+ * Gets the origin coordinate of this edge.
+ *
+ * @return the origin coordinate
+ */
+ public Coordinate orig() { return orig; }
+
+ /**
+ * Gets the destination coordinate of this edge.
+ *
+ * @return the destination coordinate
+ */
+ public Coordinate dest() { return sym.orig; }
+
+ /**
+ * Gets the symmetric pair edge of this edge.
+ *
+ * @return the symmetric pair edge
+ */
+ public HalfEdge sym()
+ {
+ return sym;
+ }
+
+ /**
+ * Sets the sym edge.
+ *
+ * @param e the sym edge to set
+ */
+ private void setSym(HalfEdge e) {
+ sym = e;
+ }
+
+ /**
+ * Gets the next edge CCW around the
+ * destination vertex of this edge.
+ * If the vertex has degree 1 then this is the <b>sym</b> edge.
+ *
+ * @return the next edge
+ */
+ public HalfEdge next()
+ {
+ return next;
+ }
+
+ /**
+ * Returns the edge previous to this one
+ * (with dest being the same as this orig).
+ *
+ * @return the previous edge to this one
+ */
+ public HalfEdge prev() {
+ return sym.next().sym;
+ }
+
+ public void setNext(HalfEdge e)
+ {
+ next = e;
+ }
+
+ public HalfEdge oNext() {
+ return sym.next;
+ }
+
+ /**
+ * Finds the edge starting at the origin of this edge
+ * with the given dest vertex,
+ * if any.
+ *
+ * @param dest the dest vertex to search for
+ * @return the edge with the required dest vertex, if it exists,
+ * or null
+ */
+ public HalfEdge find(Coordinate dest) {
+ HalfEdge oNext = this;
+ do {
+ if (oNext == null) return null;
+ if (oNext.dest().equals2D(dest))
+ return oNext;
+ oNext = oNext.oNext();
+ } while (oNext != this);
+ return null;
+ }
+
+ /**
+ * Tests whether this edge has the given orig and dest vertices.
+ *
+ * @param p0 the origin vertex to test
+ * @param p1 the destination vertex to test
+ * @return true if the vertices are equal to the ones of this edge
+ */
+ public boolean equals(Coordinate p0, Coordinate p1) {
+ return orig.equals2D(p0) && sym.orig.equals(p1);
+ }
+
+ /**
+ * Inserts an edge
+ * into the ring of edges around the origin vertex of this edge.
+ * The inserted edge must have the same origin as this edge.
+ *
+ * @param e the edge to insert
+ */
+ public void insert(HalfEdge e) {
+ // if no other edge around origin
+ if (oNext() == this) {
+ // set linkage so ring is correct
+ insertAfter(e);
+ return;
+ }
+
+ // otherwise, find edge to insert after
+ int ecmp = compareTo(e);
+ HalfEdge ePrev = this;
+ do {
+ HalfEdge oNext = ePrev.oNext();
+ int cmp = oNext.compareTo(e);
+ if (cmp != ecmp || oNext == this) {
+ ePrev.insertAfter(e);
+ return;
+ }
+ ePrev = oNext;
+ } while (ePrev != this);
+ Assert.shouldNeverReachHere();
+ }
+
+ /**
+ * Insert an edge with the same origin after this one.
+ * Assumes that the inserted edge is in the correct
+ * position around the ring.
+ *
+ * @param e the edge to insert (with same origin)
+ */
+ private void insertAfter(HalfEdge e) {
+ Assert.equals(orig, e.orig());
+ HalfEdge save = oNext();
+ sym.setNext(e);
+ e.sym().setNext(save);
+ }
+
+ /**
+ * Compares edges which originate at the same vertex
+ * based on the angle they make at their origin vertex with the positive X-axis.
+ * This allows sorting edges around their origin vertex in CCW order.
+ */
+ public int compareTo(Object obj)
+ {
+ HalfEdge e = (HalfEdge) obj;
+ int comp = compareAngularDirection(e);
+ return comp;
+ }
+
+ /**
+ * Implements the total order relation:
+ * <p>
+ * The angle of edge a is greater than the angle of edge b,
+ * where the angle of an edge is the angle made by
+ * the first segment of the edge with the positive x-axis
+ * <p>
+ * When applied to a list of edges originating at the same point,
+ * this produces a CCW ordering of the edges around the point.
+ * <p>
+ * Using the obvious algorithm of computing the angle is not robust,
+ * since the angle calculation is susceptible to roundoff error.
+ * A robust algorithm is:
+ * <ul>
+ * <li>First, compare the quadrants the edge vectors lie in.
+ * If the quadrants are different,
+ * it is trivial to determine which edge has a greater angle.
+ *
+ * <li>if the vectors lie in the same quadrant, the
+ * {@link Orientation#computeOrientation(Coordinate, Coordinate, Coordinate)} function
+ * can be used to determine the relative orientation of the vectors.
+ * </ul>
+ */
+ public int compareAngularDirection(HalfEdge e)
+ {
+ double dx = deltaX();
+ double dy = deltaY();
+ double dx2 = e.deltaX();
+ double dy2 = e.deltaY();
+
+ // same vector
+ if (dx == dx2 && dy == dy2)
+ return 0;
+
+ double quadrant = Quadrant.quadrant(dx, dy);
+ double quadrant2 = Quadrant.quadrant(dx2, dy2);
+
+ // if the vectors are in different quadrants, determining the ordering is trivial
+ if (quadrant > quadrant2) return 1;
+ if (quadrant < quadrant2) return -1;
+ // vectors are in the same quadrant
+ // Check relative orientation of direction vectors
+ // this is > e if it is CCW of e
+ return Orientation.index(e.orig, e.dest(), dest());
+ }
+
+ /**
+ * The X component of the distance between the orig and dest vertices.
+ *
+ * @return the X component of the edge length
+ */
+ public double deltaX() { return sym.orig.x - orig.x; }
+
+ /**
+ * The Y component of the distance between the orig and dest vertices.
+ *
+ * @return the Y component of the edge length
+ */
+ public double deltaY() { return sym.orig.y - orig.y; }
+
+ /**
+ * Computes a string representation of a HalfEdge.
+ *
+ * @return a string representation
+ */
+ public String toString()
+ {
+ return "HE("+orig.x + " " + orig.y
+ + ", "
+ + sym.orig.x + " " + sym.orig.y
+ + ")";
+ }
+
+ /**
+ * Computes the degree of the origin vertex.
+ * The degree is the number of edges
+ * originating from the vertex.
+ *
+ * @return the degree of the origin vertex
+ */
+ public int degree() {
+ int degree = 0;
+ HalfEdge e = this;
+ do {
+ degree++;
+ e = e.oNext();
+ } while (e != this);
+ return degree;
+ }
+
+ /**
+ * Finds the first node previous to this edge, if any.
+ * If no such node exists (i.e. the edge is part of a ring)
+ * then null is returned.
+ *
+ * @return an edge originating at the node prior to this edge, if any,
+ * or null if no node exists
+ */
+ public HalfEdge prevNode() {
+ HalfEdge e = this;
+ while (e.degree() == 2) {
+ e = e.prev();
+ if (e == this)
+ return null;
+ }
+ return e;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/edgegraph/MarkHalfEdge.java b/modules/core/src/main/java/org/locationtech/jts/edgegraph/MarkHalfEdge.java
new file mode 100644
index 0000000..2a7e57d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/edgegraph/MarkHalfEdge.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.edgegraph;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * A {@link HalfEdge} which supports
+ * marking edges with a boolean flag.
+ * Useful for algorithms which perform graph traversals.
+ *
+ * @author Martin Davis
+ *
+ */
+public class MarkHalfEdge extends HalfEdge
+{
+ /**
+ * Tests whether the given edge is marked.
+ *
+ * @param e the edge to test
+ * @return true if the edge is marked
+ */
+ public static boolean isMarked(HalfEdge e)
+ {
+ return ((MarkHalfEdge) e).isMarked();
+ }
+
+ /**
+ * Marks the given edge.
+ *
+ * @param e the edge to mark
+ */
+ public static void mark(HalfEdge e)
+ {
+ ((MarkHalfEdge) e).mark();
+ }
+
+ /**
+ * Sets the mark for the given edge to a boolean value.
+ *
+ * @param e the edge to set
+ * @param isMarked the mark value
+ */
+ public static void setMark(HalfEdge e, boolean isMarked)
+ {
+ ((MarkHalfEdge) e).setMark(isMarked);
+ }
+
+ /**
+ * Sets the mark for the given edge pair to a boolean value.
+ *
+ * @param e an edge of the pair to update
+ * @param isMarked the mark value to set
+ */
+ public static void setMarkBoth(HalfEdge e, boolean isMarked)
+ {
+ ((MarkHalfEdge) e).setMark(isMarked);
+ ((MarkHalfEdge) e.sym()).setMark(isMarked);
+ }
+
+ /**
+ * Marks the edges in a pair.
+ *
+ * @param e an edge of the pair to mark
+ */
+ public static void markBoth(HalfEdge e) {
+ ((MarkHalfEdge) e).mark();
+ ((MarkHalfEdge) e.sym()).mark();
+ }
+
+ private boolean isMarked = false;
+
+ /**
+ * Creates a new marked edge.
+ *
+ * @param orig the coordinate of the edge origin
+ */
+ public MarkHalfEdge(Coordinate orig) {
+ super(orig);
+ }
+
+ /**
+ * Tests whether this edge is marked.
+ *
+ * @return true if this edge is marked
+ */
+ public boolean isMarked()
+ {
+ return isMarked ;
+ }
+
+ /**
+ * Marks this edge.
+ *
+ */
+ public void mark()
+ {
+ isMarked = true;
+ }
+
+ /**
+ * Sets the value of the mark on this edge.
+ *
+ * @param isMarked the mark value to set
+ */
+ public void setMark(boolean isMarked)
+ {
+ this.isMarked = isMarked;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Coordinate.java b/modules/core/src/main/java/org/locationtech/jts/geom/Coordinate.java
new file mode 100644
index 0000000..892fe52
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Coordinate.java
@@ -0,0 +1,428 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jts.util.NumberUtil;
+
+
+/**
+ * A lightweight class used to store coordinates
+ * on the 2-dimensional Cartesian plane.
+ * It is distinct from {@link Point}, which is a subclass of {@link Geometry}.
+ * Unlike objects of type {@link Point} (which contain additional
+ * information such as an envelope, a precision model, and spatial reference
+ * system information), a <code>Coordinate</code> only contains ordinate values
+ * and accessor methods. <P>
+ *
+ * <code>Coordinate</code>s are two-dimensional points, with an additional Z-ordinate.
+ * If an Z-ordinate value is not specified or not defined,
+ * constructed coordinates have a Z-ordinate of <code>NaN</code>
+ * (which is also the value of <code>NULL_ORDINATE</code>).
+ * The standard comparison functions ignore the Z-ordinate.
+ * Apart from the basic accessor functions, JTS supports
+ * only specific operations involving the Z-ordinate.
+ *
+ *@version 1.7
+ */
+public class Coordinate implements Comparable, Cloneable, Serializable {
+ private static final long serialVersionUID = 6683108902428366910L;
+
+ /**
+ * The value used to indicate a null or missing ordinate value.
+ * In particular, used for the value of ordinates for dimensions
+ * greater than the defined dimension of a coordinate.
+ */
+ public static final double NULL_ORDINATE = Double.NaN;
+
+ /**
+ * Standard ordinate index values
+ */
+ public static final int X = 0;
+ public static final int Y = 1;
+ public static final int Z = 2;
+
+ /**
+ * The x-coordinate.
+ */
+ public double x;
+ /**
+ * The y-coordinate.
+ */
+ public double y;
+ /**
+ * The z-coordinate.
+ */
+ public double z;
+
+ /**
+ * Constructs a <code>Coordinate</code> at (x,y,z).
+ *
+ *@param x the x-value
+ *@param y the y-value
+ *@param z the z-value
+ */
+ public Coordinate(double x, double y, double z) {
+ this.x = x;
+ this.y = y;
+ this.z = z;
+ }
+
+ /**
+ * Constructs a <code>Coordinate</code> at (0,0,NaN).
+ */
+ public Coordinate() {
+ this(0.0, 0.0);
+ }
+
+ /**
+ * Constructs a <code>Coordinate</code> having the same (x,y,z) values as
+ * <code>other</code>.
+ *
+ *@param c the <code>Coordinate</code> to copy.
+ */
+ public Coordinate(Coordinate c) {
+ this(c.x, c.y, c.z);
+ }
+
+ /**
+ * Constructs a <code>Coordinate</code> at (x,y,NaN).
+ *
+ *@param x the x-value
+ *@param y the y-value
+ */
+ public Coordinate(double x, double y) {
+ this(x, y, NULL_ORDINATE);
+ }
+
+ /**
+ * Sets this <code>Coordinate</code>s (x,y,z) values to that of <code>other</code>.
+ *
+ *@param other the <code>Coordinate</code> to copy
+ */
+ public void setCoordinate(Coordinate other) {
+ x = other.x;
+ y = other.y;
+ z = other.z;
+ }
+
+ /**
+ * Gets the ordinate value for the given index.
+ * The supported values for the index are
+ * {@link X}, {@link Y}, and {@link Z}.
+ *
+ * @param ordinateIndex the ordinate index
+ * @return the value of the ordinate
+ * @throws IllegalArgumentException if the index is not valid
+ */
+ public double getOrdinate(int ordinateIndex)
+ {
+ switch (ordinateIndex) {
+ case X: return x;
+ case Y: return y;
+ case Z: return z;
+ }
+ throw new IllegalArgumentException("Invalid ordinate index: " + ordinateIndex);
+ }
+
+ /**
+ * Sets the ordinate for the given index
+ * to a given value.
+ * The supported values for the index are
+ * {@link X}, {@link Y}, and {@link Z}.
+ *
+ * @param ordinateIndex the ordinate index
+ * @param value the value to set
+ * @throws IllegalArgumentException if the index is not valid
+ */
+ public void setOrdinate(int ordinateIndex, double value)
+ {
+ switch (ordinateIndex) {
+ case X:
+ x = value;
+ break;
+ case Y:
+ y = value;
+ break;
+ case Z:
+ z = value;
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid ordinate index: " + ordinateIndex);
+ }
+ }
+
+ /**
+ * Returns whether the planar projections of the two <code>Coordinate</code>s
+ * are equal.
+ *
+ *@param other a <code>Coordinate</code> with which to do the 2D comparison.
+ *@return <code>true</code> if the x- and y-coordinates are equal; the
+ * z-coordinates do not have to be equal.
+ */
+ public boolean equals2D(Coordinate other) {
+ if (x != other.x) {
+ return false;
+ }
+ if (y != other.y) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Tests if another coordinate has the same values for the X and Y ordinates.
+ * The Z ordinate is ignored.
+ *
+ *@param c a <code>Coordinate</code> with which to do the 2D comparison.
+ *@return true if <code>other</code> is a <code>Coordinate</code>
+ * with the same values for X and Y.
+ */
+ public boolean equals2D(Coordinate c, double tolerance){
+ if (! NumberUtil.equalsWithTolerance(this.x, c.x, tolerance)) {
+ return false;
+ }
+ if (! NumberUtil.equalsWithTolerance(this.y, c.y, tolerance)) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Tests if another coordinate has the same values for the X, Y and Z ordinates.
+ *
+ *@param other a <code>Coordinate</code> with which to do the 3D comparison.
+ *@return true if <code>other</code> is a <code>Coordinate</code>
+ * with the same values for X, Y and Z.
+ */
+ public boolean equals3D(Coordinate other) {
+ return (x == other.x) && (y == other.y) &&
+ ((z == other.z) ||
+ (Double.isNaN(z) && Double.isNaN(other.z)));
+ }
+
+ /**
+ * Tests if another coordinate has the same value for Z, within a tolerance.
+ *
+ * @param c a coordinate
+ * @param tolerance the tolerance value
+ * @return true if the Z ordinates are within the given tolerance
+ */
+ public boolean equalInZ(Coordinate c, double tolerance){
+ return NumberUtil.equalsWithTolerance(this.z, c.z, tolerance);
+ }
+
+ /**
+ * Returns <code>true</code> if <code>other</code> has the same values for
+ * the x and y ordinates.
+ * Since Coordinates are 2.5D, this routine ignores the z value when making the comparison.
+ *
+ *@param other a <code>Coordinate</code> with which to do the comparison.
+ *@return <code>true</code> if <code>other</code> is a <code>Coordinate</code>
+ * with the same values for the x and y ordinates.
+ */
+ public boolean equals(Object other) {
+ if (!(other instanceof Coordinate)) {
+ return false;
+ }
+ return equals2D((Coordinate) other);
+ }
+
+ /**
+ * Compares this {@link Coordinate} with the specified {@link Coordinate} for order.
+ * This method ignores the z value when making the comparison.
+ * Returns:
+ * <UL>
+ * <LI> -1 : this.x < other.x || ((this.x == other.x) && (this.y < other.y))
+ * <LI> 0 : this.x == other.x && this.y = other.y
+ * <LI> 1 : this.x > other.x || ((this.x == other.x) && (this.y > other.y))
+ *
+ * </UL>
+ * Note: This method assumes that ordinate values
+ * are valid numbers. NaN values are not handled correctly.
+ *
+ *@param o the <code>Coordinate</code> with which this <code>Coordinate</code>
+ * is being compared
+ *@return -1, zero, or 1 as this <code>Coordinate</code>
+ * is less than, equal to, or greater than the specified <code>Coordinate</code>
+ */
+ public int compareTo(Object o) {
+ Coordinate other = (Coordinate) o;
+
+ if (x < other.x) return -1;
+ if (x > other.x) return 1;
+ if (y < other.y) return -1;
+ if (y > other.y) return 1;
+ return 0;
+ }
+
+ /**
+ * Returns a <code>String</code> of the form <I>(x,y,z)</I> .
+ *
+ *@return a <code>String</code> of the form <I>(x,y,z)</I>
+ */
+ public String toString() {
+ return "(" + x + ", " + y + ", " + z + ")";
+ }
+
+ public Object clone() {
+ try {
+ Coordinate coord = (Coordinate) super.clone();
+
+ return coord; // return the clone
+ } catch (CloneNotSupportedException e) {
+ Assert.shouldNeverReachHere(
+ "this shouldn't happen because this class is Cloneable");
+
+ return null;
+ }
+ }
+
+ public Coordinate copy() {
+ return new Coordinate(this);
+ }
+
+ /**
+ * Computes the 2-dimensional Euclidean distance to another location.
+ * The Z-ordinate is ignored.
+ *
+ * @param c a point
+ * @return the 2-dimensional Euclidean distance between the locations
+ */
+ public double distance(Coordinate c) {
+ double dx = x - c.x;
+ double dy = y - c.y;
+ return Math.sqrt(dx * dx + dy * dy);
+ }
+
+ /**
+ * Computes the 3-dimensional Euclidean distance to another location.
+ *
+ * @param c a coordinate
+ * @return the 3-dimensional Euclidean distance between the locations
+ */
+ public double distance3D(Coordinate c) {
+ double dx = x - c.x;
+ double dy = y - c.y;
+ double dz = z - c.z;
+ return Math.sqrt(dx * dx + dy * dy + dz * dz);
+ }
+
+ /**
+ * Gets a hashcode for this coordinate.
+ *
+ * @return a hashcode for this coordinate
+ */
+ public int hashCode() {
+ //Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
+ int result = 17;
+ result = 37 * result + hashCode(x);
+ result = 37 * result + hashCode(y);
+ return result;
+ }
+
+ /**
+ * Computes a hash code for a double value, using the algorithm from
+ * Joshua Bloch's book <i>Effective Java"</i>
+ *
+ * @return a hashcode for the double value
+ */
+ public static int hashCode(double x) {
+ long f = Double.doubleToLongBits(x);
+ return (int)(f^(f>>>32));
+ }
+
+
+ /**
+ * Compares two {@link Coordinate}s, allowing for either a 2-dimensional
+ * or 3-dimensional comparison, and handling NaN values correctly.
+ */
+ public static class DimensionalComparator
+ implements Comparator
+ {
+ /**
+ * Compare two <code>double</code>s, allowing for NaN values.
+ * NaN is treated as being less than any valid number.
+ *
+ * @param a a <code>double</code>
+ * @param b a <code>double</code>
+ * @return -1, 0, or 1 depending on whether a is less than, equal to or greater than b
+ */
+ public static int compare(double a, double b)
+ {
+ if (a < b) return -1;
+ if (a > b) return 1;
+
+ if (Double.isNaN(a)) {
+ if (Double.isNaN(b)) return 0;
+ return -1;
+ }
+
+ if (Double.isNaN(b)) return 1;
+ return 0;
+ }
+
+ private int dimensionsToTest = 2;
+
+ /**
+ * Creates a comparator for 2 dimensional coordinates.
+ */
+ public DimensionalComparator()
+ {
+ this(2);
+ }
+
+ /**
+ * Creates a comparator for 2 or 3 dimensional coordinates, depending
+ * on the value provided.
+ *
+ * @param dimensionsToTest the number of dimensions to test
+ */
+ public DimensionalComparator(int dimensionsToTest)
+ {
+ if (dimensionsToTest != 2 && dimensionsToTest != 3)
+ throw new IllegalArgumentException("only 2 or 3 dimensions may be specified");
+ this.dimensionsToTest = dimensionsToTest;
+ }
+
+ /**
+ * Compares two {@link Coordinate}s along to the number of
+ * dimensions specified.
+ *
+ * @param o1 a {@link Coordinate}
+ * @param o2 a {link Coordinate}
+ * @return -1, 0, or 1 depending on whether o1 is less than,
+ * equal to, or greater than 02
+ *
+ */
+ public int compare(Object o1, Object o2)
+ {
+ Coordinate c1 = (Coordinate) o1;
+ Coordinate c2 = (Coordinate) o2;
+
+ int compX = compare(c1.x, c2.x);
+ if (compX != 0) return compX;
+
+ int compY = compare(c1.y, c2.y);
+ if (compY != 0) return compY;
+
+ if (dimensionsToTest <= 2) return 0;
+
+ int compZ = compare(c1.z, c2.z);
+ return compZ;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateArrays.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateArrays.java
new file mode 100644
index 0000000..ec8c2be
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateArrays.java
@@ -0,0 +1,472 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.util.Collection;
+import java.util.Comparator;
+
+import org.locationtech.jts.math.MathUtil;
+
+
+/**
+ * Useful utility functions for handling Coordinate arrays
+ *
+ * @version 1.7
+ */
+public class CoordinateArrays {
+
+ private final static Coordinate[] coordArrayType = new Coordinate[0];
+
+ private CoordinateArrays() {}
+
+ /**
+ * Tests whether an array of {@link Coordinate}s forms a ring,
+ * by checking length and closure.
+ * Self-intersection is not checked.
+ *
+ * @param pts an array of Coordinates
+ * @return true if the coordinate form a ring.
+ */
+ public static boolean isRing(Coordinate[] pts)
+ {
+ if (pts.length < 4) return false;
+ if (! pts[0].equals2D(pts[pts.length -1])) return false;
+ return true;
+ }
+
+ /**
+ * Finds a point in a list of points which is not contained in another list of points
+ * @param testPts the {@link Coordinate}s to test
+ * @param pts an array of {@link Coordinate}s to test the input points against
+ * @return a {@link Coordinate} from <code>testPts</code> which is not in <code>pts</code>, '
+ * or <code>null</code>
+ */
+ public static Coordinate ptNotInList(Coordinate[] testPts, Coordinate[] pts)
+ {
+ for (int i = 0; i < testPts.length; i++) {
+ Coordinate testPt = testPts[i];
+ if (CoordinateArrays.indexOf(testPt, pts) < 0)
+ return testPt;
+ }
+ return null;
+ }
+
+ /**
+ * Compares two {@link Coordinate} arrays
+ * in the forward direction of their coordinates,
+ * using lexicographic ordering.
+ *
+ * @param pts1
+ * @param pts2
+ * @return an integer indicating the order
+ */
+ public static int compare(Coordinate[] pts1, Coordinate[] pts2) {
+ int i = 0;
+ while (i < pts1.length && i < pts2.length) {
+ int compare = pts1[i].compareTo(pts2[i]);
+ if (compare != 0)
+ return compare;
+ i++;
+ }
+ // handle situation when arrays are of different length
+ if (i < pts2.length) return -1;
+ if (i < pts1.length) return 1;
+
+ return 0;
+ }
+
+ /**
+ * A {@link Comparator} for {@link Coordinate} arrays
+ * in the forward direction of their coordinates,
+ * using lexicographic ordering.
+ */
+ public static class ForwardComparator
+ implements Comparator
+ {
+ public int compare(Object o1, Object o2) {
+ Coordinate[] pts1 = (Coordinate[]) o1;
+ Coordinate[] pts2 = (Coordinate[]) o2;
+
+ return CoordinateArrays.compare(pts1, pts2);
+ }
+ }
+
+
+ /**
+ * Determines which orientation of the {@link Coordinate} array
+ * is (overall) increasing.
+ * In other words, determines which end of the array is "smaller"
+ * (using the standard ordering on {@link Coordinate}).
+ * Returns an integer indicating the increasing direction.
+ * If the sequence is a palindrome, it is defined to be
+ * oriented in a positive direction.
+ *
+ * @param pts the array of Coordinates to test
+ * @return <code>1</code> if the array is smaller at the start
+ * or is a palindrome,
+ * <code>-1</code> if smaller at the end
+ */
+ public static int increasingDirection(Coordinate[] pts) {
+ for (int i = 0; i < pts.length / 2; i++) {
+ int j = pts.length - 1 - i;
+ // skip equal points on both ends
+ int comp = pts[i].compareTo(pts[j]);
+ if (comp != 0)
+ return comp;
+ }
+ // array must be a palindrome - defined to be in positive direction
+ return 1;
+ }
+
+ /**
+ * Determines whether two {@link Coordinate} arrays of equal length
+ * are equal in opposite directions.
+ *
+ * @param pts1
+ * @param pts2
+ * @return <code>true</code> if the two arrays are equal in opposite directions.
+ */
+ private static boolean isEqualReversed(Coordinate[] pts1, Coordinate[] pts2)
+ {
+ for (int i = 0; i < pts1.length; i++) {
+ Coordinate p1 = pts1[i];
+ Coordinate p2 = pts2[pts1.length - i - 1];
+ if (p1.compareTo(p2) != 0)
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * A {@link Comparator} for {@link Coordinate} arrays
+ * modulo their directionality.
+ * E.g. if two coordinate arrays are identical but reversed
+ * they will compare as equal under this ordering.
+ * If the arrays are not equal, the ordering returned
+ * is the ordering in the forward direction.
+ *
+ */
+ public static class BidirectionalComparator
+ implements Comparator
+ {
+ public int compare(Object o1, Object o2) {
+ Coordinate[] pts1 = (Coordinate[]) o1;
+ Coordinate[] pts2 = (Coordinate[]) o2;
+
+ if (pts1.length < pts2.length) return -1;
+ if (pts1.length > pts2.length) return 1;
+
+ if (pts1.length == 0) return 0;
+
+ int forwardComp = CoordinateArrays.compare(pts1, pts2);
+ boolean isEqualRev = isEqualReversed(pts1, pts2);
+ if (isEqualRev)
+ return 0;
+ return forwardComp;
+ }
+
+ public int OLDcompare(Object o1, Object o2) {
+ Coordinate[] pts1 = (Coordinate[]) o1;
+ Coordinate[] pts2 = (Coordinate[]) o2;
+
+ if (pts1.length < pts2.length) return -1;
+ if (pts1.length > pts2.length) return 1;
+
+ if (pts1.length == 0) return 0;
+
+ int dir1 = increasingDirection(pts1);
+ int dir2 = increasingDirection(pts2);
+
+ int i1 = dir1 > 0 ? 0 : pts1.length - 1;
+ int i2 = dir2 > 0 ? 0 : pts1.length - 1;
+
+ for (int i = 0; i < pts1.length; i++) {
+ int comparePt = pts1[i1].compareTo(pts2[i2]);
+ if (comparePt != 0)
+ return comparePt;
+ i1 += dir1;
+ i2 += dir2;
+ }
+ return 0;
+ }
+
+ }
+
+ /**
+ * Creates a deep copy of the argument {@link Coordinate} array.
+ *
+ * @param coordinates an array of Coordinates
+ * @return a deep copy of the input
+ */
+ public static Coordinate[] copyDeep(Coordinate[] coordinates) {
+ Coordinate[] copy = new Coordinate[coordinates.length];
+ for (int i = 0; i < coordinates.length; i++) {
+ copy[i] = new Coordinate(coordinates[i]);
+ }
+ return copy;
+ }
+
+ /**
+ * Creates a deep copy of a given section of a source {@link Coordinate} array
+ * into a destination Coordinate array.
+ * The destination array must be an appropriate size to receive
+ * the copied coordinates.
+ *
+ * @param src an array of Coordinates
+ * @param srcStart the index to start copying from
+ * @param dest the
+ * @param destStart the destination index to start copying to
+ * @param length the number of items to copy
+ */
+ public static void copyDeep(Coordinate[] src, int srcStart, Coordinate[] dest, int destStart, int length) {
+ for (int i = 0; i < length; i++) {
+ dest[destStart + i] = new Coordinate(src[srcStart + i]);
+ }
+ }
+
+ /**
+ * Converts the given Collection of Coordinates into a Coordinate array.
+ */
+ public static Coordinate[] toCoordinateArray(Collection coordList)
+ {
+ return (Coordinate[]) coordList.toArray(coordArrayType);
+ }
+
+ /**
+ * Returns whether #equals returns true for any two consecutive Coordinates
+ * in the given array.
+ */
+ public static boolean hasRepeatedPoints(Coordinate[] coord)
+ {
+ for (int i = 1; i < coord.length; i++) {
+ if (coord[i - 1].equals(coord[i]) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Returns either the given coordinate array if its length is greater than the
+ * given amount, or an empty coordinate array.
+ */
+ public static Coordinate[] atLeastNCoordinatesOrNothing(int n, Coordinate[] c) {
+ return c.length >= n ? c : new Coordinate[] { };
+ }
+
+ /**
+ * If the coordinate array argument has repeated points,
+ * constructs a new array containing no repeated points.
+ * Otherwise, returns the argument.
+ * @see #hasRepeatedPoints(Coordinate[])
+ */
+ public static Coordinate[] removeRepeatedPoints(Coordinate[] coord)
+ {
+ if (! hasRepeatedPoints(coord)) return coord;
+ CoordinateList coordList = new CoordinateList(coord, false);
+ return coordList.toCoordinateArray();
+ }
+
+ /**
+ * Collapses a coordinate array to remove all null elements.
+ *
+ * @param coord the coordinate array to collapse
+ * @return an array containing only non-null elements
+ */
+ public static Coordinate[] removeNull(Coordinate[] coord)
+ {
+ int nonNull = 0;
+ for (int i = 0; i < coord.length; i++) {
+ if (coord[i] != null) nonNull++;
+ }
+ Coordinate[] newCoord = new Coordinate[nonNull];
+ // empty case
+ if (nonNull == 0) return newCoord;
+
+ int j = 0;
+ for (int i = 0; i < coord.length; i++) {
+ if (coord[i] != null) newCoord[j++] = coord[i];
+ }
+ return newCoord;
+ }
+
+ /**
+ * Reverses the coordinates in an array in-place.
+ */
+ public static void reverse(Coordinate[] coord)
+ {
+ int last = coord.length - 1;
+ int mid = last / 2;
+ for (int i = 0; i <= mid; i++) {
+ Coordinate tmp = coord[i];
+ coord[i] = coord[last - i];
+ coord[last - i] = tmp;
+ }
+ }
+
+ /**
+ * Returns true if the two arrays are identical, both null, or pointwise
+ * equal (as compared using Coordinate#equals)
+ * @see Coordinate#equals(Object)
+ */
+ public static boolean equals(
+ Coordinate[] coord1,
+ Coordinate[] coord2)
+ {
+ if (coord1 == coord2) return true;
+ if (coord1 == null || coord2 == null) return false;
+ if (coord1.length != coord2.length) return false;
+ for (int i = 0; i < coord1.length; i++) {
+ if (! coord1[i].equals(coord2[i])) return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns true if the two arrays are identical, both null, or pointwise
+ * equal, using a user-defined {@link Comparator} for {@link Coordinate} s
+ *
+ * @param coord1 an array of Coordinates
+ * @param coord2 an array of Coordinates
+ * @param coordinateComparator a Comparator for Coordinates
+ */
+ public static boolean equals(
+ Coordinate[] coord1,
+ Coordinate[] coord2,
+ Comparator coordinateComparator)
+ {
+ if (coord1 == coord2) return true;
+ if (coord1 == null || coord2 == null) return false;
+ if (coord1.length != coord2.length) return false;
+ for (int i = 0; i < coord1.length; i++) {
+ if (coordinateComparator.compare(coord1[i], coord2[i]) != 0)
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns the minimum coordinate, using the usual lexicographic comparison.
+ *
+ *@param coordinates the array to search
+ *@return the minimum coordinate in the array, found using <code>compareTo</code>
+ *@see Coordinate#compareTo(Object)
+ */
+ public static Coordinate minCoordinate(Coordinate[] coordinates)
+ {
+ Coordinate minCoord = null;
+ for (int i = 0; i < coordinates.length; i++) {
+ if (minCoord == null || minCoord.compareTo(coordinates[i]) > 0) {
+ minCoord = coordinates[i];
+ }
+ }
+ return minCoord;
+ }
+ /**
+ * Shifts the positions of the coordinates until <code>firstCoordinate</code>
+ * is first.
+ *
+ *@param coordinates the array to rearrange
+ *@param firstCoordinate the coordinate to make first
+ */
+ public static void scroll(Coordinate[] coordinates, Coordinate firstCoordinate) {
+ int i = indexOf(firstCoordinate, coordinates);
+ if (i < 0) return;
+ Coordinate[] newCoordinates = new Coordinate[coordinates.length];
+ System.arraycopy(coordinates, i, newCoordinates, 0, coordinates.length - i);
+ System.arraycopy(coordinates, 0, newCoordinates, coordinates.length - i, i);
+ System.arraycopy(newCoordinates, 0, coordinates, 0, coordinates.length);
+ }
+
+ /**
+ * Returns the index of <code>coordinate</code> in <code>coordinates</code>.
+ * The first position is 0; the second, 1; etc.
+ *
+ *@param coordinate the <code>Coordinate</code> to search for
+ *@param coordinates the array to search
+ *@return the position of <code>coordinate</code>, or -1 if it is
+ * not found
+ */
+ public static int indexOf(Coordinate coordinate, Coordinate[] coordinates) {
+ for (int i = 0; i < coordinates.length; i++) {
+ if (coordinate.equals(coordinates[i])) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * Extracts a subsequence of the input {@link Coordinate} array
+ * from indices <code>start</code> to
+ * <code>end</code> (inclusive).
+ * The input indices are clamped to the array size;
+ * If the end index is less than the start index,
+ * the extracted array will be empty.
+ *
+ * @param pts the input array
+ * @param start the index of the start of the subsequence to extract
+ * @param end the index of the end of the subsequence to extract
+ * @return a subsequence of the input array
+ */
+ public static Coordinate[] extract(Coordinate[] pts, int start, int end)
+ {
+ start = MathUtil.clamp(start, 0, pts.length);
+ end = MathUtil.clamp(end, -1, pts.length);
+
+ int npts = end - start + 1;
+ if (end < 0) npts = 0;
+ if (start >= pts.length) npts = 0;
+ if (end < start) npts = 0;
+
+ Coordinate[] extractPts = new Coordinate[npts];
+ if (npts == 0) return extractPts;
+
+ int iPts = 0;
+ for (int i = start; i <= end; i++) {
+ extractPts[iPts++] = pts[i];
+ }
+ return extractPts;
+ }
+
+ /**
+ * Computes the envelope of the coordinates.
+ *
+ * @param coordinates the coordinates to scan
+ * @return the envelope of the coordinates
+ */
+ public static Envelope envelope(Coordinate[] coordinates) {
+ Envelope env = new Envelope();
+ for (int i = 0; i < coordinates.length; i++) {
+ env.expandToInclude(coordinates[i]);
+ }
+ return env;
+ }
+
+ /**
+ * Extracts the coordinates which intersect an {@link Envelope}.
+ *
+ * @param coordinates the coordinates to scan
+ * @param env the envelope to intersect with
+ * @return an array of the coordinates which intersect the envelope
+ */
+ public static Coordinate[] intersection(Coordinate[] coordinates, Envelope env) {
+ CoordinateList coordList = new CoordinateList();
+ for (int i = 0; i < coordinates.length; i++) {
+ if (env.intersects(coordinates[i]))
+ coordList.add(coordinates[i], true);
+ }
+ return coordList.toCoordinateArray();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateFilter.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateFilter.java
new file mode 100644
index 0000000..f76a14a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateFilter.java
@@ -0,0 +1,45 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+
+/**
+ * An interface for classes which use the values of the coordinates in a {@link Geometry}.
+ * Coordinate filters can be used to implement centroid and
+ * envelope computation, and many other functions.
+ * <p>
+ * <code>CoordinateFilter</code> is
+ * an example of the Gang-of-Four Visitor pattern.
+ * <p>
+ * <b>Note</b>: it is not recommended to use these filters to mutate the coordinates.
+ * There is no guarantee that the coordinate is the actual object stored in the geometry.
+ * In particular, modified values may not be preserved if the target Geometry uses a non-default {@link CoordinateSequence}.
+ * If in-place mutation is required, use {@link CoordinateSequenceFilter}.
+ *
+ * @see Geometry#apply(CoordinateFilter)
+ * @see CoordinateSequenceFilter
+ *
+ *@version 1.7
+ */
+public interface CoordinateFilter {
+
+ /**
+ * Performs an operation with the <code>coord</code>.
+ * There is no guarantee that the coordinate is the actual object stored in the target geometry.
+ *
+ *@param coord a <code>Coordinate</code> to which the filter is applied.
+ */
+ void filter(Coordinate coord);
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateList.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateList.java
new file mode 100644
index 0000000..61b572b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateList.java
@@ -0,0 +1,229 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * A list of {@link Coordinate}s, which may
+ * be set to prevent repeated coordinates from occurring in the list.
+ *
+ *
+ * @version 1.7
+ */
+public class CoordinateList
+ extends ArrayList
+{
+ //With contributions from Markus Schaber [schabios at logi-track.com]
+ //[Jon Aquino 2004-03-25]
+ private final static Coordinate[] coordArrayType = new Coordinate[0];
+
+ /**
+ * Constructs a new list without any coordinates
+ */
+ public CoordinateList()
+ {
+ }
+
+ /**
+ * Constructs a new list from an array of Coordinates, allowing repeated points.
+ * (I.e. this constructor produces a {@link CoordinateList} with exactly the same set of points
+ * as the input array.)
+ *
+ * @param coord the initial coordinates
+ */
+ public CoordinateList(Coordinate[] coord)
+ {
+ ensureCapacity(coord.length);
+ add(coord, true);
+ }
+
+ /**
+ * Constructs a new list from an array of Coordinates,
+ * allowing caller to specify if repeated points are to be removed.
+ *
+ * @param coord the array of coordinates to load into the list
+ * @param allowRepeated if <code>false</code>, repeated points are removed
+ */
+ public CoordinateList(Coordinate[] coord, boolean allowRepeated)
+ {
+ ensureCapacity(coord.length);
+ add(coord, allowRepeated);
+ }
+
+ public void add(Coordinate coord) {
+ super.add(coord);
+ }
+
+ public Coordinate getCoordinate(int i) { return (Coordinate) get(i); }
+
+
+ /**
+ * Adds a section of an array of coordinates to the list.
+ * @param coord The coordinates
+ * @param allowRepeated if set to false, repeated coordinates are collapsed
+ * @param start the index to start from
+ * @param end the index to add up to but not including
+ * @return true (as by general collection contract)
+ */
+ public boolean add(Coordinate[] coord, boolean allowRepeated, int start, int end)
+ {
+ int inc = 1;
+ if (start > end) inc = -1;
+
+ for (int i = start; i != end; i += inc) {
+ add(coord[i], allowRepeated);
+ }
+ return true;
+ }
+
+ /**
+ * Adds an array of coordinates to the list.
+ * @param coord The coordinates
+ * @param allowRepeated if set to false, repeated coordinates are collapsed
+ * @param direction if false, the array is added in reverse order
+ * @return true (as by general collection contract)
+ */
+ public boolean add(Coordinate[] coord, boolean allowRepeated, boolean direction)
+ {
+ if (direction) {
+ for (int i = 0; i < coord.length; i++) {
+ add(coord[i], allowRepeated);
+ }
+ }
+ else {
+ for (int i = coord.length - 1; i >= 0; i--) {
+ add(coord[i], allowRepeated);
+ }
+ }
+ return true;
+ }
+
+
+ /**
+ * Adds an array of coordinates to the list.
+ * @param coord The coordinates
+ * @param allowRepeated if set to false, repeated coordinates are collapsed
+ * @return true (as by general collection contract)
+ */
+ public boolean add(Coordinate[] coord, boolean allowRepeated)
+ {
+ add(coord, allowRepeated, true);
+ return true;
+ }
+
+ /**
+ * Adds a coordinate to the list.
+ * @param obj The coordinate to add
+ * @param allowRepeated if set to false, repeated coordinates are collapsed
+ * @return true (as by general collection contract)
+ */
+ public boolean add(Object obj, boolean allowRepeated)
+ {
+ add((Coordinate) obj, allowRepeated);
+ return true;
+ }
+
+ /**
+ * Adds a coordinate to the end of the list.
+ *
+ * @param coord The coordinates
+ * @param allowRepeated if set to false, repeated coordinates are collapsed
+ */
+ public void add(Coordinate coord, boolean allowRepeated)
+ {
+ // don't add duplicate coordinates
+ if (! allowRepeated) {
+ if (size() >= 1) {
+ Coordinate last = (Coordinate) get(size() - 1);
+ if (last.equals2D(coord)) return;
+ }
+ }
+ super.add(coord);
+ }
+
+ /**
+ * Inserts the specified coordinate at the specified position in this list.
+ *
+ * @param i the position at which to insert
+ * @param coord the coordinate to insert
+ * @param allowRepeated if set to false, repeated coordinates are collapsed
+ */
+ public void add(int i, Coordinate coord, boolean allowRepeated)
+ {
+ // don't add duplicate coordinates
+ if (! allowRepeated) {
+ int size = size();
+ if (size > 0) {
+ if (i > 0) {
+ Coordinate prev = (Coordinate) get(i - 1);
+ if (prev.equals2D(coord)) return;
+ }
+ if (i < size) {
+ Coordinate next = (Coordinate) get(i);
+ if (next.equals2D(coord)) return;
+ }
+ }
+ }
+ super.add(i, coord);
+ }
+
+ /** Add an array of coordinates
+ * @param coll The coordinates
+ * @param allowRepeated if set to false, repeated coordinates are collapsed
+ * @return true (as by general collection contract)
+ */
+ public boolean addAll(Collection coll, boolean allowRepeated)
+ {
+ boolean isChanged = false;
+ for (Iterator i = coll.iterator(); i.hasNext(); ) {
+ add((Coordinate) i.next(), allowRepeated);
+ isChanged = true;
+ }
+ return isChanged;
+ }
+
+ /**
+ * Ensure this coordList is a ring, by adding the start point if necessary
+ */
+ public void closeRing()
+ {
+ if (size() > 0)
+ add(new Coordinate((Coordinate) get(0)), false);
+ }
+
+ /** Returns the Coordinates in this collection.
+ *
+ * @return the coordinates
+ */
+ public Coordinate[] toCoordinateArray()
+ {
+ return (Coordinate[]) toArray(coordArrayType);
+ }
+
+ /**
+ * Returns a deep copy of this <tt>CoordinateList</tt> instance.
+ *
+ * @return a clone of this <tt>CoordinateList</tt> instance
+ */
+ public Object clone() {
+ CoordinateList clone = (CoordinateList) super.clone();
+ for (int i = 0; i < this.size(); i++) {
+ clone.add(i, ((Coordinate) this.get(i)).clone());
+ }
+ return clone;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequence.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequence.java
new file mode 100644
index 0000000..f7d625e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequence.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+
+/**
+ * The internal representation of a list of coordinates inside a Geometry.
+ * <p>
+ * This allows Geometries to store their
+ * points using something other than the JTS {@link Coordinate} class.
+ * For example, a storage-efficient implementation
+ * might store coordinate sequences as an array of x's
+ * and an array of y's.
+ * Or a custom coordinate class might support extra attributes like M-values.
+ * <p>
+ * Implementing a custom coordinate storage structure
+ * requires implementing the {@link CoordinateSequence} and
+ * {@link CoordinateSequenceFactory} interfaces.
+ * To use the custom CoordinateSequence, create a
+ * new {@link GeometryFactory} parameterized by the CoordinateSequenceFactory
+ * The {@link GeometryFactory} can then be used to create new {@link Geometry}s.
+ * The new Geometries
+ * will use the custom CoordinateSequence implementation.
+ * <p>
+ * For an example, see the code for
+ * {@link ExtendedCoordinateExample}.
+ *
+ * @see CoordinateArraySequenceFactory
+ * @see PackedCoordinateSequenceFactory
+ * @see ExtendedCoordinateExample
+ *
+ * @version 1.7
+ */
+public interface CoordinateSequence
+ extends Cloneable
+{
+ /**
+ * Standard ordinate index values
+ */
+ int X = 0;
+ int Y = 1;
+ int Z = 2;
+ int M = 3;
+
+ /**
+ * Returns the dimension (number of ordinates in each coordinate)
+ * for this sequence.
+ *
+ * @return the dimension of the sequence.
+ */
+ int getDimension();
+
+ /**
+ * Returns (possibly a copy of) the i'th coordinate in this sequence.
+ * Whether or not the Coordinate returned is the actual underlying
+ * Coordinate or merely a copy depends on the implementation.
+ * <p>
+ * Note that in the future the semantics of this method may change
+ * to guarantee that the Coordinate returned is always a copy.
+ * Callers should not to assume that they can modify a CoordinateSequence by
+ * modifying the object returned by this method.
+ *
+ * @param i the index of the coordinate to retrieve
+ * @return the i'th coordinate in the sequence
+ */
+ Coordinate getCoordinate(int i);
+
+ /**
+ * Returns a copy of the i'th coordinate in this sequence.
+ * This method optimizes the situation where the caller is
+ * going to make a copy anyway - if the implementation
+ * has already created a new Coordinate object, no further copy is needed.
+ *
+ * @param i the index of the coordinate to retrieve
+ * @return a copy of the i'th coordinate in the sequence
+ */
+ Coordinate getCoordinateCopy(int i);
+
+ /**
+ * Copies the i'th coordinate in the sequence to the supplied
+ * {@link Coordinate}. Only the first two dimensions are copied.
+ *
+ * @param index the index of the coordinate to copy
+ * @param coord a {@link Coordinate} to receive the value
+ */
+ void getCoordinate(int index, Coordinate coord);
+
+ /**
+ * Returns ordinate X (0) of the specified coordinate.
+ *
+ * @param index
+ * @return the value of the X ordinate in the index'th coordinate
+ */
+ double getX(int index);
+
+ /**
+ * Returns ordinate Y (1) of the specified coordinate.
+ *
+ * @param index
+ * @return the value of the Y ordinate in the index'th coordinate
+ */
+ double getY(int index);
+
+ /**
+ * Returns the ordinate of a coordinate in this sequence.
+ * Ordinate indices 0 and 1 are assumed to be X and Y.
+ * Ordinates indices greater than 1 have user-defined semantics
+ * (for instance, they may contain other dimensions or measure values).
+ *
+ * @param index the coordinate index in the sequence
+ * @param ordinateIndex the ordinate index in the coordinate (in range [0, dimension-1])
+ */
+ double getOrdinate(int index, int ordinateIndex);
+
+ /**
+ * Returns the number of coordinates in this sequence.
+ * @return the size of the sequence
+ */
+ int size();
+
+ /**
+ * Sets the value for a given ordinate of a coordinate in this sequence.
+ *
+ * @param index the coordinate index in the sequence
+ * @param ordinateIndex the ordinate index in the coordinate (in range [0, dimension-1])
+ * @param value the new ordinate value
+ */
+ void setOrdinate(int index, int ordinateIndex, double value);
+
+ /**
+ * Returns (possibly copies of) the Coordinates in this collection.
+ * Whether or not the Coordinates returned are the actual underlying
+ * Coordinates or merely copies depends on the implementation. Note that
+ * if this implementation does not store its data as an array of Coordinates,
+ * this method will incur a performance penalty because the array needs to
+ * be built from scratch.
+ *
+ * @return a array of coordinates containing the point values in this sequence
+ */
+ Coordinate[] toCoordinateArray();
+
+ /**
+ * Expands the given {@link Envelope} to include the coordinates in the sequence.
+ * Allows implementing classes to optimize access to coordinate values.
+ *
+ * @param env the envelope to expand
+ * @return a ref to the expanded envelope
+ */
+ Envelope expandEnvelope(Envelope env);
+
+ /**
+ * Returns a deep copy of this collection.
+ * Called by Geometry#clone.
+ *
+ * @return a copy of the coordinate sequence containing copies of all points
+ * @deprecated
+ */
+ Object clone();
+
+ /**
+ * Returns a deep copy of this collection.
+ *
+ * @return a copy of the coordinate sequence containing copies of all points
+ */
+ CoordinateSequence copy();
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceComparator.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceComparator.java
new file mode 100644
index 0000000..523e9eb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceComparator.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import java.util.Comparator;
+
+/**
+ * Compares two {@link CoordinateSequence}s.
+ * For sequences of the same dimension, the ordering is lexicographic.
+ * Otherwise, lower dimensions are sorted before higher.
+ * The dimensions compared can be limited; if this is done
+ * ordinate dimensions above the limit will not be compared.
+ * <p>
+ * If different behaviour is required for comparing size, dimension, or
+ * coordinate values, any or all methods can be overridden.
+ *
+ */
+public class CoordinateSequenceComparator
+ implements Comparator
+{
+ /**
+ * Compare two <code>double</code>s, allowing for NaN values.
+ * NaN is treated as being less than any valid number.
+ *
+ * @param a a <code>double</code>
+ * @param b a <code>double</code>
+ * @return -1, 0, or 1 depending on whether a is less than, equal to or greater than b
+ */
+ public static int compare(double a, double b)
+ {
+ if (a < b) return -1;
+ if (a > b) return 1;
+
+ if (Double.isNaN(a)) {
+ if (Double.isNaN(b)) return 0;
+ return -1;
+ }
+
+ if (Double.isNaN(b)) return 1;
+ return 0;
+ }
+
+ /**
+ * The number of dimensions to test
+ */
+ protected int dimensionLimit;
+
+ /**
+ * Creates a comparator which will test all dimensions.
+ */
+ public CoordinateSequenceComparator()
+ {
+ dimensionLimit = Integer.MAX_VALUE;
+ }
+
+ /**
+ * Creates a comparator which will test only the specified number of dimensions.
+ *
+ * @param dimensionLimit the number of dimensions to test
+ */
+ public CoordinateSequenceComparator(int dimensionLimit)
+ {
+ this.dimensionLimit = dimensionLimit;
+ }
+
+ /**
+ * Compares two {@link CoordinateSequence}s for relative order.
+ *
+ * @param o1 a {@link CoordinateSequence}
+ * @param o2 a {@link CoordinateSequence}
+ * @return -1, 0, or 1 depending on whether o1 is less than, equal to, or greater than o2
+ */
+ public int compare(Object o1, Object o2)
+ {
+ CoordinateSequence s1 = (CoordinateSequence) o1;
+ CoordinateSequence s2 = (CoordinateSequence) o2;
+
+ int size1 = s1.size();
+ int size2 = s2.size();
+
+ int dim1 = s1.getDimension();
+ int dim2 = s2.getDimension();
+
+ int minDim = dim1;
+ if (dim2 < minDim)
+ minDim = dim2;
+ boolean dimLimited = false;
+ if (dimensionLimit <= minDim) {
+ minDim = dimensionLimit;
+ dimLimited = true;
+ }
+
+ // lower dimension is less than higher
+ if (! dimLimited) {
+ if (dim1 < dim2) return -1;
+ if (dim1 > dim2) return 1;
+ }
+
+ // lexicographic ordering of point sequences
+ int i = 0;
+ while (i < size1 && i < size2) {
+ int ptComp = compareCoordinate(s1, s2, i, minDim);
+ if (ptComp != 0) return ptComp;
+ i++;
+ }
+ if (i < size1) return 1;
+ if (i < size2) return -1;
+
+ return 0;
+ }
+
+ /**
+ * Compares the same coordinate of two {@link CoordinateSequence}s
+ * along the given number of dimensions.
+ *
+ * @param s1 a {@link CoordinateSequence}
+ * @param s2 a {@link CoordinateSequence}
+ * @param i the index of the coordinate to test
+ * @param dimension the number of dimensions to test
+ * @return -1, 0, or 1 depending on whether s1[i] is less than, equal to, or greater than s2[i]
+ */
+ protected int compareCoordinate(CoordinateSequence s1, CoordinateSequence s2, int i, int dimension)
+ {
+ for (int d = 0; d < dimension; d++) {
+ double ord1 = s1.getOrdinate(i, d);
+ double ord2 = s2.getOrdinate(i, d);
+ int comp = compare(ord1, ord2);
+ if (comp != 0) return comp;
+ }
+ return 0;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceFactory.java
new file mode 100644
index 0000000..98fbc94
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceFactory.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * A factory to create concrete instances of {@link CoordinateSequence}s.
+ * Used to configure {@link GeometryFactory}s
+ * to provide specific kinds of CoordinateSequences.
+ *
+ * @version 1.7
+ */
+public interface CoordinateSequenceFactory
+{
+
+ /**
+ * Returns a {@link CoordinateSequence} based on the given array.
+ * Whether the array is copied or simply referenced
+ * is implementation-dependent.
+ * This method must handle null arguments by creating an empty sequence.
+ *
+ * @param coordinates the coordinates
+ */
+ CoordinateSequence create(Coordinate[] coordinates);
+
+ /**
+ * Creates a {@link CoordinateSequence} which is a copy
+ * of the given {@link CoordinateSequence}.
+ * This method must handle null arguments by creating an empty sequence.
+ *
+ * @param coordSeq the coordinate sequence to copy
+ */
+ CoordinateSequence create(CoordinateSequence coordSeq);
+
+ /**
+ * Creates a {@link CoordinateSequence} of the specified size and dimension.
+ * For this to be useful, the {@link CoordinateSequence} implementation must
+ * be mutable.
+ * <p>
+ * If the requested dimension is larger than the CoordinateSequence implementation
+ * can provide, then a sequence of maximum possible dimension should be created.
+ * An error should not be thrown.
+ *
+ * @param size the number of coordinates in the sequence
+ * @param dimension the dimension of the coordinates in the sequence (if user-specifiable,
+ * otherwise ignored)
+ */
+ CoordinateSequence create(int size, int dimension);
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceFilter.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceFilter.java
new file mode 100644
index 0000000..8c60d15
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequenceFilter.java
@@ -0,0 +1,82 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.geom.util.GeometryEditor;
+import org.locationtech.jts.geom.util.GeometryTransformer;
+
+/**
+ * An interface for classes which process the coordinates in a {@link CoordinateSequence}.
+ * A filter can either record information about each coordinate,
+ * or change the value of the coordinate.
+ * Filters can be
+ * used to implement operations such as coordinate transformations, centroid and
+ * envelope computation, and many other functions.
+ * {@link Geometry} classes support the concept of applying a
+ * <code>CoordinateSequenceFilter</code> to each
+ * {@link CoordinateSequence}s they contain.
+ * <p>
+ * For maximum efficiency, the execution of filters can be short-circuited by using the {@link #isDone} method.
+ * <p>
+ * <code>CoordinateSequenceFilter</code> is
+ * an example of the Gang-of-Four Visitor pattern.
+ * <p>
+ * <b>Note</b>: In general, it is preferable to treat Geometrys as immutable.
+ * Mutation should be performed by creating a new Geometry object (see {@link GeometryEditor}
+ * and {@link GeometryTransformer} for convenient ways to do this).
+ * An exception to this rule is when a new Geometry has been created via {@link Geometry#copy()}.
+ * In this case mutating the Geometry will not cause aliasing issues,
+ * and a filter is a convenient way to implement coordinate transformation.
+ *
+ * @see Geometry#apply(CoordinateFilter)
+ * @see GeometryTransformer
+ * @see GeometryEditor
+ *
+ *@see Geometry#apply(CoordinateSequenceFilter)
+ *@author Martin Davis
+ *@version 1.7
+ */
+public interface CoordinateSequenceFilter
+{
+ /**
+ * Performs an operation on a coordinate in a {@link CoordinateSequence}.
+ *
+ *@param seq the <code>CoordinateSequence</code> to which the filter is applied
+ *@param i the index of the coordinate to apply the filter to
+ */
+ void filter(CoordinateSequence seq, int i);
+
+ /**
+ * Reports whether the application of this filter can be terminated.
+ * Once this method returns <tt>false</tt>, it should
+ * continue to return <tt>false</tt> on every subsequent call.
+ *
+ * @return true if the application of this filter can be terminated.
+ */
+ boolean isDone();
+
+ /**
+ * Reports whether the execution of this filter
+ * has modified the coordinates of the geometry.
+ * If so, {@link Geometry#geometryChanged} will be executed
+ * after this filter has finished being executed.
+ * <p>
+ * Most filters can simply return a constant value reflecting
+ * whether they are able to change the coordinates.
+ *
+ * @return true if this filter has changed the coordinates of the geometry
+ */
+ boolean isGeometryChanged();
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequences.java b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequences.java
new file mode 100644
index 0000000..d6bc1e0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/CoordinateSequences.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.util.StringUtil;
+
+
+/**
+ * Utility functions for manipulating {@link CoordinateSequence}s
+ *
+ * @version 1.7
+ */
+public class CoordinateSequences {
+
+ /**
+ * Reverses the coordinates in a sequence in-place.
+ */
+ public static void reverse(CoordinateSequence seq)
+ {
+ int last = seq.size() - 1;
+ int mid = last / 2;
+ for (int i = 0; i <= mid; i++) {
+ swap(seq, i, last - i);
+ }
+ }
+
+ /**
+ * Swaps two coordinates in a sequence.
+ *
+ * @param seq the sequence to modify
+ * @param i the index of a coordinate to swap
+ * @param j the index of a coordinate to swap
+ */
+ public static void swap(CoordinateSequence seq, int i, int j)
+ {
+ if (i == j) return;
+ for (int dim = 0; dim < seq.getDimension(); dim++) {
+ double tmp = seq.getOrdinate(i, dim);
+ seq.setOrdinate(i, dim, seq.getOrdinate(j, dim));
+ seq.setOrdinate(j, dim, tmp);
+ }
+ }
+
+ /**
+ * Copies a section of a {@link CoordinateSequence} to another {@link CoordinateSequence}.
+ * The sequences may have different dimensions;
+ * in this case only the common dimensions are copied.
+ *
+ * @param src the sequence to copy from
+ * @param srcPos the position in the source sequence to start copying at
+ * @param dest the sequence to copy to
+ * @param destPos the position in the destination sequence to copy to
+ * @param length the number of coordinates to copy
+ */
+ public static void copy(CoordinateSequence src, int srcPos, CoordinateSequence dest, int destPos, int length)
+ {
+ for (int i = 0; i < length; i++) {
+ copyCoord(src, srcPos + i, dest, destPos + i);
+ }
+ }
+
+ /**
+ * Copies a coordinate of a {@link CoordinateSequence} to another {@link CoordinateSequence}.
+ * The sequences may have different dimensions;
+ * in this case only the common dimensions are copied.
+ *
+ * @param src the sequence to copy from
+ * @param srcPos the source coordinate to copy
+ * @param dest the sequence to copy to
+ * @param destPos the destination coordinate to copy to
+ */
+ public static void copyCoord(CoordinateSequence src, int srcPos, CoordinateSequence dest, int destPos)
+ {
+ int minDim = Math.min(src.getDimension(), dest.getDimension());
+ for (int dim = 0; dim < minDim; dim++) {
+ dest.setOrdinate(destPos, dim, src.getOrdinate(srcPos, dim));
+ }
+ }
+
+ /**
+ * Tests whether a {@link CoordinateSequence} forms a valid {@link LinearRing},
+ * by checking the sequence length and closure
+ * (whether the first and last points are identical in 2D).
+ * Self-intersection is not checked.
+ *
+ * @param seq the sequence to test
+ * @return true if the sequence is a ring
+ * @see LinearRing
+ */
+ public static boolean isRing(CoordinateSequence seq)
+ {
+ int n = seq.size();
+ if (n == 0) return true;
+ // too few points
+ if (n <= 3)
+ return false;
+ // test if closed
+ return seq.getOrdinate(0, CoordinateSequence.X) == seq.getOrdinate(n-1, CoordinateSequence.X)
+ && seq.getOrdinate(0, CoordinateSequence.Y) == seq.getOrdinate(n-1, CoordinateSequence.Y);
+ }
+
+ /**
+ * Ensures that a CoordinateSequence forms a valid ring,
+ * returning a new closed sequence of the correct length if required.
+ * If the input sequence is already a valid ring, it is returned
+ * without modification.
+ * If the input sequence is too short or is not closed,
+ * it is extended with one or more copies of the start point.
+ *
+ * @param fact the CoordinateSequenceFactory to use to create the new sequence
+ * @param seq the sequence to test
+ * @return the original sequence, if it was a valid ring, or a new sequence which is valid.
+ */
+ public static CoordinateSequence ensureValidRing(CoordinateSequenceFactory fact, CoordinateSequence seq)
+ {
+ int n = seq.size();
+ // empty sequence is valid
+ if (n == 0) return seq;
+ // too short - make a new one
+ if (n <= 3)
+ return createClosedRing(fact, seq, 4);
+
+ boolean isClosed = seq.getOrdinate(0, CoordinateSequence.X) == seq.getOrdinate(n-1, CoordinateSequence.X)
+ && seq.getOrdinate(0, CoordinateSequence.Y) == seq.getOrdinate(n-1, CoordinateSequence.Y);
+ if (isClosed) return seq;
+ // make a new closed ring
+ return createClosedRing(fact, seq, n+1);
+ }
+
+ private static CoordinateSequence createClosedRing(CoordinateSequenceFactory fact, CoordinateSequence seq, int size)
+ {
+ CoordinateSequence newseq = fact.create(size, seq.getDimension());
+ int n = seq.size();
+ copy(seq, 0, newseq, 0, n);
+ // fill remaining coordinates with start point
+ for (int i = n; i < size; i++)
+ copy(seq, 0, newseq, i, 1);
+ return newseq;
+ }
+
+ public static CoordinateSequence extend(CoordinateSequenceFactory fact, CoordinateSequence seq, int size)
+ {
+ CoordinateSequence newseq = fact.create(size, seq.getDimension());
+ int n = seq.size();
+ copy(seq, 0, newseq, 0, n);
+ // fill remaining coordinates with end point, if it exists
+ if (n > 0) {
+ for (int i = n; i < size; i++)
+ copy(seq, n-1, newseq, i, 1);
+ }
+ return newseq;
+ }
+
+ /**
+ * Tests whether two {@link CoordinateSequence}s are equal.
+ * To be equal, the sequences must be the same length.
+ * They do not need to be of the same dimension,
+ * but the ordinate values for the smallest dimension of the two
+ * must be equal.
+ * Two <code>NaN</code> ordinates values are considered to be equal.
+ *
+ * @param cs1 a CoordinateSequence
+ * @param cs2 a CoordinateSequence
+ * @return true if the sequences are equal in the common dimensions
+ */
+ public static boolean isEqual(CoordinateSequence cs1, CoordinateSequence cs2) {
+ int cs1Size = cs1.size();
+ int cs2Size = cs2.size();
+ if (cs1Size != cs2Size) return false;
+ int dim = Math.min(cs1.getDimension(), cs2.getDimension());
+ for (int i = 0; i < cs1Size; i++) {
+ for (int d = 0; d < dim; d++) {
+ double v1 = cs1.getOrdinate(i, d);
+ double v2 = cs2.getOrdinate(i, d);
+ if (cs1.getOrdinate(i, d) == cs2.getOrdinate(i, d))
+ continue;
+ // special check for NaNs
+ if (Double.isNaN(v1) && Double.isNaN(v2))
+ continue;
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Creates a string representation of a {@link CoordinateSequence}.
+ * The format is:
+ * <pre>
+ * ( ord0,ord1.. ord0,ord1,... ... )
+ * </pre>
+ *
+ * @param cs the sequence to output
+ * @return the string representation of the sequence
+ */
+ public static String toString(CoordinateSequence cs)
+ {
+ int size = cs.size();
+ if (size == 0)
+ return "()";
+ int dim = cs.getDimension();
+ StringBuilder builder = new StringBuilder();
+ builder.append('(');
+ for (int i = 0; i < size; i++) {
+ if (i > 0) builder.append(" ");
+ for (int d = 0; d < dim; d++) {
+ if (d > 0) builder.append(",");
+ builder.append(StringUtil.toString(cs.getOrdinate(i, d)));
+ }
+ }
+ builder.append(')');
+ return builder.toString();
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/DefaultCoordinateSequence.java b/modules/core/src/main/java/org/locationtech/jts/geom/DefaultCoordinateSequence.java
new file mode 100644
index 0000000..9c8b2a8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/DefaultCoordinateSequence.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+import java.io.Serializable;
+
+/**
+ * The CoordinateSequence implementation that Geometries use by default. In
+ * this implementation, Coordinates returned by #toArray and #get are live --
+ * parties that change them are actually changing the
+ * DefaultCoordinateSequence's underlying data.
+ *
+ * @version 1.7
+ *
+ * @deprecated no longer used
+ */
+class DefaultCoordinateSequence
+ implements CoordinateSequence, Serializable
+{
+ //With contributions from Markus Schaber [schabios at logi-track.com] 2004-03-26
+ private static final long serialVersionUID = -915438501601840650L;
+ private Coordinate[] coordinates;
+
+ /**
+ * Constructs a DefaultCoordinateSequence based on the given array (the
+ * array is not copied).
+ *
+ * @param coordinates the coordinate array that will be referenced.
+ */
+ public DefaultCoordinateSequence(Coordinate[] coordinates) {
+ if (Geometry.hasNullElements(coordinates)) {
+ throw new IllegalArgumentException("Null coordinate");
+ }
+ this.coordinates = coordinates;
+ }
+
+ /**
+ * Creates a new sequence based on a deep copy of the given {@link CoordinateSequence}.
+ *
+ * @param coordSeq the coordinate sequence that will be copied.
+ */
+ public DefaultCoordinateSequence(CoordinateSequence coordSeq) {
+ coordinates = new Coordinate[coordSeq.size()];
+ for (int i = 0; i < coordinates.length; i++) {
+ coordinates[i] = coordSeq.getCoordinateCopy(i);
+ }
+ }
+
+ /**
+ * Constructs a sequence of a given size, populated
+ * with new {@link Coordinate}s.
+ *
+ * @param size the size of the sequence to create
+ */
+ public DefaultCoordinateSequence(int size) {
+ coordinates = new Coordinate[size];
+ for (int i = 0; i < size; i++) {
+ coordinates[i] = new Coordinate();
+ }
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getDimension()
+ */
+ public int getDimension() { return 3; }
+
+ /**
+ * Get the Coordinate with index i.
+ *
+ * @param i
+ * the index of the coordinate
+ * @return the requested Coordinate instance
+ */
+ public Coordinate getCoordinate(int i) {
+ return coordinates[i];
+ }
+ /**
+ * Get a copy of the Coordinate with index i.
+ *
+ * @param i the index of the coordinate
+ * @return a copy of the requested Coordinate
+ */
+ public Coordinate getCoordinateCopy(int i) {
+ return new Coordinate(coordinates[i]);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getX(int)
+ */
+ public void getCoordinate(int index, Coordinate coord) {
+ coord.x = coordinates[index].x;
+ coord.y = coordinates[index].y;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getX(int)
+ */
+ public double getX(int index) {
+ return coordinates[index].x;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getY(int)
+ */
+ public double getY(int index) {
+ return coordinates[index].y;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getOrdinate(int, int)
+ */
+ public double getOrdinate(int index, int ordinateIndex)
+ {
+ switch (ordinateIndex) {
+ case CoordinateSequence.X: return coordinates[index].x;
+ case CoordinateSequence.Y: return coordinates[index].y;
+ case CoordinateSequence.Z: return coordinates[index].z;
+ }
+ return Double.NaN;
+ }
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#setOrdinate(int, int, double)
+ */
+ public void setOrdinate(int index, int ordinateIndex, double value)
+ {
+ switch (ordinateIndex) {
+ case CoordinateSequence.X: coordinates[index].x = value; break;
+ case CoordinateSequence.Y: coordinates[index].y = value; break;
+ case CoordinateSequence.Z: coordinates[index].z = value; break;
+ }
+ }
+ /**
+ * Creates a deep copy of the Object
+ *
+ * @return The deep copy
+ * @deprecated
+ */
+ public Object clone() {
+ return copy();
+ }
+ /**
+ * Creates a deep copy of the DefaultCoordinateSequence
+ *
+ * @return The deep copy
+ */
+ public DefaultCoordinateSequence copy() {
+ Coordinate[] cloneCoordinates = new Coordinate[size()];
+ for (int i = 0; i < coordinates.length; i++) {
+ cloneCoordinates[i] = (Coordinate) coordinates[i].clone();
+ }
+ return new DefaultCoordinateSequence(cloneCoordinates);
+ }
+ /**
+ * Returns the size of the coordinate sequence
+ *
+ * @return the number of coordinates
+ */
+ public int size() {
+ return coordinates.length;
+ }
+ /**
+ * This method exposes the internal Array of Coordinate Objects
+ *
+ * @return the Coordinate[] array.
+ */
+ public Coordinate[] toCoordinateArray() {
+ return coordinates;
+ }
+
+ public Envelope expandEnvelope(Envelope env)
+ {
+ for (int i = 0; i < coordinates.length; i++ ) {
+ env.expandToInclude(coordinates[i]);
+ }
+ return env;
+ }
+
+ /**
+ * Returns the string Representation of the coordinate array
+ *
+ * @return The string
+ */
+ public String toString() {
+ if (coordinates.length > 0) {
+ StringBuilder strBuilder = new StringBuilder(17 * coordinates.length);
+ strBuilder.append('(');
+ strBuilder.append(coordinates[0]);
+ for (int i = 1; i < coordinates.length; i++) {
+ strBuilder.append(", ");
+ strBuilder.append(coordinates[i]);
+ }
+ strBuilder.append(')');
+ return strBuilder.toString();
+ } else {
+ return "()";
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/DefaultCoordinateSequenceFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/DefaultCoordinateSequenceFactory.java
new file mode 100644
index 0000000..25c60f6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/DefaultCoordinateSequenceFactory.java
@@ -0,0 +1,72 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.io.Serializable;
+
+/**
+ * Creates CoordinateSequences represented as an array of {@link Coordinate}s.
+ *
+ * @version 1.7
+ *
+ * @deprecated no longer used
+ */
+public class DefaultCoordinateSequenceFactory
+ implements CoordinateSequenceFactory, Serializable
+{
+ private static final long serialVersionUID = -4099577099607551657L;
+ private static final DefaultCoordinateSequenceFactory instanceObject = new DefaultCoordinateSequenceFactory();
+
+ public DefaultCoordinateSequenceFactory() {
+ }
+
+ private Object readResolve() {
+ // see http://www.javaworld.com/javaworld/javatips/jw-javatip122.html
+ return DefaultCoordinateSequenceFactory.instance();
+ }
+
+ /**
+ * Returns the singleton instance of DefaultCoordinateSequenceFactory
+ */
+ public static DefaultCoordinateSequenceFactory instance() {
+ return instanceObject;
+ }
+
+
+
+ /**
+ * Returns a DefaultCoordinateSequence based on the given array (the array is
+ * not copied).
+ *
+ * @param coordinates
+ * the coordinates, which may not be null nor contain null
+ * elements
+ */
+ public CoordinateSequence create(Coordinate[] coordinates) {
+ return new DefaultCoordinateSequence(coordinates);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(org.locationtech.jts.geom.CoordinateSequence)
+ */
+ public CoordinateSequence create(CoordinateSequence coordSeq) {
+ return new DefaultCoordinateSequence(coordSeq);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(int, int)
+ */
+ public CoordinateSequence create(int size, int dimension) {
+ return new DefaultCoordinateSequence(size);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Dimension.java b/modules/core/src/main/java/org/locationtech/jts/geom/Dimension.java
new file mode 100644
index 0000000..54b2f42
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Dimension.java
@@ -0,0 +1,143 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * Provides constants representing the dimensions of a point, a curve and a surface.
+ * Also provides constants representing the dimensions of the empty geometry and
+ * non-empty geometries, and the wildcard constant {@link #DONTCARE} meaning "any dimension".
+ * These constants are used as the entries in {@link IntersectionMatrix}s.
+ *
+ * @version 1.7
+ */
+public class Dimension {
+
+ /**
+ * Dimension value of a point (0).
+ */
+ public final static int P = 0;
+
+ /**
+ * Dimension value of a curve (1).
+ */
+ public final static int L = 1;
+
+ /**
+ * Dimension value of a surface (2).
+ */
+ public final static int A = 2;
+
+ /**
+ * Dimension value of the empty geometry (-1).
+ */
+ public final static int FALSE = -1;
+
+ /**
+ * Dimension value of non-empty geometries (= {P, L, A}).
+ */
+ public final static int TRUE = -2;
+
+ /**
+ * Dimension value for any dimension (= {FALSE, TRUE}).
+ */
+ public final static int DONTCARE = -3;
+
+ /**
+ * Symbol for the FALSE pattern matrix entry
+ */
+ public final static char SYM_FALSE = 'F';
+
+ /**
+ * Symbol for the TRUE pattern matrix entry
+ */
+ public final static char SYM_TRUE = 'T';
+
+ /**
+ * Symbol for the DONTCARE pattern matrix entry
+ */
+ public final static char SYM_DONTCARE = '*';
+
+ /**
+ * Symbol for the P (dimension 0) pattern matrix entry
+ */
+ public final static char SYM_P = '0';
+
+ /**
+ * Symbol for the L (dimension 1) pattern matrix entry
+ */
+ public final static char SYM_L = '1';
+
+ /**
+ * Symbol for the A (dimension 2) pattern matrix entry
+ */
+ public final static char SYM_A = '2';
+
+ /**
+ * Converts the dimension value to a dimension symbol, for example, <code>TRUE => 'T'</code>
+ * .
+ *
+ *@param dimensionValue a number that can be stored in the <code>IntersectionMatrix</code>
+ * . Possible values are <code>{TRUE, FALSE, DONTCARE, 0, 1, 2}</code>.
+ *@return a character for use in the string representation of
+ * an <code>IntersectionMatrix</code>. Possible values are <code>{T, F, * , 0, 1, 2}</code>
+ * .
+ */
+ public static char toDimensionSymbol(int dimensionValue) {
+ switch (dimensionValue) {
+ case FALSE:
+ return SYM_FALSE;
+ case TRUE:
+ return SYM_TRUE;
+ case DONTCARE:
+ return SYM_DONTCARE;
+ case P:
+ return SYM_P;
+ case L:
+ return SYM_L;
+ case A:
+ return SYM_A;
+ }
+ throw new IllegalArgumentException("Unknown dimension value: " + dimensionValue);
+ }
+
+ /**
+ * Converts the dimension symbol to a dimension value, for example, <code>'*' => DONTCARE</code>
+ * .
+ *
+ *@param dimensionSymbol a character for use in the string representation of
+ * an <code>IntersectionMatrix</code>. Possible values are <code>{T, F, * , 0, 1, 2}</code>
+ * .
+ *@return a number that can be stored in the <code>IntersectionMatrix</code>
+ * . Possible values are <code>{TRUE, FALSE, DONTCARE, 0, 1, 2}</code>.
+ */
+ public static int toDimensionValue(char dimensionSymbol) {
+ switch (Character.toUpperCase(dimensionSymbol)) {
+ case SYM_FALSE:
+ return FALSE;
+ case SYM_TRUE:
+ return TRUE;
+ case SYM_DONTCARE:
+ return DONTCARE;
+ case SYM_P:
+ return P;
+ case SYM_L:
+ return L;
+ case SYM_A:
+ return A;
+ }
+ throw new IllegalArgumentException("Unknown dimension symbol: " + dimensionSymbol);
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Envelope.java b/modules/core/src/main/java/org/locationtech/jts/geom/Envelope.java
new file mode 100644
index 0000000..d6d86d9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Envelope.java
@@ -0,0 +1,781 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.io.Serializable;
+
+/**
+ * Defines a rectangular region of the 2D coordinate plane.
+ * It is often used to represent the bounding box of a {@link Geometry},
+ * e.g. the minimum and maximum x and y values of the {@link Coordinate}s.
+ * <p>
+ * Envelopes support infinite or half-infinite regions, by using the values of
+ * <code>Double.POSITIVE_INFINITY</code> and <code>Double.NEGATIVE_INFINITY</code>.
+ * Envelope objects may have a null value.
+ * <p>
+ * When Envelope objects are created or initialized,
+ * the supplies extent values are automatically sorted into the correct order.
+ *
+ *@version 1.7
+ */
+public class Envelope
+ implements Comparable, Serializable
+{
+ private static final long serialVersionUID = 5873921885273102420L;
+
+ public int hashCode() {
+ //Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
+ int result = 17;
+ result = 37 * result + Coordinate.hashCode(minx);
+ result = 37 * result + Coordinate.hashCode(maxx);
+ result = 37 * result + Coordinate.hashCode(miny);
+ result = 37 * result + Coordinate.hashCode(maxy);
+ return result;
+ }
+
+ /**
+ * Test the point q to see whether it intersects the Envelope defined by p1-p2
+ * @param p1 one extremal point of the envelope
+ * @param p2 another extremal point of the envelope
+ * @param q the point to test for intersection
+ * @return <code>true</code> if q intersects the envelope p1-p2
+ */
+ public static boolean intersects(Coordinate p1, Coordinate p2, Coordinate q)
+ {
+ //OptimizeIt shows that Math#min and Math#max here are a bottleneck.
+ //Replace with direct comparisons. [Jon Aquino]
+ if (((q.x >= (p1.x < p2.x ? p1.x : p2.x)) && (q.x <= (p1.x > p2.x ? p1.x : p2.x))) &&
+ ((q.y >= (p1.y < p2.y ? p1.y : p2.y)) && (q.y <= (p1.y > p2.y ? p1.y : p2.y)))) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether the envelope defined by p1-p2
+ * and the envelope defined by q1-q2
+ * intersect.
+ *
+ * @param p1 one extremal point of the envelope P
+ * @param p2 another extremal point of the envelope P
+ * @param q1 one extremal point of the envelope Q
+ * @param q2 another extremal point of the envelope Q
+ * @return <code>true</code> if Q intersects P
+ */
+ public static boolean intersects(Coordinate p1, Coordinate p2, Coordinate q1, Coordinate q2)
+ {
+ double minq = Math.min(q1.x, q2.x);
+ double maxq = Math.max(q1.x, q2.x);
+ double minp = Math.min(p1.x, p2.x);
+ double maxp = Math.max(p1.x, p2.x);
+
+ if( minp > maxq )
+ return false;
+ if( maxp < minq )
+ return false;
+
+ minq = Math.min(q1.y, q2.y);
+ maxq = Math.max(q1.y, q2.y);
+ minp = Math.min(p1.y, p2.y);
+ maxp = Math.max(p1.y, p2.y);
+
+ if( minp > maxq )
+ return false;
+ if( maxp < minq )
+ return false;
+ return true;
+ }
+
+ /**
+ * the minimum x-coordinate
+ */
+ private double minx;
+
+ /**
+ * the maximum x-coordinate
+ */
+ private double maxx;
+
+ /**
+ * the minimum y-coordinate
+ */
+ private double miny;
+
+ /**
+ * the maximum y-coordinate
+ */
+ private double maxy;
+
+ /**
+ * Creates a null <code>Envelope</code>.
+ */
+ public Envelope() {
+ init();
+ }
+
+ /**
+ * Creates an <code>Envelope</code> for a region defined by maximum and minimum values.
+ *
+ *@param x1 the first x-value
+ *@param x2 the second x-value
+ *@param y1 the first y-value
+ *@param y2 the second y-value
+ */
+ public Envelope(double x1, double x2, double y1, double y2)
+ {
+ init(x1, x2, y1, y2);
+ }
+
+ /**
+ * Creates an <code>Envelope</code> for a region defined by two Coordinates.
+ *
+ *@param p1 the first Coordinate
+ *@param p2 the second Coordinate
+ */
+ public Envelope(Coordinate p1, Coordinate p2)
+ {
+ init(p1.x, p2.x, p1.y, p2.y);
+ }
+
+ /**
+ * Creates an <code>Envelope</code> for a region defined by a single Coordinate.
+ *
+ *@param p the Coordinate
+ */
+ public Envelope(Coordinate p)
+ {
+ init(p.x, p.x, p.y, p.y);
+ }
+
+ /**
+ * Create an <code>Envelope</code> from an existing Envelope.
+ *
+ *@param env the Envelope to initialize from
+ */
+ public Envelope(Envelope env)
+ {
+ init(env);
+ }
+
+ /**
+ * Initialize to a null <code>Envelope</code>.
+ */
+ public void init()
+ {
+ setToNull();
+ }
+
+ /**
+ * Initialize an <code>Envelope</code> for a region defined by maximum and minimum values.
+ *
+ *@param x1 the first x-value
+ *@param x2 the second x-value
+ *@param y1 the first y-value
+ *@param y2 the second y-value
+ */
+ public void init(double x1, double x2, double y1, double y2)
+ {
+ if (x1 < x2) {
+ minx = x1;
+ maxx = x2;
+ }
+ else {
+ minx = x2;
+ maxx = x1;
+ }
+ if (y1 < y2) {
+ miny = y1;
+ maxy = y2;
+ }
+ else {
+ miny = y2;
+ maxy = y1;
+ }
+ }
+
+ /**
+ * Initialize an <code>Envelope</code> to a region defined by two Coordinates.
+ *
+ *@param p1 the first Coordinate
+ *@param p2 the second Coordinate
+ */
+ public void init(Coordinate p1, Coordinate p2)
+ {
+ init(p1.x, p2.x, p1.y, p2.y);
+ }
+
+ /**
+ * Initialize an <code>Envelope</code> to a region defined by a single Coordinate.
+ *
+ *@param p the coordinate
+ */
+ public void init(Coordinate p)
+ {
+ init(p.x, p.x, p.y, p.y);
+ }
+
+ /**
+ * Initialize an <code>Envelope</code> from an existing Envelope.
+ *
+ *@param env the Envelope to initialize from
+ */
+ public void init(Envelope env)
+ {
+ this.minx = env.minx;
+ this.maxx = env.maxx;
+ this.miny = env.miny;
+ this.maxy = env.maxy;
+ }
+
+
+ /**
+ * Makes this <code>Envelope</code> a "null" envelope, that is, the envelope
+ * of the empty geometry.
+ */
+ public void setToNull() {
+ minx = 0;
+ maxx = -1;
+ miny = 0;
+ maxy = -1;
+ }
+
+ /**
+ * Returns <code>true</code> if this <code>Envelope</code> is a "null"
+ * envelope.
+ *
+ *@return <code>true</code> if this <code>Envelope</code> is uninitialized
+ * or is the envelope of the empty geometry.
+ */
+ public boolean isNull() {
+ return maxx < minx;
+ }
+
+ /**
+ * Returns the difference between the maximum and minimum x values.
+ *
+ *@return max x - min x, or 0 if this is a null <code>Envelope</code>
+ */
+ public double getWidth() {
+ if (isNull()) {
+ return 0;
+ }
+ return maxx - minx;
+ }
+
+ /**
+ * Returns the difference between the maximum and minimum y values.
+ *
+ *@return max y - min y, or 0 if this is a null <code>Envelope</code>
+ */
+ public double getHeight() {
+ if (isNull()) {
+ return 0;
+ }
+ return maxy - miny;
+ }
+
+ /**
+ * Returns the <code>Envelope</code>s minimum x-value. min x > max x
+ * indicates that this is a null <code>Envelope</code>.
+ *
+ *@return the minimum x-coordinate
+ */
+ public double getMinX() {
+ return minx;
+ }
+
+ /**
+ * Returns the <code>Envelope</code>s maximum x-value. min x > max x
+ * indicates that this is a null <code>Envelope</code>.
+ *
+ *@return the maximum x-coordinate
+ */
+ public double getMaxX() {
+ return maxx;
+ }
+
+ /**
+ * Returns the <code>Envelope</code>s minimum y-value. min y > max y
+ * indicates that this is a null <code>Envelope</code>.
+ *
+ *@return the minimum y-coordinate
+ */
+ public double getMinY() {
+ return miny;
+ }
+
+ /**
+ * Returns the <code>Envelope</code>s maximum y-value. min y > max y
+ * indicates that this is a null <code>Envelope</code>.
+ *
+ *@return the maximum y-coordinate
+ */
+ public double getMaxY() {
+ return maxy;
+ }
+
+ /**
+ * Gets the area of this envelope.
+ *
+ * @return the area of the envelope
+ * @return 0.0 if the envelope is null
+ */
+ public double getArea()
+ {
+ return getWidth() * getHeight();
+ }
+
+ /**
+ * Gets the minimum extent of this envelope across both dimensions.
+ *
+ * @return the minimum extent of this envelope
+ */
+ public double minExtent()
+ {
+ if (isNull()) return 0.0;
+ double w = getWidth();
+ double h = getHeight();
+ if (w < h) return w;
+ return h;
+ }
+
+ /**
+ * Gets the maximum extent of this envelope across both dimensions.
+ *
+ * @return the maximum extent of this envelope
+ */
+ public double maxExtent()
+ {
+ if (isNull()) return 0.0;
+ double w = getWidth();
+ double h = getHeight();
+ if (w > h) return w;
+ return h;
+ }
+
+ /**
+ * Enlarges this <code>Envelope</code> so that it contains
+ * the given {@link Coordinate}.
+ * Has no effect if the point is already on or within the envelope.
+ *
+ *@param p the Coordinate to expand to include
+ */
+ public void expandToInclude(Coordinate p)
+ {
+ expandToInclude(p.x, p.y);
+ }
+
+ /**
+ * Expands this envelope by a given distance in all directions.
+ * Both positive and negative distances are supported.
+ *
+ * @param distance the distance to expand the envelope
+ */
+ public void expandBy(double distance)
+ {
+ expandBy(distance, distance);
+ }
+
+ /**
+ * Expands this envelope by a given distance in all directions.
+ * Both positive and negative distances are supported.
+ *
+ * @param deltaX the distance to expand the envelope along the the X axis
+ * @param deltaY the distance to expand the envelope along the the Y axis
+ */
+ public void expandBy(double deltaX, double deltaY)
+ {
+ if (isNull()) return;
+
+ minx -= deltaX;
+ maxx += deltaX;
+ miny -= deltaY;
+ maxy += deltaY;
+
+ // check for envelope disappearing
+ if (minx > maxx || miny > maxy)
+ setToNull();
+ }
+
+ /**
+ * Enlarges this <code>Envelope</code> so that it contains
+ * the given point.
+ * Has no effect if the point is already on or within the envelope.
+ *
+ *@param x the value to lower the minimum x to or to raise the maximum x to
+ *@param y the value to lower the minimum y to or to raise the maximum y to
+ */
+ public void expandToInclude(double x, double y) {
+ if (isNull()) {
+ minx = x;
+ maxx = x;
+ miny = y;
+ maxy = y;
+ }
+ else {
+ if (x < minx) {
+ minx = x;
+ }
+ if (x > maxx) {
+ maxx = x;
+ }
+ if (y < miny) {
+ miny = y;
+ }
+ if (y > maxy) {
+ maxy = y;
+ }
+ }
+ }
+
+ /**
+ * Enlarges this <code>Envelope</code> so that it contains
+ * the <code>other</code> Envelope.
+ * Has no effect if <code>other</code> is wholly on or
+ * within the envelope.
+ *
+ *@param other the <code>Envelope</code> to expand to include
+ */
+ public void expandToInclude(Envelope other) {
+ if (other.isNull()) {
+ return;
+ }
+ if (isNull()) {
+ minx = other.getMinX();
+ maxx = other.getMaxX();
+ miny = other.getMinY();
+ maxy = other.getMaxY();
+ }
+ else {
+ if (other.minx < minx) {
+ minx = other.minx;
+ }
+ if (other.maxx > maxx) {
+ maxx = other.maxx;
+ }
+ if (other.miny < miny) {
+ miny = other.miny;
+ }
+ if (other.maxy > maxy) {
+ maxy = other.maxy;
+ }
+ }
+ }
+
+ /**
+ * Translates this envelope by given amounts in the X and Y direction.
+ *
+ * @param transX the amount to translate along the X axis
+ * @param transY the amount to translate along the Y axis
+ */
+ public void translate(double transX, double transY) {
+ if (isNull()) {
+ return;
+ }
+ init(getMinX() + transX, getMaxX() + transX,
+ getMinY() + transY, getMaxY() + transY);
+ }
+
+ /**
+ * Computes the coordinate of the centre of this envelope (as long as it is non-null
+ *
+ * @return the centre coordinate of this envelope
+ * <code>null</code> if the envelope is null
+ */
+ public Coordinate centre() {
+ if (isNull()) return null;
+ return new Coordinate(
+ (getMinX() + getMaxX()) / 2.0,
+ (getMinY() + getMaxY()) / 2.0);
+ }
+
+ /**
+ * Computes the intersection of two {@link Envelope}s.
+ *
+ * @param env the envelope to intersect with
+ * @return a new Envelope representing the intersection of the envelopes (this will be
+ * the null envelope if either argument is null, or they do not intersect
+ */
+ public Envelope intersection(Envelope env)
+ {
+ if (isNull() || env.isNull() || ! intersects(env)) return new Envelope();
+
+ double intMinX = minx > env.minx ? minx : env.minx;
+ double intMinY = miny > env.miny ? miny : env.miny;
+ double intMaxX = maxx < env.maxx ? maxx : env.maxx;
+ double intMaxY = maxy < env.maxy ? maxy : env.maxy;
+ return new Envelope(intMinX, intMaxX, intMinY, intMaxY);
+ }
+
+ /**
+ * Check if the region defined by <code>other</code>
+ * intersects the region of this <code>Envelope</code>.
+ *
+ *@param other the <code>Envelope</code> which this <code>Envelope</code> is
+ * being checked for intersecting
+ *@return <code>true</code> if the <code>Envelope</code>s intersect
+ */
+ public boolean intersects(Envelope other) {
+ if (isNull() || other.isNull()) { return false; }
+ return !(other.minx > maxx ||
+ other.maxx < minx ||
+ other.miny > maxy ||
+ other.maxy < miny);
+ }
+ /**
+ * Check if the extent defined by two extremal points
+ * intersects the extent of this <code>Envelope</code>.
+ *
+ *@param a a point
+ *@param b another point
+ *@return <code>true</code> if the extents intersect
+ */
+ public boolean intersects(Coordinate a, Coordinate b) {
+ if (isNull()) { return false; }
+
+ double envminx = (a.x < b.x) ? a.x : b.x;
+ if (envminx > maxx) return false;
+
+ double envmaxx = (a.x > b.x) ? a.x : b.x;
+ if (envmaxx < minx) return false;
+
+ double envminy = (a.y < b.y) ? a.y : b.y;
+ if (envminy > maxy) return false;
+
+ double envmaxy = (a.y > b.y) ? a.y : b.y;
+ if (envmaxy < miny) return false;
+
+ return true;
+ }
+ /**
+ * @deprecated Use #intersects instead. In the future, #overlaps may be
+ * changed to be a true overlap check; that is, whether the intersection is
+ * two-dimensional.
+ */
+ public boolean overlaps(Envelope other) {
+ return intersects(other);
+ }
+
+ /**
+ * Check if the point <code>p</code>
+ * intersects (lies inside) the region of this <code>Envelope</code>.
+ *
+ *@param p the <code>Coordinate</code> to be tested
+ *@return <code>true</code> if the point intersects this <code>Envelope</code>
+ */
+ public boolean intersects(Coordinate p) {
+ return intersects(p.x, p.y);
+ }
+ /**
+ * @deprecated Use #intersects instead.
+ */
+ public boolean overlaps(Coordinate p) {
+ return intersects(p);
+ }
+ /**
+ * Check if the point <code>(x, y)</code>
+ * intersects (lies inside) the region of this <code>Envelope</code>.
+ *
+ *@param x the x-ordinate of the point
+ *@param y the y-ordinate of the point
+ *@return <code>true</code> if the point overlaps this <code>Envelope</code>
+ */
+ public boolean intersects(double x, double y) {
+ if (isNull()) return false;
+ return ! (x > maxx ||
+ x < minx ||
+ y > maxy ||
+ y < miny);
+ }
+ /**
+ * @deprecated Use #intersects instead.
+ */
+ public boolean overlaps(double x, double y) {
+ return intersects(x, y);
+ }
+
+ /**
+ * Tests if the <code>Envelope other</code>
+ * lies wholely inside this <code>Envelope</code> (inclusive of the boundary).
+ * <p>
+ * Note that this is <b>not</b> the same definition as the SFS <tt>contains</tt>,
+ * which would exclude the envelope boundary.
+ *
+ *@param other the <code>Envelope</code> to check
+ *@return true if <code>other</code> is contained in this <code>Envelope</code>
+ *
+ *@see #covers(Envelope)
+ */
+ public boolean contains(Envelope other) {
+ return covers(other);
+ }
+
+ /**
+ * Tests if the given point lies in or on the envelope.
+ * <p>
+ * Note that this is <b>not</b> the same definition as the SFS <tt>contains</tt>,
+ * which would exclude the envelope boundary.
+ *
+ *@param p the point which this <code>Envelope</code> is
+ * being checked for containing
+ *@return <code>true</code> if the point lies in the interior or
+ * on the boundary of this <code>Envelope</code>.
+ *
+ *@see #covers(Coordinate)
+ */
+ public boolean contains(Coordinate p) {
+ return covers(p);
+ }
+
+ /**
+ * Tests if the given point lies in or on the envelope.
+ * <p>
+ * Note that this is <b>not</b> the same definition as the SFS <tt>contains</tt>,
+ * which would exclude the envelope boundary.
+ *
+ *@param x the x-coordinate of the point which this <code>Envelope</code> is
+ * being checked for containing
+ *@param y the y-coordinate of the point which this <code>Envelope</code> is
+ * being checked for containing
+ *@return <code>true</code> if <code>(x, y)</code> lies in the interior or
+ * on the boundary of this <code>Envelope</code>.
+ *
+ *@see #covers(double, double)
+ */
+ public boolean contains(double x, double y) {
+ return covers(x, y);
+ }
+
+ /**
+ * Tests if the given point lies in or on the envelope.
+ *
+ *@param x the x-coordinate of the point which this <code>Envelope</code> is
+ * being checked for containing
+ *@param y the y-coordinate of the point which this <code>Envelope</code> is
+ * being checked for containing
+ *@return <code>true</code> if <code>(x, y)</code> lies in the interior or
+ * on the boundary of this <code>Envelope</code>.
+ */
+ public boolean covers(double x, double y) {
+ if (isNull()) return false;
+ return x >= minx &&
+ x <= maxx &&
+ y >= miny &&
+ y <= maxy;
+ }
+
+ /**
+ * Tests if the given point lies in or on the envelope.
+ *
+ *@param p the point which this <code>Envelope</code> is
+ * being checked for containing
+ *@return <code>true</code> if the point lies in the interior or
+ * on the boundary of this <code>Envelope</code>.
+ */
+ public boolean covers(Coordinate p) {
+ return covers(p.x, p.y);
+ }
+
+ /**
+ * Tests if the <code>Envelope other</code>
+ * lies wholely inside this <code>Envelope</code> (inclusive of the boundary).
+ *
+ *@param other the <code>Envelope</code> to check
+ *@return true if this <code>Envelope</code> covers the <code>other</code>
+ */
+ public boolean covers(Envelope other) {
+ if (isNull() || other.isNull()) { return false; }
+ return other.getMinX() >= minx &&
+ other.getMaxX() <= maxx &&
+ other.getMinY() >= miny &&
+ other.getMaxY() <= maxy;
+ }
+
+ /**
+ * Computes the distance between this and another
+ * <code>Envelope</code>.
+ * The distance between overlapping Envelopes is 0. Otherwise, the
+ * distance is the Euclidean distance between the closest points.
+ */
+ public double distance(Envelope env)
+ {
+ if (intersects(env)) return 0;
+
+ double dx = 0.0;
+ if (maxx < env.minx)
+ dx = env.minx - maxx;
+ else if (minx > env.maxx)
+ dx = minx - env.maxx;
+
+ double dy = 0.0;
+ if (maxy < env.miny)
+ dy = env.miny - maxy;
+ else if (miny > env.maxy) dy = miny - env.maxy;
+
+ // if either is zero, the envelopes overlap either vertically or horizontally
+ if (dx == 0.0) return dy;
+ if (dy == 0.0) return dx;
+ return Math.sqrt(dx * dx + dy * dy);
+ }
+
+ public boolean equals(Object other) {
+ if (!(other instanceof Envelope)) {
+ return false;
+ }
+ Envelope otherEnvelope = (Envelope) other;
+ if (isNull()) {
+ return otherEnvelope.isNull();
+ }
+ return maxx == otherEnvelope.getMaxX() &&
+ maxy == otherEnvelope.getMaxY() &&
+ minx == otherEnvelope.getMinX() &&
+ miny == otherEnvelope.getMinY();
+ }
+
+ public String toString()
+ {
+ return "Env[" + minx + " : " + maxx + ", " + miny + " : " + maxy + "]";
+ }
+
+ /**
+ * Compares two envelopes using lexicographic ordering.
+ * The ordering comparison is based on the usual numerical
+ * comparison between the sequence of ordinates.
+ * Null envelopes are less than all non-null envelopes.
+ *
+ * @param o an Envelope object
+ */
+ public int compareTo(Object o) {
+ Envelope env = (Envelope) o;
+ // compare nulls if present
+ if (isNull()) {
+ if (env.isNull()) return 0;
+ return -1;
+ }
+ else {
+ if (env.isNull()) return 1;
+ }
+ // compare based on numerical ordering of ordinates
+ if (minx < env.minx) return -1;
+ if (minx > env.minx) return 1;
+ if (miny < env.miny) return -1;
+ if (miny > env.miny) return 1;
+ if (maxx < env.maxx) return -1;
+ if (maxx > env.maxx) return 1;
+ if (maxy < env.maxy) return -1;
+ if (maxy > env.maxy) return 1;
+ return 0;
+
+
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Geometry.java b/modules/core/src/main/java/org/locationtech/jts/geom/Geometry.java
new file mode 100644
index 0000000..62e43db
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Geometry.java
@@ -0,0 +1,1907 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.algorithm.Centroid;
+import org.locationtech.jts.algorithm.ConvexHull;
+import org.locationtech.jts.algorithm.InteriorPointArea;
+import org.locationtech.jts.algorithm.InteriorPointLine;
+import org.locationtech.jts.algorithm.InteriorPointPoint;
+import org.locationtech.jts.geom.util.GeometryCollectionMapper;
+import org.locationtech.jts.geom.util.GeometryMapper;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.operation.IsSimpleOp;
+import org.locationtech.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.operation.distance.DistanceOp;
+import org.locationtech.jts.operation.linemerge.LineMerger;
+import org.locationtech.jts.operation.overlay.OverlayOp;
+import org.locationtech.jts.operation.overlay.snap.SnapIfNeededOverlayOp;
+import org.locationtech.jts.operation.predicate.RectangleContains;
+import org.locationtech.jts.operation.predicate.RectangleIntersects;
+import org.locationtech.jts.operation.relate.RelateOp;
+import org.locationtech.jts.operation.union.UnaryUnionOp;
+import org.locationtech.jts.operation.valid.IsValidOp;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * A representation of a planar, linear vector geometry.
+ * <P>
+ *
+ * <H3>Binary Predicates</H3>
+ * Because it is not clear at this time
+ * what semantics for spatial
+ * analysis methods involving <code>GeometryCollection</code>s would be useful,
+ * <code>GeometryCollection</code>s are not supported as arguments to binary
+ * predicates or the <code>relate</code>
+ * method.
+ *
+ * <H3>Overlay Methods</H3>
+ *
+ * The overlay methods
+ * return the most specific class possible to represent the result. If the
+ * result is homogeneous, a <code>Point</code>, <code>LineString</code>, or
+ * <code>Polygon</code> will be returned if the result contains a single
+ * element; otherwise, a <code>MultiPoint</code>, <code>MultiLineString</code>,
+ * or <code>MultiPolygon</code> will be returned. If the result is
+ * heterogeneous a <code>GeometryCollection</code> will be returned. <P>
+ *
+ * Because it is not clear at this time what semantics for set-theoretic
+ * methods involving <code>GeometryCollection</code>s would be useful,
+ * <code>GeometryCollections</code>
+ * are not supported as arguments to the set-theoretic methods.
+ *
+ * <H4>Representation of Computed Geometries </H4>
+ *
+ * The SFS states that the result
+ * of a set-theoretic method is the "point-set" result of the usual
+ * set-theoretic definition of the operation (SFS 3.2.21.1). However, there are
+ * sometimes many ways of representing a point set as a <code>Geometry</code>.
+ * <P>
+ *
+ * The SFS does not specify an unambiguous representation of a given point set
+ * returned from a spatial analysis method. One goal of JTS is to make this
+ * specification precise and unambiguous. JTS uses a canonical form for
+ * <code>Geometry</code>s returned from overlay methods. The canonical
+ * form is a <code>Geometry</code> which is simple and noded:
+ * <UL>
+ * <LI> Simple means that the Geometry returned will be simple according to
+ * the JTS definition of <code>isSimple</code>.
+ * <LI> Noded applies only to overlays involving <code>LineString</code>s. It
+ * means that all intersection points on <code>LineString</code>s will be
+ * present as endpoints of <code>LineString</code>s in the result.
+ * </UL>
+ * This definition implies that non-simple geometries which are arguments to
+ * spatial analysis methods must be subjected to a line-dissolve process to
+ * ensure that the results are simple.
+ *
+ * <H4> Constructed Points And The Precision Model </H4>
+ *
+ * The results computed by the set-theoretic methods may
+ * contain constructed points which are not present in the input <code>Geometry</code>
+ * s. These new points arise from intersections between line segments in the
+ * edges of the input <code>Geometry</code>s. In the general case it is not
+ * possible to represent constructed points exactly. This is due to the fact
+ * that the coordinates of an intersection point may contain twice as many bits
+ * of precision as the coordinates of the input line segments. In order to
+ * represent these constructed points explicitly, JTS must truncate them to fit
+ * the <code>PrecisionModel</code>. <P>
+ *
+ * Unfortunately, truncating coordinates moves them slightly. Line segments
+ * which would not be coincident in the exact result may become coincident in
+ * the truncated representation. This in turn leads to "topology collapses" --
+ * situations where a computed element has a lower dimension than it would in
+ * the exact result. <P>
+ *
+ * When JTS detects topology collapses during the computation of spatial
+ * analysis methods, it will throw an exception. If possible the exception will
+ * report the location of the collapse. <P>
+ *
+ * <h3>Geometry Equality</h3>
+ *
+ * There are two ways of comparing geometries for equality:
+ * <b>structural equality</b> and <b>topological equality</b>.
+ *
+ * <h4>Structural Equality</h4>
+ *
+ * Structural Equality is provided by the
+ * {@link #equalsExact(Geometry)} method.
+ * This implements a comparison based on exact, structural pointwise
+ * equality.
+ * The {@link #equals(Object)} is a synonym for this method,
+ * to provide structural equality semantics for
+ * use in Java collections.
+ * It is important to note that structural pointwise equality
+ * is easily affected by things like
+ * ring order and component order. In many situations
+ * it will be desirable to normalize geometries before
+ * comparing them (using the {@link #norm()}
+ * or {@link #normalize()} methods).
+ * {@link #equalsNorm(Geometry)} is provided
+ * as a convenience method to compute equality over
+ * normalized geometries, but it is expensive to use.
+ * Finally, {@link #equalsExact(Geometry, double)}
+ * allows using a tolerance value for point comparison.
+ *
+ *
+ * <h4>Topological Equality</h4>
+ *
+ * Topological Equality is provided by the
+ * {@link #equalsTopo(Geometry)} method.
+ * It implements the SFS definition of point-set equality
+ * defined in terms of the DE-9IM matrix.
+ * To support the SFS naming convention, the method
+ * {@link #equals(Geometry)} is also provided as a synonym.
+ * However, due to the potential for confusion with {@link #equals(Object)}
+ * its use is discouraged.
+ * <p>
+ * Since {@link #equals(Object)} and {@link #hashCode()} are overridden,
+ * Geometries can be used effectively in Java collections.
+ *
+ *@version 1.7
+ */
+public abstract class Geometry
+ implements Cloneable, Comparable, Serializable
+{
+ private static final long serialVersionUID = 8763622679187376702L;
+
+ static final int SORTINDEX_POINT = 0;
+ static final int SORTINDEX_MULTIPOINT = 1;
+ static final int SORTINDEX_LINESTRING = 2;
+ static final int SORTINDEX_LINEARRING = 3;
+ static final int SORTINDEX_MULTILINESTRING = 4;
+ static final int SORTINDEX_POLYGON = 5;
+ static final int SORTINDEX_MULTIPOLYGON = 6;
+ static final int SORTINDEX_GEOMETRYCOLLECTION = 7;
+
+ private final static GeometryComponentFilter geometryChangedFilter = new GeometryComponentFilter() {
+ public void filter(Geometry geom) {
+ geom.geometryChangedAction();
+ }
+ };
+
+ /**
+ * The bounding box of this <code>Geometry</code>.
+ */
+ protected Envelope envelope;
+
+ /**
+ * The {@link GeometryFactory} used to create this Geometry
+ */
+ protected final GeometryFactory factory;
+
+ /**
+ * The ID of the Spatial Reference System used by this <code>Geometry</code>
+ */
+ protected int SRID;
+
+ /**
+ * An object reference which can be used to carry ancillary data defined
+ * by the client.
+ */
+ private Object userData = null;
+
+ /**
+ * Creates a new <code>Geometry</code> via the specified GeometryFactory.
+ *
+ * @param factory
+ */
+ public Geometry(GeometryFactory factory) {
+ this.factory = factory;
+ this.SRID = factory.getSRID();
+ }
+
+ /**
+ * Returns the name of this Geometry's actual class.
+ *
+ *@return the name of this <code>Geometry</code>s actual class
+ */
+ public abstract String getGeometryType();
+
+ /**
+ * Returns true if the array contains any non-empty <code>Geometry</code>s.
+ *
+ *@param geometries an array of <code>Geometry</code>s; no elements may be
+ * <code>null</code>
+ *@return <code>true</code> if any of the <code>Geometry</code>s
+ * <code>isEmpty</code> methods return <code>false</code>
+ */
+ protected static boolean hasNonEmptyElements(Geometry[] geometries) {
+ for (int i = 0; i < geometries.length; i++) {
+ if (!geometries[i].isEmpty()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if the array contains any <code>null</code> elements.
+ *
+ *@param array an array to validate
+ *@return <code>true</code> if any of <code>array</code>s elements are
+ * <code>null</code>
+ */
+ protected static boolean hasNullElements(Object[] array) {
+ for (int i = 0; i < array.length; i++) {
+ if (array[i] == null) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Returns the ID of the Spatial Reference System used by the <code>Geometry</code>.
+ * <P>
+ *
+ * JTS supports Spatial Reference System information in the simple way
+ * defined in the SFS. A Spatial Reference System ID (SRID) is present in
+ * each <code>Geometry</code> object. <code>Geometry</code> provides basic
+ * accessor operations for this field, but no others. The SRID is represented
+ * as an integer.
+ *
+ *@return the ID of the coordinate space in which the <code>Geometry</code>
+ * is defined.
+ *
+ */
+ public int getSRID() {
+ return SRID;
+ }
+ /**
+ * Sets the ID of the Spatial Reference System used by the <code>Geometry</code>.
+ * <p>
+ * <b>NOTE:</b> This method should only be used for exceptional circumstances or
+ * for backwards compatibility. Normally the SRID should be set on the
+ * {@link GeometryFactory} used to create the geometry.
+ * SRIDs set using this method will <i>not</i> be propagated to
+ * geometries returned by constructive methods.
+ *
+ * @see GeometryFactory
+ */
+ public void setSRID(int SRID) {
+ this.SRID = SRID;
+ }
+
+ /**
+ * Gets the factory which contains the context in which this geometry was created.
+ *
+ * @return the factory for this geometry
+ */
+ public GeometryFactory getFactory() {
+ return factory;
+ }
+
+ /**
+ * Gets the user data object for this geometry, if any.
+ *
+ * @return the user data object, or <code>null</code> if none set
+ */
+ public Object getUserData() {
+ return userData;
+ }
+
+ /**
+ * Returns the number of {@link Geometry}s in a {@link GeometryCollection}
+ * (or 1, if the geometry is not a collection).
+ *
+ * @return the number of geometries contained in this geometry
+ */
+ public int getNumGeometries() {
+ return 1;
+ }
+
+ /**
+ * Returns an element {@link Geometry} from a {@link GeometryCollection}
+ * (or <code>this</code>, if the geometry is not a collection).
+ *
+ * @param n the index of the geometry element
+ * @return the n'th geometry contained in this geometry
+ */
+ public Geometry getGeometryN(int n) {
+ return this;
+ }
+
+
+ /**
+ * A simple scheme for applications to add their own custom data to a Geometry.
+ * An example use might be to add an object representing a Coordinate Reference System.
+ * <p>
+ * Note that user data objects are not present in geometries created by
+ * construction methods.
+ *
+ * @param userData an object, the semantics for which are defined by the
+ * application using this Geometry
+ */
+ public void setUserData(Object userData) {
+ this.userData = userData;
+ }
+
+
+ /**
+ * Returns the <code>PrecisionModel</code> used by the <code>Geometry</code>.
+ *
+ *@return the specification of the grid of allowable points, for this
+ * <code>Geometry</code> and all other <code>Geometry</code>s
+ */
+ public PrecisionModel getPrecisionModel() {
+ return factory.getPrecisionModel();
+ }
+
+ /**
+ * Returns a vertex of this <code>Geometry</code>
+ * (usually, but not necessarily, the first one).
+ * The returned coordinate should not be assumed
+ * to be an actual Coordinate object used in
+ * the internal representation.
+ *
+ *@return a {@link Coordinate} which is a vertex of this <code>Geometry</code>.
+ *@return null if this Geometry is empty
+ */
+ public abstract Coordinate getCoordinate();
+
+ /**
+ * Returns an array containing the values of all the vertices for
+ * this geometry.
+ * If the geometry is a composite, the array will contain all the vertices
+ * for the components, in the order in which the components occur in the geometry.
+ * <p>
+ * In general, the array cannot be assumed to be the actual internal
+ * storage for the vertices. Thus modifying the array
+ * may not modify the geometry itself.
+ * Use the {@link CoordinateSequence#setOrdinate} method
+ * (possibly on the components) to modify the underlying data.
+ * If the coordinates are modified,
+ * {@link #geometryChanged} must be called afterwards.
+ *
+ *@return the vertices of this <code>Geometry</code>
+ *@see #geometryChanged
+ *@see CoordinateSequence#setOrdinate
+ */
+ public abstract Coordinate[] getCoordinates();
+
+ /**
+ * Returns the count of this <code>Geometry</code>s vertices. The <code>Geometry</code>
+ * s contained by composite <code>Geometry</code>s must be
+ * Geometry's; that is, they must implement <code>getNumPoints</code>
+ *
+ *@return the number of vertices in this <code>Geometry</code>
+ */
+ public abstract int getNumPoints();
+
+ /**
+ * Tests whether this {@link Geometry} is simple.
+ * The SFS definition of simplicity
+ * follows the general rule that a Geometry is simple if it has no points of
+ * self-tangency, self-intersection or other anomalous points.
+ * <p>
+ * Simplicity is defined for each {@link Geometry} subclass as follows:
+ * <ul>
+ * <li>Valid polygonal geometries are simple, since their rings
+ * must not self-intersect. <code>isSimple</code>
+ * tests for this condition and reports <code>false</code> if it is not met.
+ * (This is a looser test than checking for validity).
+ * <li>Linear rings have the same semantics.
+ * <li>Linear geometries are simple iff they do not self-intersect at points
+ * other than boundary points.
+ * <li>Zero-dimensional geometries (points) are simple iff they have no
+ * repeated points.
+ * <li>Empty <code>Geometry</code>s are always simple.
+ * </ul>
+ *
+ * @return <code>true</code> if this <code>Geometry</code> is simple
+ * @see #isValid
+ */
+ public boolean isSimple()
+ {
+ IsSimpleOp op = new IsSimpleOp(this);
+ return op.isSimple();
+ }
+
+ /**
+ * Tests whether this <code>Geometry</code>
+ * is topologically valid, according to the OGC SFS specification.
+ * <p>
+ * For validity rules see the Javadoc for the specific Geometry subclass.
+ *
+ *@return <code>true</code> if this <code>Geometry</code> is valid
+ *
+ * @see IsValidOp
+ */
+ public boolean isValid()
+ {
+ return IsValidOp.isValid(this);
+ }
+
+ /**
+ * Tests whether the set of points covered by this <code>Geometry</code> is
+ * empty.
+ *
+ *@return <code>true</code> if this <code>Geometry</code> does not cover any points
+ */
+ public abstract boolean isEmpty();
+
+ /**
+ * Returns the minimum distance between this <code>Geometry</code>
+ * and another <code>Geometry</code>.
+ *
+ * @param g the <code>Geometry</code> from which to compute the distance
+ * @return the distance between the geometries
+ * @return 0 if either input geometry is empty
+ * @throws IllegalArgumentException if g is null
+ */
+ public double distance(Geometry g)
+ {
+ return DistanceOp.distance(this, g);
+ }
+
+ /**
+ * Tests whether the distance from this <code>Geometry</code>
+ * to another is less than or equal to a specified value.
+ *
+ * @param geom the Geometry to check the distance to
+ * @param distance the distance value to compare
+ * @return <code>true</code> if the geometries are less than <code>distance</code> apart.
+ */
+ public boolean isWithinDistance(Geometry geom, double distance)
+ {
+ double envDist = getEnvelopeInternal().distance(geom.getEnvelopeInternal());
+ if (envDist > distance)
+ return false;
+ return DistanceOp.isWithinDistance(this, geom, distance);
+ /*
+ double geomDist = this.distance(geom);
+ if (geomDist > distance)
+ return false;
+ return true;
+ */
+ }
+
+ public boolean isRectangle()
+ {
+ // Polygon overrides to check for actual rectangle
+ return false;
+ }
+
+ /**
+ * Returns the area of this <code>Geometry</code>.
+ * Areal Geometries have a non-zero area.
+ * They override this function to compute the area.
+ * Others return 0.0
+ *
+ *@return the area of the Geometry
+ */
+ public double getArea()
+ {
+ return 0.0;
+ }
+
+ /**
+ * Returns the length of this <code>Geometry</code>.
+ * Linear geometries return their length.
+ * Areal geometries return their perimeter.
+ * They override this function to compute the area.
+ * Others return 0.0
+ *
+ *@return the length of the Geometry
+ */
+ public double getLength()
+ {
+ return 0.0;
+ }
+
+ /**
+ * Computes the centroid of this <code>Geometry</code>.
+ * The centroid
+ * is equal to the centroid of the set of component Geometries of highest
+ * dimension (since the lower-dimension geometries contribute zero
+ * "weight" to the centroid).
+ * <p>
+ * The centroid of an empty geometry is <code>POINT EMPTY</code>.
+ *
+ * @return a {@link Point} which is the centroid of this Geometry
+ */
+ public Point getCentroid()
+ {
+ if (isEmpty())
+ return factory.createPoint();
+ Coordinate centPt = Centroid.getCentroid(this);
+ return createPointFromInternalCoord(centPt, this);
+ }
+
+ /**
+ * Computes an interior point of this <code>Geometry</code>.
+ * An interior point is guaranteed to lie in the interior of the Geometry,
+ * if it possible to calculate such a point exactly. Otherwise,
+ * the point may lie on the boundary of the geometry.
+ * <p>
+ * The interior point of an empty geometry is <code>POINT EMPTY</code>.
+ *
+ * @return a {@link Point} which is in the interior of this Geometry
+ */
+ public Point getInteriorPoint()
+ {
+ if (isEmpty())
+ return factory.createPoint();
+ Coordinate interiorPt = null;
+ int dim = getDimension();
+ if (dim == 0) {
+ InteriorPointPoint intPt = new InteriorPointPoint(this);
+ interiorPt = intPt.getInteriorPoint();
+ }
+ else if (dim == 1) {
+ InteriorPointLine intPt = new InteriorPointLine(this);
+ interiorPt = intPt.getInteriorPoint();
+ }
+ else {
+ InteriorPointArea intPt = new InteriorPointArea(this);
+ interiorPt = intPt.getInteriorPoint();
+ }
+ return createPointFromInternalCoord(interiorPt, this);
+ }
+
+ /**
+ * Returns the dimension of this geometry.
+ * The dimension of a geometry is is the topological
+ * dimension of its embedding in the 2-D Euclidean plane.
+ * In the JTS spatial model, dimension values are in the set {0,1,2}.
+ * <p>
+ * Note that this is a different concept to the dimension of
+ * the vertex {@link Coordinate}s.
+ * The geometry dimension can never be greater than the coordinate dimension.
+ * For example, a 0-dimensional geometry (e.g. a Point)
+ * may have a coordinate dimension of 3 (X,Y,Z).
+ *
+ *@return the topological dimension of this geometry.
+ */
+ public abstract int getDimension();
+
+ /**
+ * Returns the boundary, or an empty geometry of appropriate dimension
+ * if this <code>Geometry</code> is empty.
+ * (In the case of zero-dimensional geometries, '
+ * an empty GeometryCollection is returned.)
+ * For a discussion of this function, see the OpenGIS Simple
+ * Features Specification. As stated in SFS Section 2.1.13.1, "the boundary
+ * of a Geometry is a set of Geometries of the next lower dimension."
+ *
+ *@return the closure of the combinatorial boundary of this <code>Geometry</code>
+ */
+ public abstract Geometry getBoundary();
+
+ /**
+ * Returns the dimension of this <code>Geometry</code>s inherent boundary.
+ *
+ *@return the dimension of the boundary of the class implementing this
+ * interface, whether or not this object is the empty geometry. Returns
+ * <code>Dimension.FALSE</code> if the boundary is the empty geometry.
+ */
+ public abstract int getBoundaryDimension();
+
+ /**
+ * Gets a Geometry representing the envelope (bounding box) of
+ * this <code>Geometry</code>.
+ * <p>
+ * If this <code>Geometry</code> is:
+ * <ul>
+ * <li>empty, returns an empty <code>Point</code>.
+ * <li>a point, returns a <code>Point</code>.
+ * <li>a line parallel to an axis, a two-vertex <code>LineString</code>
+ * <li>otherwise, returns a
+ * <code>Polygon</code> whose vertices are (minx miny, maxx miny,
+ * maxx maxy, minx maxy, minx miny).
+ * </ul>
+ *
+ *@return a Geometry representing the envelope of this Geometry
+ *
+ * @see GeometryFactory#toGeometry(Envelope)
+ */
+ public Geometry getEnvelope() {
+ return getFactory().toGeometry(getEnvelopeInternal());
+ }
+
+ /**
+ * Gets an {@link Envelope} containing
+ * the minimum and maximum x and y values in this <code>Geometry</code>.
+ * If the geometry is empty, an empty <code>Envelope</code>
+ * is returned.
+ * <p>
+ * The returned object is a copy of the one maintained internally,
+ * to avoid aliasing issues.
+ * For best performance, clients which access this
+ * envelope frequently should cache the return value.
+ *
+ *@return the envelope of this <code>Geometry</code>.
+ *@return an empty Envelope if this Geometry is empty
+ */
+ public Envelope getEnvelopeInternal() {
+ if (envelope == null) {
+ envelope = computeEnvelopeInternal();
+ }
+ return new Envelope(envelope);
+ }
+
+ /**
+ * Notifies this geometry that its coordinates have been changed by an external
+ * party (for example, via a {@link CoordinateFilter}).
+ * When this method is called the geometry will flush
+ * and/or update any derived information it has cached (such as its {@link Envelope} ).
+ * The operation is applied to all component Geometries.
+ */
+ public void geometryChanged() {
+ apply(geometryChangedFilter);
+ }
+
+ /**
+ * Notifies this Geometry that its Coordinates have been changed by an external
+ * party. When #geometryChanged is called, this method will be called for
+ * this Geometry and its component Geometries.
+ *
+ * @see #apply(GeometryComponentFilter)
+ */
+ protected void geometryChangedAction() {
+ envelope = null;
+ }
+
+ /**
+ * Tests whether this geometry is disjoint from the argument geometry.
+ * <p>
+ * The <code>disjoint</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>The two geometries have no point in common
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * <code>[FF*FF****]</code>
+ * <li><code>! g.intersects(this) = true</code>
+ * <br>(<code>disjoint</code> is the inverse of <code>intersects</code>)
+ * </ul>
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s are
+ * disjoint
+ *
+ * @see Geometry#intersects
+ */
+ public boolean disjoint(Geometry g) {
+ return ! intersects(g);
+ }
+
+ /**
+ * Tests whether this geometry touches the
+ * argument geometry.
+ * <p>
+ * The <code>touches</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>The geometries have at least one point in common,
+ * but their interiors do not intersect.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * at least one of the following patterns
+ * <ul>
+ * <li><code>[FT*******]</code>
+ * <li><code>[F**T*****]</code>
+ * <li><code>[F***T****]</code>
+ * </ul>
+ * </ul>
+ * If both geometries have dimension 0, the predicate returns <code>false</code>,
+ * since points have only interiors.
+ * This predicate is symmetric.
+ *
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s touch;
+ * Returns <code>false</code> if both <code>Geometry</code>s are points
+ */
+ public boolean touches(Geometry g) {
+ // short-circuit test
+ if (! getEnvelopeInternal().intersects(g.getEnvelopeInternal()))
+ return false;
+ return relate(g).isTouches(getDimension(), g.getDimension());
+ }
+
+ /**
+ * Tests whether this geometry intersects the argument geometry.
+ * <p>
+ * The <code>intersects</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>The two geometries have at least one point in common
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * at least one of the patterns
+ * <ul>
+ * <li><code>[T********]</code>
+ * <li><code>[*T*******]</code>
+ * <li><code>[***T*****]</code>
+ * <li><code>[****T****]</code>
+ * </ul>
+ * <li><code>! g.disjoint(this) = true</code>
+ * <br>(<code>intersects</code> is the inverse of <code>disjoint</code>)
+ * </ul>
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s intersect
+ *
+ * @see Geometry#disjoint
+ */
+ public boolean intersects(Geometry g) {
+
+ // short-circuit envelope test
+ if (! getEnvelopeInternal().intersects(g.getEnvelopeInternal()))
+ return false;
+
+ /**
+ * TODO: (MD) Add optimizations:
+ *
+ * - for P-A case:
+ * If P is in env(A), test for point-in-poly
+ *
+ * - for A-A case:
+ * If env(A1).overlaps(env(A2))
+ * test for overlaps via point-in-poly first (both ways)
+ * Possibly optimize selection of point to test by finding point of A1
+ * closest to centre of env(A2).
+ * (Is there a test where we shouldn't bother - e.g. if env A
+ * is much smaller than env B, maybe there's no point in testing
+ * pt(B) in env(A)?
+ */
+
+ // optimization for rectangle arguments
+ if (isRectangle()) {
+ return RectangleIntersects.intersects((Polygon) this, g);
+ }
+ if (g.isRectangle()) {
+ return RectangleIntersects.intersects((Polygon) g, this);
+ }
+ if (isGeometryCollection() || g.isGeometryCollection()) {
+ boolean r = false;
+ for (int i = 0 ; i < getNumGeometries() ; i++) {
+ for (int j = 0 ; j < g.getNumGeometries() ; j++) {
+ if (getGeometryN(i).intersects(g.getGeometryN(j))) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ // general case
+ return relate(g).isIntersects();
+ }
+
+ /**
+ * Tests whether this geometry crosses the
+ * argument geometry.
+ * <p>
+ * The <code>crosses</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>The geometries have some but not all interior points in common.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * one of the following patterns:
+ * <ul>
+ * <li><code>[T*T******]</code> (for P/L, P/A, and L/A situations)
+ * <li><code>[T*****T**]</code> (for L/P, A/P, and A/L situations)
+ * <li><code>[0********]</code> (for L/L situations)
+ * </ul>
+ * </ul>
+ * For any other combination of dimensions this predicate returns <code>false</code>.
+ * <p>
+ * The SFS defined this predicate only for P/L, P/A, L/L, and L/A situations.
+ * In order to make the relation symmetric,
+ * JTS extends the definition to apply to L/P, A/P and A/L situations as well.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s cross.
+ */
+ public boolean crosses(Geometry g) {
+ // short-circuit test
+ if (! getEnvelopeInternal().intersects(g.getEnvelopeInternal()))
+ return false;
+ return relate(g).isCrosses(getDimension(), g.getDimension());
+ }
+
+ /**
+ * Tests whether this geometry is within the
+ * specified geometry.
+ * <p>
+ * The <code>within</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>Every point of this geometry is a point of the other geometry,
+ * and the interiors of the two geometries have at least one point in common.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * <code>[T*F**F***]</code>
+ * <li><code>g.contains(this) = true</code>
+ * <br>(<code>within</code> is the converse of {@link #contains})
+ * </ul>
+ * An implication of the definition is that
+ * "The boundary of a Geometry is not within the Geometry".
+ * In other words, if a geometry A is a subset of
+ * the points in the boundary of a geometry B, <code>A.within(B) = false</code>
+ * (As a concrete example, take A to be a LineString which lies in the boundary of a Polygon B.)
+ * For a predicate with similar behaviour but avoiding
+ * this subtle limitation, see {@link #coveredBy}.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if this <code>Geometry</code> is within
+ * <code>g</code>
+ *
+ * @see Geometry#contains
+ * @see Geometry#coveredBy
+ */
+ public boolean within(Geometry g) {
+ return g.contains(this);
+ }
+
+ /**
+ * Tests whether this geometry contains the
+ * argument geometry.
+ * <p>
+ * The <code>contains</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>Every point of the other geometry is a point of this geometry,
+ * and the interiors of the two geometries have at least one point in common.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * the pattern
+ * <code>[T*****FF*]</code>
+ * <li><code>g.within(this) = true</code>
+ * <br>(<code>contains</code> is the converse of {@link #within} )
+ * </ul>
+ * An implication of the definition is that "Geometries do not
+ * contain their boundary". In other words, if a geometry A is a subset of
+ * the points in the boundary of a geometry B, <code>B.contains(A) = false</code>.
+ * (As a concrete example, take A to be a LineString which lies in the boundary of a Polygon B.)
+ * For a predicate with similar behaviour but avoiding
+ * this subtle limitation, see {@link #covers}.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if this <code>Geometry</code> contains <code>g</code>
+ *
+ * @see Geometry#within
+ * @see Geometry#covers
+ */
+ public boolean contains(Geometry g) {
+ // optimization - lower dimension cannot contain areas
+ if (g.getDimension() == 2 && getDimension() < 2) {
+ return false;
+ }
+ // optimization - P cannot contain a non-zero-length L
+ // Note that a point can contain a zero-length lineal geometry,
+ // since the line has no boundary due to Mod-2 Boundary Rule
+ if (g.getDimension() == 1 && getDimension() < 1 && g.getLength() > 0.0) {
+ return false;
+ }
+ // optimization - envelope test
+ if (! getEnvelopeInternal().contains(g.getEnvelopeInternal()))
+ return false;
+ // optimization for rectangle arguments
+ if (isRectangle()) {
+ return RectangleContains.contains((Polygon) this, g);
+ }
+ // general case
+ return relate(g).isContains();
+ }
+
+ /**
+ * Tests whether this geometry overlaps the
+ * specified geometry.
+ * <p>
+ * The <code>overlaps</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>The geometries have at least one point each not shared by the other
+ * (or equivalently neither covers the other),
+ * they have the same dimension,
+ * and the intersection of the interiors of the two geometries has
+ * the same dimension as the geometries themselves.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * <code>[T*T***T**]</code> (for two points or two surfaces)
+ * or <code>[1*T***T**]</code> (for two curves)
+ * </ul>
+ * If the geometries are of different dimension this predicate returns <code>false</code>.
+ * This predicate is symmetric.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s overlap.
+ */
+ public boolean overlaps(Geometry g) {
+ // short-circuit test
+ if (! getEnvelopeInternal().intersects(g.getEnvelopeInternal()))
+ return false;
+ return relate(g).isOverlaps(getDimension(), g.getDimension());
+ }
+
+ /**
+ * Tests whether this geometry covers the
+ * argument geometry.
+ * <p>
+ * The <code>covers</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>Every point of the other geometry is a point of this geometry.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * at least one of the following patterns:
+ * <ul>
+ * <li><code>[T*****FF*]</code>
+ * <li><code>[*T****FF*]</code>
+ * <li><code>[***T**FF*]</code>
+ * <li><code>[****T*FF*]</code>
+ * </ul>
+ * <li><code>g.coveredBy(this) = true</code>
+ * <br>(<code>covers</code> is the converse of {@link #coveredBy})
+ * </ul>
+ * If either geometry is empty, the value of this predicate is <code>false</code>.
+ * <p>
+ * This predicate is similar to {@link #contains},
+ * but is more inclusive (i.e. returns <code>true</code> for more cases).
+ * In particular, unlike <code>contains</code> it does not distinguish between
+ * points in the boundary and in the interior of geometries.
+ * For most situations, <code>covers</code> should be used in preference to <code>contains</code>.
+ * As an added benefit, <code>covers</code> is more amenable to optimization,
+ * and hence should be more performant.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if this <code>Geometry</code> covers <code>g</code>
+ *
+ * @see Geometry#contains
+ * @see Geometry#coveredBy
+ */
+ public boolean covers(Geometry g) {
+ // optimization - lower dimension cannot cover areas
+ if (g.getDimension() == 2 && getDimension() < 2) {
+ return false;
+ }
+ // optimization - P cannot cover a non-zero-length L
+ // Note that a point can cover a zero-length lineal geometry
+ if (g.getDimension() == 1 && getDimension() < 1 && g.getLength() > 0.0) {
+ return false;
+ }
+ // optimization - envelope test
+ if (! getEnvelopeInternal().covers(g.getEnvelopeInternal()))
+ return false;
+ // optimization for rectangle arguments
+ if (isRectangle()) {
+ // since we have already tested that the test envelope is covered
+ return true;
+ }
+ return relate(g).isCovers();
+ }
+
+ /**
+ * Tests whether this geometry is covered by the
+ * argument geometry.
+ * <p>
+ * The <code>coveredBy</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>Every point of this geometry is a point of the other geometry.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * at least one of the following patterns:
+ * <ul>
+ * <li><code>[T*F**F***]</code>
+ * <li><code>[*TF**F***]</code>
+ * <li><code>[**FT*F***]</code>
+ * <li><code>[**F*TF***]</code>
+ * </ul>
+ * <li><code>g.covers(this) = true</code>
+ * <br>(<code>coveredBy</code> is the converse of {@link #covers})
+ * </ul>
+ * If either geometry is empty, the value of this predicate is <code>false</code>.
+ * <p>
+ * This predicate is similar to {@link #within},
+ * but is more inclusive (i.e. returns <code>true</code> for more cases).
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if this <code>Geometry</code> is covered by <code>g</code>
+ *
+ * @see Geometry#within
+ * @see Geometry#covers
+ */
+ public boolean coveredBy(Geometry g) {
+ return g.covers(this);
+ }
+
+ /**
+ * Tests whether the elements in the DE-9IM
+ * {@link IntersectionMatrix} for the two <code>Geometry</code>s match the elements in <code>intersectionPattern</code>.
+ * The pattern is a 9-character string, with symbols drawn from the following set:
+ * <UL>
+ * <LI> 0 (dimension 0)
+ * <LI> 1 (dimension 1)
+ * <LI> 2 (dimension 2)
+ * <LI> T ( matches 0, 1 or 2)
+ * <LI> F ( matches FALSE)
+ * <LI> * ( matches any value)
+ * </UL>
+ * For more information on the DE-9IM, see the <i>OpenGIS Simple Features
+ * Specification</i>.
+ *
+ *@param g the <code>Geometry</code> with which to compare
+ * this <code>Geometry</code>
+ *@param intersectionPattern the pattern against which to check the
+ * intersection matrix for the two <code>Geometry</code>s
+ *@return <code>true</code> if the DE-9IM intersection
+ * matrix for the two <code>Geometry</code>s match <code>intersectionPattern</code>
+ * @see IntersectionMatrix
+ */
+ public boolean relate(Geometry g, String intersectionPattern) {
+ return relate(g).matches(intersectionPattern);
+ }
+
+ /**
+ * Returns the DE-9IM {@link IntersectionMatrix} for the two <code>Geometry</code>s.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return an {@link IntersectionMatrix} describing the intersections of the interiors,
+ * boundaries and exteriors of the two <code>Geometry</code>s
+ */
+ public IntersectionMatrix relate(Geometry g) {
+ checkNotGeometryCollection(this);
+ checkNotGeometryCollection(g);
+ return RelateOp.relate(this, g);
+ }
+
+ /**
+ * Tests whether this geometry is
+ * topologically equal to the argument geometry.
+ * <p>
+ * This method is included for backward compatibility reasons.
+ * It has been superseded by the {@link #equalsTopo(Geometry)} method,
+ * which has been named to clearly denote its functionality.
+ * <p>
+ * This method should NOT be confused with the method
+ * {@link #equals(Object)}, which implements
+ * an exact equality comparison.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return true if the two <code>Geometry</code>s are topologically equal
+ *
+ *@see #equalsTopo(Geometry)
+ */
+ public boolean equals(Geometry g) {
+ if (g == null) return false;
+ return equalsTopo(g);
+ }
+
+ /**
+ * Tests whether this geometry is topologically equal to the argument geometry
+ * as defined by the SFS <code>equals</code> predicate.
+ * <p>
+ * The SFS <code>equals</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>The two geometries have at least one point in common,
+ * and no point of either geometry lies in the exterior of the other geometry.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * the pattern <code>T*F**FFF*</code>
+ * <pre>
+ * T*F
+ * **F
+ * FF*
+ * </pre>
+ * </ul>
+ * <b>Note</b> that this method computes <b>topologically equality</b>.
+ * For structural equality, see {@link #equalsExact(Geometry)}.
+ *
+ *@param g the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s are topologically equal
+ *
+ *@see #equalsExact(Geometry)
+ */
+ public boolean equalsTopo(Geometry g)
+ {
+ // short-circuit test
+ if (! getEnvelopeInternal().equals(g.getEnvelopeInternal()))
+ return false;
+ return relate(g).isEquals(getDimension(), g.getDimension());
+ }
+
+ /**
+ * Tests whether this geometry is structurally and numerically equal
+ * to a given <code>Object</code>.
+ * If the argument <code>Object</code> is not a <code>Geometry</code>,
+ * the result is <code>false</code>.
+ * Otherwise, the result is computed using
+ * {@link #equalsExact(Geometry)}.
+ * <p>
+ * This method is provided to fulfill the Java contract
+ * for value-based object equality.
+ * In conjunction with {@link #hashCode()}
+ * it provides semantics which are most useful
+ * for using
+ * <code>Geometry</code>s as keys and values in Java collections.
+ * <p>
+ * Note that to produce the expected result the input geometries
+ * should be in normal form. It is the caller's
+ * responsibility to perform this where required
+ * (using {@link Geometry#norm()}
+ * or {@link #normalize()} as appropriate).
+ *
+ * @param o the Object to compare
+ * @return true if this geometry is exactly equal to the argument
+ *
+ * @see #equalsExact(Geometry)
+ * @see #hashCode()
+ * @see #norm()
+ * @see #normalize()
+ */
+ public boolean equals(Object o)
+ {
+ if (! (o instanceof Geometry)) return false;
+ Geometry g = (Geometry) o;
+ return equalsExact(g);
+ }
+
+ /**
+ * Gets a hash code for the Geometry.
+ *
+ * @return an integer value suitable for use as a hashcode
+ */
+ public int hashCode()
+ {
+ return getEnvelopeInternal().hashCode();
+ }
+
+ public String toString() {
+ return toText();
+ }
+
+ /**
+ * Returns the Well-known Text representation of this <code>Geometry</code>.
+ * For a definition of the Well-known Text format, see the OpenGIS Simple
+ * Features Specification.
+ *
+ *@return the Well-known Text representation of this <code>Geometry</code>
+ */
+ public String toText() {
+ WKTWriter writer = new WKTWriter();
+ return writer.write(this);
+ }
+
+ /**
+ * Computes a buffer area around this geometry having the given width. The
+ * buffer of a Geometry is the Minkowski sum or difference of the geometry
+ * with a disc of radius <code>abs(distance)</code>.
+ * <p>
+ * Mathematically-exact buffer area boundaries can contain circular arcs.
+ * To represent these arcs using linear geometry they must be approximated with line segments.
+ * The buffer geometry is constructed using 8 segments per quadrant to approximate
+ * the circular arcs.
+ * The end cap style is <code>CAP_ROUND</code>.
+ * <p>
+ * The buffer operation always returns a polygonal result. The negative or
+ * zero-distance buffer of lines and points is always an empty {@link Polygon}.
+ * This is also the result for the buffers of degenerate (zero-area) polygons.
+ *
+ * @param distance
+ * the width of the buffer (may be positive, negative or 0)
+ * @return a polygonal geometry representing the buffer region (which may be
+ * empty)
+ *
+ * @throws TopologyException
+ * if a robustness error occurs
+ *
+ * @see #buffer(double, int)
+ * @see #buffer(double, int, int)
+ */
+ public Geometry buffer(double distance) {
+ return BufferOp.bufferOp(this, distance);
+ }
+
+ /**
+ * Computes a buffer area around this geometry having the given width and with
+ * a specified accuracy of approximation for circular arcs.
+ * <p>
+ * Mathematically-exact buffer area boundaries can contain circular arcs.
+ * To represent these arcs
+ * using linear geometry they must be approximated with line segments. The
+ * <code>quadrantSegments</code> argument allows controlling the accuracy of
+ * the approximation by specifying the number of line segments used to
+ * represent a quadrant of a circle
+ * <p>
+ * The buffer operation always returns a polygonal result. The negative or
+ * zero-distance buffer of lines and points is always an empty {@link Polygon}.
+ * This is also the result for the buffers of degenerate (zero-area) polygons.
+ *
+ * @param distance
+ * the width of the buffer (may be positive, negative or 0)
+ * @param quadrantSegments
+ * the number of line segments used to represent a quadrant of a
+ * circle
+ * @return a polygonal geometry representing the buffer region (which may be
+ * empty)
+ *
+ * @throws TopologyException
+ * if a robustness error occurs
+ *
+ * @see #buffer(double)
+ * @see #buffer(double, int, int)
+ */
+ public Geometry buffer(double distance, int quadrantSegments) {
+ return BufferOp.bufferOp(this, distance, quadrantSegments);
+ }
+
+ /**
+ * Computes a buffer area around this geometry having the given
+ * width and with a specified accuracy of approximation for circular arcs,
+ * and using a specified end cap style.
+ * <p>
+ * Mathematically-exact buffer area boundaries can contain circular arcs.
+ * To represent these arcs using linear geometry they must be approximated with line segments.
+ * The <code>quadrantSegments</code> argument allows controlling the
+ * accuracy of the approximation
+ * by specifying the number of line segments used to represent a quadrant of a circle
+ * <p>
+ * The end cap style specifies the buffer geometry that will be
+ * created at the ends of linestrings. The styles provided are:
+ * <ul>
+ * <li><code>BufferOp.CAP_ROUND</code> - (default) a semi-circle
+ * <li><code>BufferOp.CAP_BUTT</code> - a straight line perpendicular to the end segment
+ * <li><code>BufferOp.CAP_SQUARE</code> - a half-square
+ * </ul>
+ * <p>
+ * The buffer operation always returns a polygonal result. The negative or
+ * zero-distance buffer of lines and points is always an empty {@link Polygon}.
+ * This is also the result for the buffers of degenerate (zero-area) polygons.
+ *
+ *@param distance the width of the buffer (may be positive, negative or 0)
+ *@param quadrantSegments the number of line segments used to represent a quadrant of a circle
+ *@param endCapStyle the end cap style to use
+ *@return a polygonal geometry representing the buffer region (which may be empty)
+ *
+ * @throws TopologyException if a robustness error occurs
+ *
+ * @see #buffer(double)
+ * @see #buffer(double, int)
+ * @see BufferOp
+ */
+ public Geometry buffer(double distance, int quadrantSegments, int endCapStyle) {
+ return BufferOp.bufferOp(this, distance, quadrantSegments, endCapStyle);
+ }
+
+ /**
+ * Computes the smallest convex <code>Polygon</code> that contains all the
+ * points in the <code>Geometry</code>. This obviously applies only to <code>Geometry</code>
+ * s which contain 3 or more points; the results for degenerate cases are
+ * specified as follows:
+ * <TABLE>
+ * <TR>
+ * <TH> Number of <code>Point</code>s in argument <code>Geometry</code> </TH>
+ * <TH> <code>Geometry</code> class of result </TH>
+ * </TR>
+ * <TR>
+ * <TD> 0 </TD>
+ * <TD> empty <code>GeometryCollection</code> </TD>
+ * </TR>
+ * <TR> <TD> 1 </TD>
+ * <TD> <code>Point</code> </TD>
+ * </TR>
+ * <TR>
+ * <TD> 2 </TD>
+ * <TD> <code>LineString</code> </TD>
+ * </TR>
+ * <TR>
+ * <TD> 3 or more </TD>
+ * <TD> <code>Polygon</code> </TD>
+ * </TR>
+ * </TABLE>
+ *
+ *@return the minimum-area convex polygon containing this <code>Geometry</code>'
+ * s points
+ */
+ public Geometry convexHull() {
+ return (new ConvexHull(this)).getConvexHull();
+ }
+
+ /**
+ * Computes a new geometry which has all component coordinate sequences
+ * in reverse order (opposite orientation) to this one.
+ *
+ * @return a reversed geometry
+ */
+ public abstract Geometry reverse();
+
+ /**
+ * Computes a <code>Geometry</code> representing the point-set which is
+ * common to both this <code>Geometry</code> and the <code>other</code> Geometry.
+ * <p>
+ * The intersection of two geometries of different dimension produces a result
+ * geometry of dimension less than or equal to the minimum dimension of the input
+ * geometries.
+ * The result geometry may be a heterogeneous {@link GeometryCollection}.
+ * If the result is empty, it is an atomic geometry
+ * with the dimension of the lowest input dimension.
+ * <p>
+ * Intersection of {@link GeometryCollection}s is supported
+ * only for homogeneous collection types.
+ * <p>
+ * Non-empty heterogeneous {@link GeometryCollection} arguments are not supported.
+ *
+ * @param other the <code>Geometry</code> with which to compute the intersection
+ * @return a Geometry representing the point-set common to the two <code>Geometry</code>s
+ * @throws TopologyException if a robustness error occurs
+ * @throws IllegalArgumentException if the argument is a non-empty heterogeneous <code>GeometryCollection</code>
+ */
+ public Geometry intersection(Geometry other)
+ {
+ /**
+ * TODO: MD - add optimization for P-A case using Point-In-Polygon
+ */
+ // special case: if one input is empty ==> empty
+ if (this.isEmpty() || other.isEmpty())
+ return OverlayOp.createEmptyResult(OverlayOp.INTERSECTION, this, other, factory);
+
+ // compute for GCs
+ if (this.isGeometryCollection()) {
+ final Geometry g2 = other;
+ return GeometryCollectionMapper.map(
+ (GeometryCollection) this,
+ new GeometryMapper.MapOp() {
+ public Geometry map(Geometry g) {
+ return g.intersection(g2);
+ }
+ });
+ }
+// if (isGeometryCollection(other))
+// return other.intersection(this);
+
+ checkNotGeometryCollection(this);
+ checkNotGeometryCollection(other);
+ return SnapIfNeededOverlayOp.overlayOp(this, other, OverlayOp.INTERSECTION);
+ }
+
+ /**
+ * Computes a <code>Geometry</code> representing the point-set
+ * which is contained in both this
+ * <code>Geometry</code> and the <code>other</code> Geometry.
+ * <p>
+ * The union of two geometries of different dimension produces a result
+ * geometry of dimension equal to the maximum dimension of the input
+ * geometries.
+ * The result geometry may be a heterogeneous
+ * {@link GeometryCollection}.
+ * If the result is empty, it is an atomic geometry
+ * with the dimension of the highest input dimension.
+ * <p>
+ * Unioning {@link LineString}s has the effect of
+ * <b>noding</b> and <b>dissolving</b> the input linework. In this context
+ * "noding" means that there will be a node or endpoint in the result for
+ * every endpoint or line segment crossing in the input. "Dissolving" means
+ * that any duplicate (i.e. coincident) line segments or portions of line
+ * segments will be reduced to a single line segment in the result.
+ * If <b>merged</b> linework is required, the {@link LineMerger}
+ * class can be used.
+ * <p>
+ * Non-empty {@link GeometryCollection} arguments are not supported.
+ *
+ * @param other
+ * the <code>Geometry</code> with which to compute the union
+ * @return a point-set combining the points of this <code>Geometry</code> and the
+ * points of <code>other</code>
+ * @throws TopologyException
+ * if a robustness error occurs
+ * @throws IllegalArgumentException
+ * if either input is a non-empty GeometryCollection
+ * @see LineMerger
+ */
+ public Geometry union(Geometry other)
+ {
+ // handle empty geometry cases
+ if (this.isEmpty() || other.isEmpty()) {
+ if (this.isEmpty() && other.isEmpty())
+ return OverlayOp.createEmptyResult(OverlayOp.UNION, this, other, factory);
+
+ // special case: if either input is empty ==> other input
+ if (this.isEmpty()) return other.copy();
+ if (other.isEmpty()) return copy();
+ }
+
+ // TODO: optimize if envelopes of geometries do not intersect
+
+ checkNotGeometryCollection(this);
+ checkNotGeometryCollection(other);
+ return SnapIfNeededOverlayOp.overlayOp(this, other, OverlayOp.UNION);
+ }
+
+ /**
+ * Computes a <code>Geometry</code> representing the closure of the point-set
+ * of the points contained in this <code>Geometry</code> that are not contained in
+ * the <code>other</code> Geometry.
+ * <p>
+ * If the result is empty, it is an atomic geometry
+ * with the dimension of the left-hand input.
+ * <p>
+ * Non-empty {@link GeometryCollection} arguments are not supported.
+ *
+ *@param other the <code>Geometry</code> with which to compute the
+ * difference
+ *@return a Geometry representing the point-set difference of this <code>Geometry</code> with
+ * <code>other</code>
+ * @throws TopologyException if a robustness error occurs
+ * @throws IllegalArgumentException if either input is a non-empty GeometryCollection
+ */
+ public Geometry difference(Geometry other)
+ {
+ // special case: if A.isEmpty ==> empty; if B.isEmpty ==> A
+ if (this.isEmpty()) return OverlayOp.createEmptyResult(OverlayOp.DIFFERENCE, this, other, factory);
+ if (other.isEmpty()) return copy();
+
+ checkNotGeometryCollection(this);
+ checkNotGeometryCollection(other);
+ return SnapIfNeededOverlayOp.overlayOp(this, other, OverlayOp.DIFFERENCE);
+ }
+
+ /**
+ * Computes a <code>Geometry </code> representing the closure of the point-set
+ * which is the union of the points in this <code>Geometry</code> which are not
+ * contained in the <code>other</code> Geometry,
+ * with the points in the <code>other</code> Geometry not contained in this
+ * <code>Geometry</code>.
+ * If the result is empty, it is an atomic geometry
+ * with the dimension of the highest input dimension.
+ * <p>
+ * Non-empty {@link GeometryCollection} arguments are not supported.
+ *
+ *@param other the <code>Geometry</code> with which to compute the symmetric
+ * difference
+ *@return a Geometry representing the point-set symmetric difference of this <code>Geometry</code>
+ * with <code>other</code>
+ * @throws TopologyException if a robustness error occurs
+ * @throws IllegalArgumentException if either input is a non-empty GeometryCollection
+ */
+ public Geometry symDifference(Geometry other)
+ {
+ // handle empty geometry cases
+ if (this.isEmpty() || other.isEmpty()) {
+ // both empty - check dimensions
+ if (this.isEmpty() && other.isEmpty())
+ return OverlayOp.createEmptyResult(OverlayOp.SYMDIFFERENCE, this, other, factory);
+
+ // special case: if either input is empty ==> result = other arg
+ if (this.isEmpty()) return other.copy();
+ if (other.isEmpty()) return copy();
+ }
+
+ checkNotGeometryCollection(this);
+ checkNotGeometryCollection(other);
+ return SnapIfNeededOverlayOp.overlayOp(this, other, OverlayOp.SYMDIFFERENCE);
+ }
+
+ /**
+ * Computes the union of all the elements of this geometry.
+ * <p>
+ * This method supports
+ * {@link GeometryCollection}s
+ * (which the other overlay operations currently do not).
+ * <p>
+ * The result obeys the following contract:
+ * <ul>
+ * <li>Unioning a set of {@link LineString}s has the effect of fully noding
+ * and dissolving the linework.
+ * <li>Unioning a set of {@link Polygon}s always
+ * returns a {@link Polygonal} geometry (unlike {@link #union(Geometry)},
+ * which may return geometries of lower dimension if a topology collapse occurred).
+ * </ul>
+ *
+ * @return the union geometry
+ * @throws TopologyException if a robustness error occurs
+ *
+ * @see UnaryUnionOp
+ */
+ public Geometry union() {
+ return UnaryUnionOp.union(this);
+ }
+
+ /**
+ * Returns true if the two <code>Geometry</code>s are exactly equal,
+ * up to a specified distance tolerance.
+ * Two Geometries are exactly equal within a distance tolerance
+ * if and only if:
+ * <ul>
+ * <li>they have the same structure
+ * <li>they have the same values for their vertices,
+ * within the given tolerance distance, in exactly the same order.
+ * </ul>
+ * This method does <i>not</i>
+ * test the values of the <code>GeometryFactory</code>, the <code>SRID</code>,
+ * or the <code>userData</code> fields.
+ * <p>
+ * To properly test equality between different geometries,
+ * it is usually necessary to {@link #normalize()} them first.
+ *
+ * @param other the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ * @param tolerance distance at or below which two <code>Coordinate</code>s
+ * are considered equal
+ * @return <code>true</code> if this and the other <code>Geometry</code>
+ * have identical structure and point values, up to the distance tolerance.
+ *
+ * @see #equalsExact(Geometry)
+ * @see #normalize()
+ * @see #norm()
+ */
+ public abstract boolean equalsExact(Geometry other, double tolerance);
+
+ /**
+ * Returns true if the two <code>Geometry</code>s are exactly equal.
+ * Two Geometries are exactly equal iff:
+ * <ul>
+ * <li>they have the same structure
+ * <li>they have the same values for their vertices,
+ * in exactly the same order.
+ * </ul>
+ * This provides a stricter test of equality than
+ * {@link #equalsTopo(Geometry)}, which is more useful
+ * in certain situations
+ * (such as using geometries as keys in collections).
+ * <p>
+ * This method does <i>not</i>
+ * test the values of the <code>GeometryFactory</code>, the <code>SRID</code>,
+ * or the <code>userData</code> fields.
+ * <p>
+ * To properly test equality between different geometries,
+ * it is usually necessary to {@link #normalize()} them first.
+ *
+ *@param other the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return <code>true</code> if this and the other <code>Geometry</code>
+ * have identical structure and point values.
+ *
+ * @see #equalsExact(Geometry, double)
+ * @see #normalize()
+ * @see #norm()
+ */
+ public boolean equalsExact(Geometry other)
+ {
+ return this == other || equalsExact(other, 0);
+ }
+
+ /**
+ * Tests whether two geometries are exactly equal
+ * in their normalized forms.
+ * This is a convenience method which creates normalized
+ * versions of both geometries before computing
+ * {@link #equalsExact(Geometry)}.
+ * <p>
+ * This method is relatively expensive to compute.
+ * For maximum performance, the client
+ * should instead perform normalization on the individual geometries
+ * at an appropriate point during processing.
+ *
+ * @param g a Geometry
+ * @return true if the input geometries are exactly equal in their normalized form
+ */
+ public boolean equalsNorm(Geometry g)
+ {
+ if (g == null) return false;
+ return norm().equalsExact(g.norm());
+ }
+
+
+ /**
+ * Performs an operation with or on this <code>Geometry</code>'s
+ * coordinates.
+ * If this method modifies any coordinate values,
+ * {@link #geometryChanged} must be called to update the geometry state.
+ * Note that you cannot use this method to
+ * modify this Geometry if its underlying CoordinateSequence's #get method
+ * returns a copy of the Coordinate, rather than the actual Coordinate stored
+ * (if it even stores Coordinate objects at all).
+ *
+ *@param filter the filter to apply to this <code>Geometry</code>'s
+ * coordinates
+ */
+ public abstract void apply(CoordinateFilter filter);
+
+ /**
+ * Performs an operation on the coordinates in this <code>Geometry</code>'s
+ * {@link CoordinateSequence}s.
+ * If the filter reports that a coordinate value has been changed,
+ * {@link #geometryChanged} will be called automatically.
+ *
+ *@param filter the filter to apply
+ */
+ public abstract void apply(CoordinateSequenceFilter filter);
+
+ /**
+ * Performs an operation with or on this <code>Geometry</code> and its
+ * subelement <code>Geometry</code>s (if any).
+ * Only GeometryCollections and subclasses
+ * have subelement Geometry's.
+ *
+ *@param filter the filter to apply to this <code>Geometry</code> (and
+ * its children, if it is a <code>GeometryCollection</code>).
+ */
+ public abstract void apply(GeometryFilter filter);
+
+ /**
+ * Performs an operation with or on this Geometry and its
+ * component Geometry's. Only GeometryCollections and
+ * Polygons have component Geometry's; for Polygons they are the LinearRings
+ * of the shell and holes.
+ *
+ *@param filter the filter to apply to this <code>Geometry</code>.
+ */
+ public abstract void apply(GeometryComponentFilter filter);
+
+ /**
+ * Creates and returns a full copy of this {@link Geometry} object
+ * (including all coordinates contained by it).
+ * Subclasses are responsible for overriding this method and copying
+ * their internal data. Overrides should call this method first.
+ *
+ * @return a clone of this instance
+ * @deprecated
+ */
+ public Object clone() {
+ try {
+ Geometry clone = (Geometry) super.clone();
+ if (clone.envelope != null) { clone.envelope = new Envelope(clone.envelope); }
+ return clone;
+ }
+ catch (CloneNotSupportedException e) {
+ Assert.shouldNeverReachHere();
+ return null;
+ }
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link Geometry} object
+ * (including all coordinates contained by it).
+ * Subclasses are responsible for implementing this method and copying
+ * their internal data.
+ *
+ * @return a clone of this instance
+ */
+ abstract public Geometry copy();
+
+ /**
+ * Converts this <code>Geometry</code> to <b>normal form</b> (or <b>
+ * canonical form</b> ). Normal form is a unique representation for <code>Geometry</code>
+ * s. It can be used to test whether two <code>Geometry</code>s are equal
+ * in a way that is independent of the ordering of the coordinates within
+ * them. Normal form equality is a stronger condition than topological
+ * equality, but weaker than pointwise equality. The definitions for normal
+ * form use the standard lexicographical ordering for coordinates. "Sorted in
+ * order of coordinates" means the obvious extension of this ordering to
+ * sequences of coordinates.
+ * <p>
+ * NOTE that this method mutates the value of this geometry in-place.
+ * If this is not safe and/or wanted, the geometry should be
+ * cloned prior to normalization.
+ */
+ public abstract void normalize();
+
+ /**
+ * Creates a new Geometry which is a normalized
+ * copy of this Geometry.
+ *
+ * @return a normalized copy of this geometry.
+ * @see #normalize()
+ */
+ public Geometry norm()
+ {
+ Geometry copy = copy();
+ copy.normalize();
+ return copy;
+ }
+
+ /**
+ * Returns whether this <code>Geometry</code> is greater than, equal to,
+ * or less than another <code>Geometry</code>. <P>
+ *
+ * If their classes are different, they are compared using the following
+ * ordering:
+ * <UL>
+ * <LI> Point (lowest)
+ * <LI> MultiPoint
+ * <LI> LineString
+ * <LI> LinearRing
+ * <LI> MultiLineString
+ * <LI> Polygon
+ * <LI> MultiPolygon
+ * <LI> GeometryCollection (highest)
+ * </UL>
+ * If the two <code>Geometry</code>s have the same class, their first
+ * elements are compared. If those are the same, the second elements are
+ * compared, etc.
+ *
+ *@param o a <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@return a positive number, 0, or a negative number, depending on whether
+ * this object is greater than, equal to, or less than <code>o</code>, as
+ * defined in "Normal Form For Geometry" in the JTS Technical
+ * Specifications
+ */
+ public int compareTo(Object o) {
+ Geometry other = (Geometry) o;
+ if (getSortIndex() != other.getSortIndex()) {
+ return getSortIndex() - other.getSortIndex();
+ }
+ if (isEmpty() && other.isEmpty()) {
+ return 0;
+ }
+ if (isEmpty()) {
+ return -1;
+ }
+ if (other.isEmpty()) {
+ return 1;
+ }
+ return compareToSameClass(o);
+ }
+
+ /**
+ * Returns whether this <code>Geometry</code> is greater than, equal to,
+ * or less than another <code>Geometry</code>,
+ * using the given {@link CoordinateSequenceComparator}.
+ * <P>
+ *
+ * If their classes are different, they are compared using the following
+ * ordering:
+ * <UL>
+ * <LI> Point (lowest)
+ * <LI> MultiPoint
+ * <LI> LineString
+ * <LI> LinearRing
+ * <LI> MultiLineString
+ * <LI> Polygon
+ * <LI> MultiPolygon
+ * <LI> GeometryCollection (highest)
+ * </UL>
+ * If the two <code>Geometry</code>s have the same class, their first
+ * elements are compared. If those are the same, the second elements are
+ * compared, etc.
+ *
+ *@param o a <code>Geometry</code> with which to compare this <code>Geometry</code>
+ *@param comp a <code>CoordinateSequenceComparator</code>
+ *
+ *@return a positive number, 0, or a negative number, depending on whether
+ * this object is greater than, equal to, or less than <code>o</code>, as
+ * defined in "Normal Form For Geometry" in the JTS Technical
+ * Specifications
+ */
+ public int compareTo(Object o, CoordinateSequenceComparator comp) {
+ Geometry other = (Geometry) o;
+ if (getSortIndex() != other.getSortIndex()) {
+ return getSortIndex() - other.getSortIndex();
+ }
+ if (isEmpty() && other.isEmpty()) {
+ return 0;
+ }
+ if (isEmpty()) {
+ return -1;
+ }
+ if (other.isEmpty()) {
+ return 1;
+ }
+ return compareToSameClass(o, comp);
+ }
+
+ /**
+ * Returns whether the two <code>Geometry</code>s are equal, from the point
+ * of view of the <code>equalsExact</code> method. Called by <code>equalsExact</code>
+ * . In general, two <code>Geometry</code> classes are considered to be
+ * "equivalent" only if they are the same class. An exception is <code>LineString</code>
+ * , which is considered to be equivalent to its subclasses.
+ *
+ *@param other the <code>Geometry</code> with which to compare this <code>Geometry</code>
+ * for equality
+ *@return <code>true</code> if the classes of the two <code>Geometry</code>
+ * s are considered to be equal by the <code>equalsExact</code> method.
+ */
+ protected boolean isEquivalentClass(Geometry other) {
+ return this.getClass().getName().equals(other.getClass().getName());
+ }
+
+ /**
+ * Throws an exception if <code>g</code>'s class is <code>GeometryCollection</code>
+ * . (Its subclasses do not trigger an exception).
+ *
+ *@param g the <code>Geometry</code> to check
+ *@throws IllegalArgumentException if <code>g</code> is a <code>GeometryCollection</code>
+ * but not one of its subclasses
+ */
+ protected void checkNotGeometryCollection(Geometry g) {
+ if (isGeometryCollection()) {
+ throw new IllegalArgumentException("This method does not support GeometryCollection arguments");
+ }
+ }
+
+ /**
+ * Tests whether this is an instance of a general {@link GeometryCollection},
+ * rather than a homogeneous subclass.
+ *
+ * @return true if this is a heterogeneous GeometryCollection
+ */
+ protected boolean isGeometryCollection()
+ {
+ return getSortIndex() == SORTINDEX_GEOMETRYCOLLECTION;
+ }
+
+ /**
+ * Returns the minimum and maximum x and y values in this <code>Geometry</code>
+ * , or a null <code>Envelope</code> if this <code>Geometry</code> is empty.
+ * Unlike <code>getEnvelopeInternal</code>, this method calculates the <code>Envelope</code>
+ * each time it is called; <code>getEnvelopeInternal</code> caches the result
+ * of this method.
+ *
+ *@return this <code>Geometry</code>s bounding box; if the <code>Geometry</code>
+ * is empty, <code>Envelope#isNull</code> will return <code>true</code>
+ */
+ protected abstract Envelope computeEnvelopeInternal();
+
+ /**
+ * Returns whether this <code>Geometry</code> is greater than, equal to,
+ * or less than another <code>Geometry</code> having the same class.
+ *
+ *@param o a <code>Geometry</code> having the same class as this <code>Geometry</code>
+ *@return a positive number, 0, or a negative number, depending on whether
+ * this object is greater than, equal to, or less than <code>o</code>, as
+ * defined in "Normal Form For Geometry" in the JTS Technical
+ * Specifications
+ */
+ protected abstract int compareToSameClass(Object o);
+
+ /**
+ * Returns whether this <code>Geometry</code> is greater than, equal to,
+ * or less than another <code>Geometry</code> of the same class.
+ * using the given {@link CoordinateSequenceComparator}.
+ *
+ *@param o a <code>Geometry</code> having the same class as this <code>Geometry</code>
+ *@param comp a <code>CoordinateSequenceComparator</code>
+ *@return a positive number, 0, or a negative number, depending on whether
+ * this object is greater than, equal to, or less than <code>o</code>, as
+ * defined in "Normal Form For Geometry" in the JTS Technical
+ * Specifications
+ */
+ protected abstract int compareToSameClass(Object o, CoordinateSequenceComparator comp);
+
+ /**
+ * Returns the first non-zero result of <code>compareTo</code> encountered as
+ * the two <code>Collection</code>s are iterated over. If, by the time one of
+ * the iterations is complete, no non-zero result has been encountered,
+ * returns 0 if the other iteration is also complete. If <code>b</code>
+ * completes before <code>a</code>, a positive number is returned; if a
+ * before b, a negative number.
+ *
+ *@param a a <code>Collection</code> of <code>Comparable</code>s
+ *@param b a <code>Collection</code> of <code>Comparable</code>s
+ *@return the first non-zero <code>compareTo</code> result, if any;
+ * otherwise, zero
+ */
+ protected int compare(Collection a, Collection b) {
+ Iterator i = a.iterator();
+ Iterator j = b.iterator();
+ while (i.hasNext() && j.hasNext()) {
+ Comparable aElement = (Comparable) i.next();
+ Comparable bElement = (Comparable) j.next();
+ int comparison = aElement.compareTo(bElement);
+ if (comparison != 0) {
+ return comparison;
+ }
+ }
+ if (i.hasNext()) {
+ return 1;
+ }
+ if (j.hasNext()) {
+ return -1;
+ }
+ return 0;
+ }
+
+ protected boolean equal(Coordinate a, Coordinate b, double tolerance) {
+ if (tolerance == 0) { return a.equals(b); }
+ return a.distance(b) <= tolerance;
+ }
+
+ abstract protected int getSortIndex();
+
+ private Point createPointFromInternalCoord(Coordinate coord, Geometry exemplar)
+ {
+ exemplar.getPrecisionModel().makePrecise(coord);
+ return exemplar.getFactory().createPoint(coord);
+ }
+
+
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/GeometryCollection.java b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryCollection.java
new file mode 100644
index 0000000..d42eef2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryCollection.java
@@ -0,0 +1,297 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.util.Arrays;
+import java.util.TreeSet;
+
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * Models a collection of {@link Geometry}s of
+ * arbitrary type and dimension.
+ *
+ *
+ *@version 1.7
+ */
+public class GeometryCollection extends Geometry {
+// With contributions from Markus Schaber [schabios at logi-track.com] 2004-03-26
+ private static final long serialVersionUID = -5694727726395021467L;
+ /**
+ * Internal representation of this <code>GeometryCollection</code>.
+ */
+ protected Geometry[] geometries;
+
+ /** @deprecated Use GeometryFactory instead */
+ public GeometryCollection(Geometry[] geometries, PrecisionModel precisionModel, int SRID) {
+ this(geometries, new GeometryFactory(precisionModel, SRID));
+ }
+
+
+ /**
+ * @param geometries
+ * the <code>Geometry</code>s for this <code>GeometryCollection</code>,
+ * or <code>null</code> or an empty array to create the empty
+ * geometry. Elements may be empty <code>Geometry</code>s,
+ * but not <code>null</code>s.
+ */
+ public GeometryCollection(Geometry[] geometries, GeometryFactory factory) {
+ super(factory);
+ if (geometries == null) {
+ geometries = new Geometry[]{};
+ }
+ if (hasNullElements(geometries)) {
+ throw new IllegalArgumentException("geometries must not contain null elements");
+ }
+ this.geometries = geometries;
+ }
+
+ public Coordinate getCoordinate() {
+ if (isEmpty()) return null;
+ return geometries[0].getCoordinate();
+ }
+
+ /**
+ * Collects all coordinates of all subgeometries into an Array.
+ *
+ * Note that while changes to the coordinate objects themselves
+ * may modify the Geometries in place, the returned Array as such
+ * is only a temporary container which is not synchronized back.
+ *
+ * @return the collected coordinates
+ * */
+ public Coordinate[] getCoordinates() {
+ Coordinate[] coordinates = new Coordinate[getNumPoints()];
+ int k = -1;
+ for (int i = 0; i < geometries.length; i++) {
+ Coordinate[] childCoordinates = geometries[i].getCoordinates();
+ for (int j = 0; j < childCoordinates.length; j++) {
+ k++;
+ coordinates[k] = childCoordinates[j];
+ }
+ }
+ return coordinates;
+ }
+
+ public boolean isEmpty() {
+ for (int i = 0; i < geometries.length; i++) {
+ if (!geometries[i].isEmpty()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public int getDimension() {
+ int dimension = Dimension.FALSE;
+ for (int i = 0; i < geometries.length; i++) {
+ dimension = Math.max(dimension, geometries[i].getDimension());
+ }
+ return dimension;
+ }
+
+ public int getBoundaryDimension() {
+ int dimension = Dimension.FALSE;
+ for (int i = 0; i < geometries.length; i++) {
+ dimension = Math.max(dimension, ((Geometry) geometries[i]).getBoundaryDimension());
+ }
+ return dimension;
+ }
+
+ public int getNumGeometries() {
+ return geometries.length;
+ }
+
+ public Geometry getGeometryN(int n) {
+ return geometries[n];
+ }
+
+ public int getNumPoints() {
+ int numPoints = 0;
+ for (int i = 0; i < geometries.length; i++) {
+ numPoints += ((Geometry) geometries[i]).getNumPoints();
+ }
+ return numPoints;
+ }
+
+ public String getGeometryType() {
+ return "GeometryCollection";
+ }
+
+ public Geometry getBoundary() {
+ checkNotGeometryCollection(this);
+ Assert.shouldNeverReachHere();
+ return null;
+ }
+
+ /**
+ * Returns the area of this <code>GeometryCollection</code>
+ *
+ * @return the area of the polygon
+ */
+ public double getArea()
+ {
+ double area = 0.0;
+ for (int i = 0; i < geometries.length; i++) {
+ area += geometries[i].getArea();
+ }
+ return area;
+ }
+
+ public double getLength()
+ {
+ double sum = 0.0;
+ for (int i = 0; i < geometries.length; i++) {
+ sum += (geometries[i]).getLength();
+ }
+ return sum;
+ }
+
+ public boolean equalsExact(Geometry other, double tolerance) {
+ if (!isEquivalentClass(other)) {
+ return false;
+ }
+ GeometryCollection otherCollection = (GeometryCollection) other;
+ if (geometries.length != otherCollection.geometries.length) {
+ return false;
+ }
+ for (int i = 0; i < geometries.length; i++) {
+ if (!((Geometry) geometries[i]).equalsExact(otherCollection.geometries[i], tolerance)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void apply(CoordinateFilter filter) {
+ for (int i = 0; i < geometries.length; i++) {
+ geometries[i].apply(filter);
+ }
+ }
+
+ public void apply(CoordinateSequenceFilter filter) {
+ if (geometries.length == 0)
+ return;
+ for (int i = 0; i < geometries.length; i++) {
+ geometries[i].apply(filter);
+ if (filter.isDone()) {
+ break;
+ }
+ }
+ if (filter.isGeometryChanged())
+ geometryChanged();
+ }
+
+ public void apply(GeometryFilter filter) {
+ filter.filter(this);
+ for (int i = 0; i < geometries.length; i++) {
+ geometries[i].apply(filter);
+ }
+ }
+
+ public void apply(GeometryComponentFilter filter) {
+ filter.filter(this);
+ for (int i = 0; i < geometries.length; i++) {
+ geometries[i].apply(filter);
+ }
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link GeometryCollection} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a clone of this instance
+ * @deprecated
+ */
+ public Object clone() {
+ return copy();
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link GeometryCollection} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a copy of this instance
+ */
+ public GeometryCollection copy() {
+ Geometry[] geometries = new Geometry[this.geometries.length];
+ for (int i = 0; i < geometries.length; i++) {
+ geometries[i] = this.geometries[i].copy();
+ }
+ return new GeometryCollection(geometries, factory);
+ }
+
+ public void normalize() {
+ for (int i = 0; i < geometries.length; i++) {
+ geometries[i].normalize();
+ }
+ Arrays.sort(geometries);
+ }
+
+ protected Envelope computeEnvelopeInternal() {
+ Envelope envelope = new Envelope();
+ for (int i = 0; i < geometries.length; i++) {
+ envelope.expandToInclude(geometries[i].getEnvelopeInternal());
+ }
+ return envelope;
+ }
+
+ protected int compareToSameClass(Object o) {
+ TreeSet theseElements = new TreeSet(Arrays.asList(geometries));
+ TreeSet otherElements = new TreeSet(Arrays.asList(((GeometryCollection) o).geometries));
+ return compare(theseElements, otherElements);
+ }
+
+ protected int compareToSameClass(Object o, CoordinateSequenceComparator comp) {
+ GeometryCollection gc = (GeometryCollection) o;
+
+ int n1 = getNumGeometries();
+ int n2 = gc.getNumGeometries();
+ int i = 0;
+ while (i < n1 && i < n2) {
+ Geometry thisGeom = getGeometryN(i);
+ Geometry otherGeom = gc.getGeometryN(i);
+ int holeComp = thisGeom.compareToSameClass(otherGeom, comp);
+ if (holeComp != 0) return holeComp;
+ i++;
+ }
+ if (i < n1) return 1;
+ if (i < n2) return -1;
+ return 0;
+
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_GEOMETRYCOLLECTION;
+ }
+
+ /**
+ * Creates a {@link GeometryCollection} with
+ * every component reversed.
+ * The order of the components in the collection are not reversed.
+ *
+ * @return a {@link GeometryCollection} in the reverse order
+ */
+ public Geometry reverse()
+ {
+ int n = geometries.length;
+ Geometry[] revGeoms = new Geometry[n];
+ for (int i = 0; i < geometries.length; i++) {
+ revGeoms[i] = geometries[i].reverse();
+ }
+ return getFactory().createGeometryCollection(revGeoms);
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/GeometryCollectionIterator.java b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryCollectionIterator.java
new file mode 100644
index 0000000..b96e894
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryCollectionIterator.java
@@ -0,0 +1,139 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * Iterates over all {@link Geometry}s in a {@link Geometry},
+ * (which may be either a collection or an atomic geometry).
+ * The iteration sequence follows a pre-order, depth-first traversal of the
+ * structure of the <code>GeometryCollection</code>
+ * (which may be nested). The original <code>Geometry</code> object is
+ * returned as well (as the first object), as are all sub-collections and atomic elements.
+ * It is simple to ignore the intermediate <code>GeometryCollection</code> objects if they are not
+ * needed.
+ *
+ *@version 1.7
+ */
+public class GeometryCollectionIterator implements Iterator {
+
+ /**
+ * The <code>Geometry</code> being iterated over.
+ */
+ private Geometry parent;
+ /**
+ * Indicates whether or not the first element
+ * (the root <code>GeometryCollection</code>) has been returned.
+ */
+ private boolean atStart;
+ /**
+ * The number of <code>Geometry</code>s in the the <code>GeometryCollection</code>.
+ */
+ private int max;
+ /**
+ * The index of the <code>Geometry</code> that will be returned when <code>next</code>
+ * is called.
+ */
+ private int index;
+ /**
+ * The iterator over a nested <code>Geometry</code>, or <code>null</code>
+ * if this <code>GeometryCollectionIterator</code> is not currently iterating
+ * over a nested <code>GeometryCollection</code>.
+ */
+ private GeometryCollectionIterator subcollectionIterator;
+
+ /**
+ * Constructs an iterator over the given <code>Geometry</code>.
+ *
+ *@param parent the geometry over which to iterate; also, the first
+ * element returned by the iterator.
+ */
+ public GeometryCollectionIterator(Geometry parent) {
+ this.parent = parent;
+ atStart = true;
+ index = 0;
+ max = parent.getNumGeometries();
+ }
+
+ /**
+ * Tests whether any geometry elements remain to be returned.
+ *
+ * @return true if more geometry elements remain
+ */
+ public boolean hasNext() {
+ if (atStart) {
+ return true;
+ }
+ if (subcollectionIterator != null) {
+ if (subcollectionIterator.hasNext()) {
+ return true;
+ }
+ subcollectionIterator = null;
+ }
+ if (index >= max) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Gets the next geometry in the iteration sequence.
+ *
+ * @return the next geometry in the iteration
+ */
+ public Object next() {
+ // the parent GeometryCollection is the first object returned
+ if (atStart) {
+ atStart = false;
+ if (isAtomic(parent))
+ index++;
+ return parent;
+ }
+ if (subcollectionIterator != null) {
+ if (subcollectionIterator.hasNext()) {
+ return subcollectionIterator.next();
+ }
+ else {
+ subcollectionIterator = null;
+ }
+ }
+ if (index >= max) {
+ throw new NoSuchElementException();
+ }
+ Geometry obj = parent.getGeometryN(index++);
+ if (obj instanceof GeometryCollection) {
+ subcollectionIterator = new GeometryCollectionIterator((GeometryCollection) obj);
+ // there will always be at least one element in the sub-collection
+ return subcollectionIterator.next();
+ }
+ return obj;
+ }
+
+ private static boolean isAtomic(Geometry geom)
+ {
+ return ! (geom instanceof GeometryCollection);
+ }
+
+ /**
+ * Removal is not supported.
+ *
+ * @throws UnsupportedOperationException This method is not implemented.
+ */
+ public void remove() {
+ throw new UnsupportedOperationException(getClass().getName());
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/GeometryComponentFilter.java b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryComponentFilter.java
new file mode 100644
index 0000000..fb6779b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryComponentFilter.java
@@ -0,0 +1,47 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+
+/**
+ * <code>Geometry</code> classes support the concept of applying
+ * a <code>GeometryComponentFilter</code>
+ * filter to the <code>Geometry</code>.
+ * The filter is applied to every component of the <code>Geometry</code>
+ * which is itself a <code>Geometry</code>
+ * and which does not itself contain any components.
+ * (For instance, all the {@link LinearRing}s in {@link Polygon}s are visited,
+ * but in a {@link MultiPolygon} the {@link Polygon}s themselves are not visited.)
+ * Thus the only classes of Geometry which must be
+ * handled as arguments to {@link #filter}
+ * are {@link LineString}s, {@link LinearRing}s and {@link Point}s.
+ * <p>
+ * A <code>GeometryComponentFilter</code> filter can either
+ * record information about the <code>Geometry</code>
+ * or change the <code>Geometry</code> in some way.
+ * <code>GeometryComponentFilter</code>
+ * is an example of the Gang-of-Four Visitor pattern.
+ *
+ *@version 1.7
+ */
+public interface GeometryComponentFilter {
+
+ /**
+ * Performs an operation with or on <code>geom</code>.
+ *
+ *@param geom a <code>Geometry</code> to which the filter is applied.
+ */
+ void filter(Geometry geom);
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/GeometryFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryFactory.java
new file mode 100644
index 0000000..ff6337c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryFactory.java
@@ -0,0 +1,628 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
+import org.locationtech.jts.geom.util.GeometryEditor;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Supplies a set of utility methods for building Geometry objects from lists
+ * of Coordinates.
+ * <p>
+ * Note that the factory constructor methods do <b>not</b> change the input coordinates in any way.
+ * In particular, they are not rounded to the supplied <tt>PrecisionModel</tt>.
+ * It is assumed that input Coordinates meet the given precision.
+ *
+ *
+ * @version 1.7
+ */
+public class GeometryFactory
+ implements Serializable
+{
+ private static final long serialVersionUID = -6820524753094095635L;
+ private PrecisionModel precisionModel;
+
+ private CoordinateSequenceFactory coordinateSequenceFactory;
+
+
+ public static Point createPointFromInternalCoord(Coordinate coord, Geometry exemplar)
+ {
+ exemplar.getPrecisionModel().makePrecise(coord);
+ return exemplar.getFactory().createPoint(coord);
+ }
+
+ /**
+ * Constructs a GeometryFactory that generates Geometries having the given
+ * PrecisionModel, spatial-reference ID, and CoordinateSequence implementation.
+ */
+ public GeometryFactory(PrecisionModel precisionModel, int SRID,
+ CoordinateSequenceFactory coordinateSequenceFactory) {
+ this.precisionModel = precisionModel;
+ this.coordinateSequenceFactory = coordinateSequenceFactory;
+ this.SRID = SRID;
+ }
+
+ /**
+ * Constructs a GeometryFactory that generates Geometries having the given
+ * CoordinateSequence implementation, a double-precision floating PrecisionModel and a
+ * spatial-reference ID of 0.
+ */
+ public GeometryFactory(CoordinateSequenceFactory coordinateSequenceFactory) {
+ this(new PrecisionModel(), 0, coordinateSequenceFactory);
+ }
+
+ /**
+ * Constructs a GeometryFactory that generates Geometries having the given
+ * {@link PrecisionModel} and the default CoordinateSequence
+ * implementation.
+ *
+ * @param precisionModel the PrecisionModel to use
+ */
+ public GeometryFactory(PrecisionModel precisionModel) {
+ this(precisionModel, 0, getDefaultCoordinateSequenceFactory());
+ }
+
+ /**
+ * Constructs a GeometryFactory that generates Geometries having the given
+ * {@link PrecisionModel} and spatial-reference ID, and the default CoordinateSequence
+ * implementation.
+ *
+ * @param precisionModel the PrecisionModel to use
+ * @param SRID the SRID to use
+ */
+ public GeometryFactory(PrecisionModel precisionModel, int SRID) {
+ this(precisionModel, SRID, getDefaultCoordinateSequenceFactory());
+ }
+
+ /**
+ * Constructs a GeometryFactory that generates Geometries having a floating
+ * PrecisionModel and a spatial-reference ID of 0.
+ */
+ public GeometryFactory() {
+ this(new PrecisionModel(), 0);
+ }
+
+ private static CoordinateSequenceFactory getDefaultCoordinateSequenceFactory()
+ {
+ return CoordinateArraySequenceFactory.instance();
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param points the <code>List</code> of Points to convert
+ *@return the <code>List</code> in array format
+ */
+ public static Point[] toPointArray(Collection points) {
+ Point[] pointArray = new Point[points.size()];
+ return (Point[]) points.toArray(pointArray);
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param geometries the list of <code>Geometry's</code> to convert
+ *@return the <code>List</code> in array format
+ */
+ public static Geometry[] toGeometryArray(Collection geometries) {
+ if (geometries == null) return null;
+ Geometry[] geometryArray = new Geometry[geometries.size()];
+ return (Geometry[]) geometries.toArray(geometryArray);
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param linearRings the <code>List</code> of LinearRings to convert
+ *@return the <code>List</code> in array format
+ */
+ public static LinearRing[] toLinearRingArray(Collection linearRings) {
+ LinearRing[] linearRingArray = new LinearRing[linearRings.size()];
+ return (LinearRing[]) linearRings.toArray(linearRingArray);
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param lineStrings the <code>List</code> of LineStrings to convert
+ *@return the <code>List</code> in array format
+ */
+ public static LineString[] toLineStringArray(Collection lineStrings) {
+ LineString[] lineStringArray = new LineString[lineStrings.size()];
+ return (LineString[]) lineStrings.toArray(lineStringArray);
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param polygons the <code>List</code> of Polygons to convert
+ *@return the <code>List</code> in array format
+ */
+ public static Polygon[] toPolygonArray(Collection polygons) {
+ Polygon[] polygonArray = new Polygon[polygons.size()];
+ return (Polygon[]) polygons.toArray(polygonArray);
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param multiPolygons the <code>List</code> of MultiPolygons to convert
+ *@return the <code>List</code> in array format
+ */
+ public static MultiPolygon[] toMultiPolygonArray(Collection multiPolygons) {
+ MultiPolygon[] multiPolygonArray = new MultiPolygon[multiPolygons.size()];
+ return (MultiPolygon[]) multiPolygons.toArray(multiPolygonArray);
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param multiLineStrings the <code>List</code> of MultiLineStrings to convert
+ *@return the <code>List</code> in array format
+ */
+ public static MultiLineString[] toMultiLineStringArray(Collection multiLineStrings) {
+ MultiLineString[] multiLineStringArray = new MultiLineString[multiLineStrings.size()];
+ return (MultiLineString[]) multiLineStrings.toArray(multiLineStringArray);
+ }
+
+ /**
+ * Converts the <code>List</code> to an array.
+ *
+ *@param multiPoints the <code>List</code> of MultiPoints to convert
+ *@return the <code>List</code> in array format
+ */
+ public static MultiPoint[] toMultiPointArray(Collection multiPoints) {
+ MultiPoint[] multiPointArray = new MultiPoint[multiPoints.size()];
+ return (MultiPoint[]) multiPoints.toArray(multiPointArray);
+ }
+
+ /**
+ * Creates a {@link Geometry} with the same extent as the given envelope.
+ * The Geometry returned is guaranteed to be valid.
+ * To provide this behaviour, the following cases occur:
+ * <p>
+ * If the <code>Envelope</code> is:
+ * <ul>
+ * <li>null : returns an empty {@link Point}
+ * <li>a point : returns a non-empty {@link Point}
+ * <li>a line : returns a two-point {@link LineString}
+ * <li>a rectangle : returns a {@link Polygon} whose points are (minx, miny),
+ * (minx, maxy), (maxx, maxy), (maxx, miny), (minx, miny).
+ * </ul>
+ *
+ *@param envelope the <code>Envelope</code> to convert
+ *@return an empty <code>Point</code> (for null <code>Envelope</code>s),
+ * a <code>Point</code> (when min x = max x and min y = max y) or a
+ * <code>Polygon</code> (in all other cases)
+ */
+ public Geometry toGeometry(Envelope envelope)
+ {
+ // null envelope - return empty point geometry
+ if (envelope.isNull()) {
+ return createPoint();
+ }
+
+ // point?
+ if (envelope.getMinX() == envelope.getMaxX() && envelope.getMinY() == envelope.getMaxY()) {
+ return createPoint(new Coordinate(envelope.getMinX(), envelope.getMinY()));
+ }
+
+ // vertical or horizontal line?
+ if (envelope.getMinX() == envelope.getMaxX()
+ || envelope.getMinY() == envelope.getMaxY()) {
+ return createLineString(new Coordinate[]{
+ new Coordinate(envelope.getMinX(), envelope.getMinY()),
+ new Coordinate(envelope.getMaxX(), envelope.getMaxY())
+ });
+ }
+
+ // create a CW ring for the polygon
+ return createPolygon(createLinearRing(new Coordinate[]{
+ new Coordinate(envelope.getMinX(), envelope.getMinY()),
+ new Coordinate(envelope.getMinX(), envelope.getMaxY()),
+ new Coordinate(envelope.getMaxX(), envelope.getMaxY()),
+ new Coordinate(envelope.getMaxX(), envelope.getMinY()),
+ new Coordinate(envelope.getMinX(), envelope.getMinY())
+ }), null);
+ }
+
+ /**
+ * Returns the PrecisionModel that Geometries created by this factory
+ * will be associated with.
+ *
+ * @return the PrecisionModel for this factory
+ */
+ public PrecisionModel getPrecisionModel() {
+ return precisionModel;
+ }
+
+ public Point createPoint() {
+ return createPoint(getCoordinateSequenceFactory().create(new Coordinate[]{}));
+ }
+
+ /**
+ * Creates a Point using the given Coordinate.
+ * A null Coordinate creates an empty Geometry.
+ *
+ * @param coordinate a Coordinate, or null
+ * @return the created Point
+ */
+ public Point createPoint(Coordinate coordinate) {
+ return createPoint(coordinate != null ? getCoordinateSequenceFactory().create(new Coordinate[]{coordinate}) : null);
+ }
+
+ /**
+ * Creates a Point using the given CoordinateSequence; a null or empty
+ * CoordinateSequence will create an empty Point.
+ *
+ * @param coordinates a CoordinateSequence (possibly empty), or null
+ * @return the created Point
+ */
+ public Point createPoint(CoordinateSequence coordinates) {
+ return new Point(coordinates, this);
+ }
+
+ public MultiLineString createMultiLineString() {
+ return new MultiLineString(null, this);
+ }
+
+ /**
+ * Creates a MultiLineString using the given LineStrings; a null or empty
+ * array will create an empty MultiLineString.
+ *
+ * @param lineStrings LineStrings, each of which may be empty but not null
+ * @return the created MultiLineString
+ */
+ public MultiLineString createMultiLineString(LineString[] lineStrings) {
+ return new MultiLineString(lineStrings, this);
+ }
+
+ public GeometryCollection createGeometryCollection() {
+ return new GeometryCollection(null, this);
+ }
+
+ /**
+ * Creates a GeometryCollection using the given Geometries; a null or empty
+ * array will create an empty GeometryCollection.
+ *
+ * @param geometries an array of Geometries, each of which may be empty but not null, or null
+ * @return the created GeometryCollection
+ */
+ public GeometryCollection createGeometryCollection(Geometry[] geometries) {
+ return new GeometryCollection(geometries, this);
+ }
+
+ public MultiPolygon createMultiPolygon() {
+ return new MultiPolygon(null, this);
+ }
+
+ /**
+ * Creates a MultiPolygon using the given Polygons; a null or empty array
+ * will create an empty Polygon. The polygons must conform to the
+ * assertions specified in the <A
+ * HREF="http://www.opengis.org/techno/specs.htm">OpenGIS Simple Features
+ * Specification for SQL</A>.
+ *
+ * @param polygons
+ * Polygons, each of which may be empty but not null
+ * @return the created MultiPolygon
+ */
+ public MultiPolygon createMultiPolygon(Polygon[] polygons) {
+ return new MultiPolygon(polygons, this);
+ }
+
+ public LinearRing createLinearRing() {
+ return createLinearRing(getCoordinateSequenceFactory().create(new Coordinate[]{}));
+ }
+
+ /**
+ * Creates a {@link LinearRing} using the given {@link Coordinate}s.
+ * A null or empty array creates an empty LinearRing.
+ * The points must form a closed and simple linestring.
+ * @param coordinates an array without null elements, or an empty array, or null
+ * @return the created LinearRing
+ * @throws IllegalArgumentException if the ring is not closed, or has too few points
+ */
+ public LinearRing createLinearRing(Coordinate[] coordinates) {
+ return createLinearRing(coordinates != null ? getCoordinateSequenceFactory().create(coordinates) : null);
+ }
+
+ /**
+ * Creates a {@link LinearRing} using the given {@link CoordinateSequence}.
+ * A null or empty array creates an empty LinearRing.
+ * The points must form a closed and simple linestring.
+ *
+ * @param coordinates a CoordinateSequence (possibly empty), or null
+ * @return the created LinearRing
+ * @throws IllegalArgumentException if the ring is not closed, or has too few points
+ */
+ public LinearRing createLinearRing(CoordinateSequence coordinates) {
+ return new LinearRing(coordinates, this);
+ }
+
+ public MultiPoint createMultiPoint() {
+ return new MultiPoint(null, this);
+ }
+
+ /**
+ * Creates a {@link MultiPoint} using the given {@link Point}s.
+ * A null or empty array will create an empty MultiPoint.
+ *
+ * @param point an array of Points (without null elements), or an empty array, or <code>null</code>
+ * @return a MultiPoint object
+ */
+ public MultiPoint createMultiPoint(Point[] point) {
+ return new MultiPoint(point, this);
+ }
+
+ /**
+ * Creates a {@link MultiPoint} using the given {@link Coordinate}s.
+ * A null or empty array will create an empty MultiPoint.
+ *
+ * @param coordinates an array (without null elements), or an empty array, or <code>null</code>
+ * @return a MultiPoint object
+ * @deprecated Use {@link GeometryFactory#createMultiPointFromCoords} instead
+ */
+ public MultiPoint createMultiPoint(Coordinate[] coordinates) {
+ return createMultiPoint(coordinates != null
+ ? getCoordinateSequenceFactory().create(coordinates)
+ : null);
+ }
+
+ /**
+ * Creates a {@link MultiPoint} using the given {@link Coordinate}s.
+ * A null or empty array will create an empty MultiPoint.
+ *
+ * @param coordinates an array (without null elements), or an empty array, or <code>null</code>
+ * @return a MultiPoint object
+ */
+ public MultiPoint createMultiPointFromCoords(Coordinate[] coordinates) {
+ return createMultiPoint(coordinates != null
+ ? getCoordinateSequenceFactory().create(coordinates)
+ : null);
+ }
+
+ /**
+ * Creates a {@link MultiPoint} using the
+ * points in the given {@link CoordinateSequence}.
+ * A <code>null</code> or empty CoordinateSequence creates an empty MultiPoint.
+ *
+ * @param coordinates a CoordinateSequence (possibly empty), or <code>null</code>
+ * @return a MultiPoint geometry
+ */
+ public MultiPoint createMultiPoint(CoordinateSequence coordinates) {
+ if (coordinates == null) {
+ return createMultiPoint(new Point[0]);
+ }
+ Point[] points = new Point[coordinates.size()];
+ for (int i = 0; i < coordinates.size(); i++) {
+ CoordinateSequence ptSeq = getCoordinateSequenceFactory()
+ .create(1, coordinates.getDimension());
+ CoordinateSequences.copy(coordinates, i, ptSeq, 0, 1);
+ points[i] = createPoint(ptSeq);
+ }
+ return createMultiPoint(points);
+ }
+
+ /**
+ * Constructs a <code>Polygon</code> with the given exterior boundary and
+ * interior boundaries.
+ *
+ * @param shell
+ * the outer boundary of the new <code>Polygon</code>, or
+ * <code>null</code> or an empty <code>LinearRing</code> if
+ * the empty geometry is to be created.
+ * @param holes
+ * the inner boundaries of the new <code>Polygon</code>, or
+ * <code>null</code> or empty <code>LinearRing</code> s if
+ * the empty geometry is to be created.
+ * @throws IllegalArgumentException if a ring is invalid
+ */
+ public Polygon createPolygon(LinearRing shell, LinearRing[] holes) {
+ return new Polygon(shell, holes, this);
+ }
+
+ /**
+ * Constructs a <code>Polygon</code> with the given exterior boundary.
+ *
+ * @param shell
+ * the outer boundary of the new <code>Polygon</code>, or
+ * <code>null</code> or an empty <code>LinearRing</code> if
+ * the empty geometry is to be created.
+ * @throws IllegalArgumentException if the boundary ring is invalid
+ */
+ public Polygon createPolygon(CoordinateSequence shell) {
+ return createPolygon(createLinearRing(shell));
+ }
+
+ /**
+ * Constructs a <code>Polygon</code> with the given exterior boundary.
+ *
+ * @param shell
+ * the outer boundary of the new <code>Polygon</code>, or
+ * <code>null</code> or an empty <code>LinearRing</code> if
+ * the empty geometry is to be created.
+ * @throws IllegalArgumentException if the boundary ring is invalid
+ */
+ public Polygon createPolygon(Coordinate[] shell) {
+ return createPolygon(createLinearRing(shell));
+ }
+
+ /**
+ * Constructs a <code>Polygon</code> with the given exterior boundary.
+ *
+ * @param shell
+ * the outer boundary of the new <code>Polygon</code>, or
+ * <code>null</code> or an empty <code>LinearRing</code> if
+ * the empty geometry is to be created.
+ * @throws IllegalArgumentException if the boundary ring is invalid
+ */
+ public Polygon createPolygon(LinearRing shell) {
+ return createPolygon(shell, null);
+ }
+
+ public Polygon createPolygon() {
+ return createPolygon(null, null);
+ }
+
+ /**
+ * Build an appropriate <code>Geometry</code>, <code>MultiGeometry</code>, or
+ * <code>GeometryCollection</code> to contain the <code>Geometry</code>s in
+ * it.
+ * For example:<br>
+ *
+ * <ul>
+ * <li> If <code>geomList</code> contains a single <code>Polygon</code>,
+ * the <code>Polygon</code> is returned.
+ * <li> If <code>geomList</code> contains several <code>Polygon</code>s, a
+ * <code>MultiPolygon</code> is returned.
+ * <li> If <code>geomList</code> contains some <code>Polygon</code>s and
+ * some <code>LineString</code>s, a <code>GeometryCollection</code> is
+ * returned.
+ * <li> If <code>geomList</code> is empty, an empty <code>GeometryCollection</code>
+ * is returned
+ * </ul>
+ *
+ * Note that this method does not "flatten" Geometries in the input, and hence if
+ * any MultiGeometries are contained in the input a GeometryCollection containing
+ * them will be returned.
+ *
+ *@param geomList the <code>Geometry</code>s to combine
+ *@return a <code>Geometry</code> of the "smallest", "most
+ * type-specific" class that can contain the elements of <code>geomList</code>
+ * .
+ */
+ public Geometry buildGeometry(Collection geomList) {
+
+ /**
+ * Determine some facts about the geometries in the list
+ */
+ Class geomClass = null;
+ boolean isHeterogeneous = false;
+ boolean hasGeometryCollection = false;
+ for (Iterator i = geomList.iterator(); i.hasNext(); ) {
+ Geometry geom = (Geometry) i.next();
+ Class partClass = geom.getClass();
+ if (geomClass == null) {
+ geomClass = partClass;
+ }
+ if (partClass != geomClass) {
+ isHeterogeneous = true;
+ }
+ if (geom instanceof GeometryCollection)
+ hasGeometryCollection = true;
+ }
+
+ /**
+ * Now construct an appropriate geometry to return
+ */
+ // for the empty geometry, return an empty GeometryCollection
+ if (geomClass == null) {
+ return createGeometryCollection();
+ }
+ if (isHeterogeneous || hasGeometryCollection) {
+ return createGeometryCollection(toGeometryArray(geomList));
+ }
+ // at this point we know the collection is hetereogenous.
+ // Determine the type of the result from the first Geometry in the list
+ // this should always return a geometry, since otherwise an empty collection would have already been returned
+ Geometry geom0 = (Geometry) geomList.iterator().next();
+ boolean isCollection = geomList.size() > 1;
+ if (isCollection) {
+ if (geom0 instanceof Polygon) {
+ return createMultiPolygon(toPolygonArray(geomList));
+ }
+ else if (geom0 instanceof LineString) {
+ return createMultiLineString(toLineStringArray(geomList));
+ }
+ else if (geom0 instanceof Point) {
+ return createMultiPoint(toPointArray(geomList));
+ }
+ Assert.shouldNeverReachHere("Unhandled class: " + geom0.getClass().getName());
+ }
+ return geom0;
+ }
+
+ public LineString createLineString() {
+ return createLineString(getCoordinateSequenceFactory().create(new Coordinate[]{}));
+ }
+
+ /**
+ * Creates a LineString using the given Coordinates.
+ * A null or empty array creates an empty LineString.
+ *
+ * @param coordinates an array without null elements, or an empty array, or null
+ */
+ public LineString createLineString(Coordinate[] coordinates) {
+ return createLineString(coordinates != null ? getCoordinateSequenceFactory().create(coordinates) : null);
+ }
+ /**
+ * Creates a LineString using the given CoordinateSequence.
+ * A null or empty CoordinateSequence creates an empty LineString.
+ *
+ * @param coordinates a CoordinateSequence (possibly empty), or null
+ */
+ public LineString createLineString(CoordinateSequence coordinates) {
+ return new LineString(coordinates, this);
+ }
+
+ /**
+ * Creates a deep copy of the input {@link Geometry}.
+ * The {@link CoordinateSequenceFactory} defined for this factory
+ * is used to copy the {@link CoordinateSequence}s
+ * of the input geometry.
+ * <p>
+ * This is a convenient way to change the <tt>CoordinateSequence</tt>
+ * used to represent a geometry, or to change the
+ * factory used for a geometry.
+ * <p>
+ * {@link Geometry#copy()} can also be used to make a deep copy,
+ * but it does not allow changing the CoordinateSequence type.
+ *
+ * @return a deep copy of the input geometry, using the CoordinateSequence type of this factory
+ *
+ * @see Geometry#copy()
+ */
+ public Geometry createGeometry(Geometry g)
+ {
+ GeometryEditor editor = new GeometryEditor(this);
+ return editor.edit(g, new GeometryEditor.CoordinateSequenceOperation() {
+ public CoordinateSequence edit(CoordinateSequence coordSeq, Geometry geometry) {
+ return coordinateSequenceFactory.create(coordSeq);
+ }
+ });
+ }
+
+ /**
+ * Gets the SRID value defined for this factory.
+ *
+ * @return the factory SRID value
+ */
+ public int getSRID() {
+ return SRID;
+ }
+
+ private int SRID;
+
+ public CoordinateSequenceFactory getCoordinateSequenceFactory() {
+ return coordinateSequenceFactory;
+ }
+
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/GeometryFilter.java b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryFilter.java
new file mode 100644
index 0000000..57689ca
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/GeometryFilter.java
@@ -0,0 +1,37 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+
+/**
+ * <code>GeometryCollection</code> classes support the concept of
+ * applying a <code>GeometryFilter</code> to the <code>Geometry</code>.
+ * The filter is applied to every element <code>Geometry</code>.
+ * A <code>GeometryFilter</code> can either record information about the <code>Geometry</code>
+ * or change the <code>Geometry</code> in some way.
+ * <code>GeometryFilter</code>
+ * is an example of the Gang-of-Four Visitor pattern.
+ *
+ *@version 1.7
+ */
+public interface GeometryFilter {
+
+ /**
+ * Performs an operation with or on <code>geom</code>.
+ *
+ *@param geom a <code>Geometry</code> to which the filter is applied.
+ */
+ void filter(Geometry geom);
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/IntersectionMatrix.java b/modules/core/src/main/java/org/locationtech/jts/geom/IntersectionMatrix.java
new file mode 100644
index 0000000..9182b78
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/IntersectionMatrix.java
@@ -0,0 +1,577 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * Models a <b>Dimensionally Extended Nine-Intersection Model (DE-9IM)</b> matrix.
+ * DE-9IM matrices (such as "212FF1FF2")
+ * specify the topological relationship between two {@link Geometry}s.
+ * This class can also represent matrix patterns (such as "T*T******")
+ * which are used for matching instances of DE-9IM matrices.
+ *
+ * Methods are provided to:
+ * <UL>
+ * <LI> set and query the elements of the matrix in a convenient fashion
+ * <LI> convert to and from the standard string representation (specified in
+ * SFS Section 2.1.13.2).
+ * <LI> test to see if a matrix matches a given pattern string.
+ * </UL>
+ * <P>
+ *
+ * For a description of the DE-9IM and the spatial predicates derived from it,
+ * see the <i><A
+ * HREF="http://www.opengis.org/techno/specs.htm">OGC 99-049 OpenGIS Simple Features
+ * Specification for SQL</A></i>, as well as
+ * <i>OGC 06-103r4 OpenGIS
+ * Implementation Standard for Geographic information -
+ * Simple feature access - Part 1: Common architecture</i>
+ * (which provides some further details on certain predicate specifications).
+ * <p>
+ * The entries of the matrix are defined by the constants in the {@link Dimension} class.
+ * The indices of the matrix represent the topological locations
+ * that occur in a geometry (Interior, Boundary, Exterior).
+ * These are provided as constants in the {@link Location} class.
+ *
+ *
+ *@version 1.7
+ */
+public class IntersectionMatrix implements Cloneable {
+ /**
+ * Internal representation of this <code>IntersectionMatrix</code>.
+ */
+ private int[][] matrix;
+
+ /**
+ * Creates an <code>IntersectionMatrix</code> with <code>FALSE</code>
+ * dimension values.
+ */
+ public IntersectionMatrix() {
+ matrix = new int[3][3];
+ setAll(Dimension.FALSE);
+ }
+
+ /**
+ * Creates an <code>IntersectionMatrix</code> with the given dimension
+ * symbols.
+ *
+ *@param elements a String of nine dimension symbols in row major order
+ */
+ public IntersectionMatrix(String elements) {
+ this();
+ set(elements);
+ }
+
+ /**
+ * Creates an <code>IntersectionMatrix</code> with the same elements as
+ * <code>other</code>.
+ *
+ *@param other an <code>IntersectionMatrix</code> to copy
+ */
+ public IntersectionMatrix(IntersectionMatrix other) {
+ this();
+ matrix[Location.INTERIOR][Location.INTERIOR] = other.matrix[Location.INTERIOR][Location.INTERIOR];
+ matrix[Location.INTERIOR][Location.BOUNDARY] = other.matrix[Location.INTERIOR][Location.BOUNDARY];
+ matrix[Location.INTERIOR][Location.EXTERIOR] = other.matrix[Location.INTERIOR][Location.EXTERIOR];
+ matrix[Location.BOUNDARY][Location.INTERIOR] = other.matrix[Location.BOUNDARY][Location.INTERIOR];
+ matrix[Location.BOUNDARY][Location.BOUNDARY] = other.matrix[Location.BOUNDARY][Location.BOUNDARY];
+ matrix[Location.BOUNDARY][Location.EXTERIOR] = other.matrix[Location.BOUNDARY][Location.EXTERIOR];
+ matrix[Location.EXTERIOR][Location.INTERIOR] = other.matrix[Location.EXTERIOR][Location.INTERIOR];
+ matrix[Location.EXTERIOR][Location.BOUNDARY] = other.matrix[Location.EXTERIOR][Location.BOUNDARY];
+ matrix[Location.EXTERIOR][Location.EXTERIOR] = other.matrix[Location.EXTERIOR][Location.EXTERIOR];
+ }
+
+ /**
+ * Adds one matrix to another.
+ * Addition is defined by taking the maximum dimension value of each position
+ * in the summand matrices.
+ *
+ * @param im the matrix to add
+ */
+ public void add(IntersectionMatrix im)
+ {
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ setAtLeast(i, j, im.get(i, j));
+ }
+ }
+ }
+
+ /**
+ * Tests if the dimension value matches <tt>TRUE</tt>
+ * (i.e. has value 0, 1, 2 or TRUE).
+ *
+ *@param actualDimensionValue a number that can be stored in the <code>IntersectionMatrix</code>
+ * . Possible values are <code>{TRUE, FALSE, DONTCARE, 0, 1, 2}</code>.
+ *@return true if the dimension value matches TRUE
+ */
+ public static boolean isTrue(int actualDimensionValue) {
+ if (actualDimensionValue >= 0 || actualDimensionValue == Dimension.TRUE) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Tests if the dimension value satisfies the dimension symbol.
+ *
+ *@param actualDimensionValue a number that can be stored in the <code>IntersectionMatrix</code>
+ * . Possible values are <code>{TRUE, FALSE, DONTCARE, 0, 1, 2}</code>.
+ *@param requiredDimensionSymbol a character used in the string
+ * representation of an <code>IntersectionMatrix</code>. Possible values
+ * are <code>{T, F, * , 0, 1, 2}</code>.
+ *@return true if the dimension symbol matches
+ * the dimension value
+ */
+ public static boolean matches(int actualDimensionValue, char requiredDimensionSymbol) {
+ if (requiredDimensionSymbol == Dimension.SYM_DONTCARE) {
+ return true;
+ }
+ if (requiredDimensionSymbol == Dimension.SYM_TRUE && (actualDimensionValue >= 0 || actualDimensionValue
+ == Dimension.TRUE)) {
+ return true;
+ }
+ if (requiredDimensionSymbol == Dimension.SYM_FALSE && actualDimensionValue == Dimension.FALSE) {
+ return true;
+ }
+ if (requiredDimensionSymbol == Dimension.SYM_P && actualDimensionValue == Dimension.P) {
+ return true;
+ }
+ if (requiredDimensionSymbol == Dimension.SYM_L && actualDimensionValue == Dimension.L) {
+ return true;
+ }
+ if (requiredDimensionSymbol == Dimension.SYM_A && actualDimensionValue == Dimension.A) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Tests if each of the actual dimension symbols in a matrix string satisfies the
+ * corresponding required dimension symbol in a pattern string.
+ *
+ *@param actualDimensionSymbols nine dimension symbols to validate.
+ * Possible values are <code>{T, F, * , 0, 1, 2}</code>.
+ *@param requiredDimensionSymbols nine dimension symbols to validate
+ * against. Possible values are <code>{T, F, * , 0, 1, 2}</code>.
+ *@return true if each of the required dimension
+ * symbols encompass the corresponding actual dimension symbol
+ */
+ public static boolean matches(String actualDimensionSymbols, String requiredDimensionSymbols) {
+ IntersectionMatrix m = new IntersectionMatrix(actualDimensionSymbols);
+ return m.matches(requiredDimensionSymbols);
+ }
+
+ /**
+ * Changes the value of one of this <code>IntersectionMatrix</code>s
+ * elements.
+ *
+ *@param row the row of this <code>IntersectionMatrix</code>,
+ * indicating the interior, boundary or exterior of the first <code>Geometry</code>
+ *@param column the column of this <code>IntersectionMatrix</code>,
+ * indicating the interior, boundary or exterior of the second <code>Geometry</code>
+ *@param dimensionValue the new value of the element
+ */
+ public void set(int row, int column, int dimensionValue) {
+ matrix[row][column] = dimensionValue;
+ }
+
+ /**
+ * Changes the elements of this <code>IntersectionMatrix</code> to the
+ * dimension symbols in <code>dimensionSymbols</code>.
+ *
+ *@param dimensionSymbols nine dimension symbols to which to set this <code>IntersectionMatrix</code>
+ * s elements. Possible values are <code>{T, F, * , 0, 1, 2}</code>
+ */
+ public void set(String dimensionSymbols) {
+ for (int i = 0; i < dimensionSymbols.length(); i++) {
+ int row = i / 3;
+ int col = i % 3;
+ matrix[row][col] = Dimension.toDimensionValue(dimensionSymbols.charAt(i));
+ }
+ }
+
+ /**
+ * Changes the specified element to <code>minimumDimensionValue</code> if the
+ * element is less.
+ *
+ *@param row the row of this <code>IntersectionMatrix</code>
+ * , indicating the interior, boundary or exterior of the first <code>Geometry</code>
+ *@param column the column of this <code>IntersectionMatrix</code>
+ * , indicating the interior, boundary or exterior of the second <code>Geometry</code>
+ *@param minimumDimensionValue the dimension value with which to compare the
+ * element. The order of dimension values from least to greatest is
+ * <code>{DONTCARE, TRUE, FALSE, 0, 1, 2}</code>.
+ */
+ public void setAtLeast(int row, int column, int minimumDimensionValue) {
+ if (matrix[row][column] < minimumDimensionValue) {
+ matrix[row][column] = minimumDimensionValue;
+ }
+ }
+
+ /**
+ * If row >= 0 and column >= 0, changes the specified element to <code>minimumDimensionValue</code>
+ * if the element is less. Does nothing if row <0 or column < 0.
+ *
+ *@param row the row of this <code>IntersectionMatrix</code>
+ * , indicating the interior, boundary or exterior of the first <code>Geometry</code>
+ *@param column the column of this <code>IntersectionMatrix</code>
+ * , indicating the interior, boundary or exterior of the second <code>Geometry</code>
+ *@param minimumDimensionValue the dimension value with which to compare the
+ * element. The order of dimension values from least to greatest is
+ * <code>{DONTCARE, TRUE, FALSE, 0, 1, 2}</code>.
+ */
+ public void setAtLeastIfValid(int row, int column, int minimumDimensionValue) {
+ if (row >= 0 && column >= 0) {
+ setAtLeast(row, column, minimumDimensionValue);
+ }
+ }
+
+ /**
+ * For each element in this <code>IntersectionMatrix</code>, changes the
+ * element to the corresponding minimum dimension symbol if the element is
+ * less.
+ *
+ *@param minimumDimensionSymbols nine dimension symbols with which to
+ * compare the elements of this <code>IntersectionMatrix</code>. The
+ * order of dimension values from least to greatest is <code>{DONTCARE, TRUE, FALSE, 0, 1, 2}</code>
+ * .
+ */
+ public void setAtLeast(String minimumDimensionSymbols) {
+ for (int i = 0; i < minimumDimensionSymbols.length(); i++) {
+ int row = i / 3;
+ int col = i % 3;
+ setAtLeast(row, col, Dimension.toDimensionValue(minimumDimensionSymbols.charAt(i)));
+ }
+ }
+
+ /**
+ * Changes the elements of this <code>IntersectionMatrix</code> to <code>dimensionValue</code>
+ * .
+ *
+ *@param dimensionValue the dimension value to which to set this <code>IntersectionMatrix</code>
+ * s elements. Possible values <code>{TRUE, FALSE, DONTCARE, 0, 1, 2}</code>
+ * .
+ */
+ public void setAll(int dimensionValue) {
+ for (int ai = 0; ai < 3; ai++) {
+ for (int bi = 0; bi < 3; bi++) {
+ matrix[ai][bi] = dimensionValue;
+ }
+ }
+ }
+
+ /**
+ * Returns the value of one of this matrix
+ * entries.
+ * The value of the provided index is one of the
+ * values from the {@link Location} class.
+ * The value returned is a constant
+ * from the {@link Dimension} class.
+ *
+ *@param row the row of this <code>IntersectionMatrix</code>, indicating
+ * the interior, boundary or exterior of the first <code>Geometry</code>
+ *@param column the column of this <code>IntersectionMatrix</code>,
+ * indicating the interior, boundary or exterior of the second <code>Geometry</code>
+ *@return the dimension value at the given matrix position.
+ */
+ public int get(int row, int column) {
+ return matrix[row][column];
+ }
+
+ /**
+ * Returns <code>true</code> if this <code>IntersectionMatrix</code> is
+ * FF*FF****.
+ *
+ *@return <code>true</code> if the two <code>Geometry</code>s related by
+ * this <code>IntersectionMatrix</code> are disjoint
+ */
+ public boolean isDisjoint() {
+ return
+ matrix[Location.INTERIOR][Location.INTERIOR] == Dimension.FALSE &&
+ matrix[Location.INTERIOR][Location.BOUNDARY] == Dimension.FALSE &&
+ matrix[Location.BOUNDARY][Location.INTERIOR] == Dimension.FALSE &&
+ matrix[Location.BOUNDARY][Location.BOUNDARY] == Dimension.FALSE;
+ }
+
+ /**
+ * Returns <code>true</code> if <code>isDisjoint</code> returns false.
+ *
+ *@return <code>true</code> if the two <code>Geometry</code>s related by
+ * this <code>IntersectionMatrix</code> intersect
+ */
+ public boolean isIntersects() {
+ return ! isDisjoint();
+ }
+
+ /**
+ * Returns <code>true</code> if this <code>IntersectionMatrix</code> is
+ * FT*******, F**T***** or F***T****.
+ *
+ *@param dimensionOfGeometryA the dimension of the first <code>Geometry</code>
+ *@param dimensionOfGeometryB the dimension of the second <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>
+ * s related by this <code>IntersectionMatrix</code> touch; Returns false
+ * if both <code>Geometry</code>s are points.
+ */
+ public boolean isTouches(int dimensionOfGeometryA, int dimensionOfGeometryB) {
+ if (dimensionOfGeometryA > dimensionOfGeometryB) {
+ //no need to get transpose because pattern matrix is symmetrical
+ return isTouches(dimensionOfGeometryB, dimensionOfGeometryA);
+ }
+ if ((dimensionOfGeometryA == Dimension.A && dimensionOfGeometryB == Dimension.A) ||
+ (dimensionOfGeometryA == Dimension.L && dimensionOfGeometryB == Dimension.L) ||
+ (dimensionOfGeometryA == Dimension.L && dimensionOfGeometryB == Dimension.A) ||
+ (dimensionOfGeometryA == Dimension.P && dimensionOfGeometryB == Dimension.A) ||
+ (dimensionOfGeometryA == Dimension.P && dimensionOfGeometryB == Dimension.L)) {
+ return matrix[Location.INTERIOR][Location.INTERIOR] == Dimension.FALSE &&
+ (isTrue(matrix[Location.INTERIOR][Location.BOUNDARY])
+ || isTrue(matrix[Location.BOUNDARY][Location.INTERIOR])
+ || isTrue(matrix[Location.BOUNDARY][Location.BOUNDARY]));
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether this geometry crosses the
+ * specified geometry.
+ * <p>
+ * The <code>crosses</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>The geometries have some but not all interior points in common.
+ * <li>The DE-9IM Intersection Matrix for the two geometries is
+ * <ul>
+ * <li>T*T****** (for P/L, P/A, and L/A situations)
+ * <li>T*****T** (for L/P, L/A, and A/L situations)
+ * <li>0******** (for L/L situations)
+ * </ul>
+ * </ul>
+ * For any other combination of dimensions this predicate returns <code>false</code>.
+ * <p>
+ * The SFS defined this predicate only for P/L, P/A, L/L, and L/A situations.
+ * JTS extends the definition to apply to L/P, A/P and A/L situations as well.
+ * This makes the relation symmetric.
+ *
+ *@param dimensionOfGeometryA the dimension of the first <code>Geometry</code>
+ *@param dimensionOfGeometryB the dimension of the second <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s
+ * related by this <code>IntersectionMatrix</code> cross.
+ */
+ public boolean isCrosses(int dimensionOfGeometryA, int dimensionOfGeometryB) {
+ if ((dimensionOfGeometryA == Dimension.P && dimensionOfGeometryB == Dimension.L) ||
+ (dimensionOfGeometryA == Dimension.P && dimensionOfGeometryB == Dimension.A) ||
+ (dimensionOfGeometryA == Dimension.L && dimensionOfGeometryB == Dimension.A)) {
+ return isTrue(matrix[Location.INTERIOR][Location.INTERIOR]) &&
+ isTrue(matrix[Location.INTERIOR][Location.EXTERIOR]);
+ }
+ if ((dimensionOfGeometryA == Dimension.L && dimensionOfGeometryB == Dimension.P) ||
+ (dimensionOfGeometryA == Dimension.A && dimensionOfGeometryB == Dimension.P) ||
+ (dimensionOfGeometryA == Dimension.A && dimensionOfGeometryB == Dimension.L)) {
+ return isTrue(matrix[Location.INTERIOR][Location.INTERIOR]) &&
+ isTrue(matrix[Location.EXTERIOR][Location.INTERIOR]);
+ }
+ if (dimensionOfGeometryA == Dimension.L && dimensionOfGeometryB == Dimension.L) {
+ return matrix[Location.INTERIOR][Location.INTERIOR] == 0;
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether this <code>IntersectionMatrix</code> is
+ * T*F**F***.
+ *
+ *@return <code>true</code> if the first <code>Geometry</code> is within
+ * the second
+ */
+ public boolean isWithin() {
+ return isTrue(matrix[Location.INTERIOR][Location.INTERIOR]) &&
+ matrix[Location.INTERIOR][Location.EXTERIOR] == Dimension.FALSE &&
+ matrix[Location.BOUNDARY][Location.EXTERIOR] == Dimension.FALSE;
+ }
+
+ /**
+ * Tests whether this <code>IntersectionMatrix</code> is
+ * T*****FF*.
+ *
+ *@return <code>true</code> if the first <code>Geometry</code> contains the
+ * second
+ */
+ public boolean isContains() {
+ return isTrue(matrix[Location.INTERIOR][Location.INTERIOR]) &&
+ matrix[Location.EXTERIOR][Location.INTERIOR] == Dimension.FALSE &&
+ matrix[Location.EXTERIOR][Location.BOUNDARY] == Dimension.FALSE;
+ }
+
+ /**
+ * Returns <code>true</code> if this <code>IntersectionMatrix</code> is
+ * <code>T*****FF*</code>
+ * or <code>*T****FF*</code>
+ * or <code>***T**FF*</code>
+ * or <code>****T*FF*</code>
+ *
+ *@return <code>true</code> if the first <code>Geometry</code> covers the
+ * second
+ */
+ public boolean isCovers() {
+ boolean hasPointInCommon =
+ isTrue(matrix[Location.INTERIOR][Location.INTERIOR])
+ || isTrue(matrix[Location.INTERIOR][Location.BOUNDARY])
+ || isTrue(matrix[Location.BOUNDARY][Location.INTERIOR])
+ || isTrue(matrix[Location.BOUNDARY][Location.BOUNDARY]);
+
+ return hasPointInCommon &&
+ matrix[Location.EXTERIOR][Location.INTERIOR] == Dimension.FALSE &&
+ matrix[Location.EXTERIOR][Location.BOUNDARY] == Dimension.FALSE;
+ }
+
+ /**
+ * Returns <code>true</code> if this <code>IntersectionMatrix</code> is
+ * <code>T*F**F***</code>
+ * or <code>*TF**F***</code>
+ * or <code>**FT*F***</code>
+ * or <code>**F*TF***</code>
+ *
+ *@return <code>true</code> if the first <code>Geometry</code>
+ * is covered by the second
+ */
+ public boolean isCoveredBy() {
+ boolean hasPointInCommon =
+ isTrue(matrix[Location.INTERIOR][Location.INTERIOR])
+ || isTrue(matrix[Location.INTERIOR][Location.BOUNDARY])
+ || isTrue(matrix[Location.BOUNDARY][Location.INTERIOR])
+ || isTrue(matrix[Location.BOUNDARY][Location.BOUNDARY]);
+
+ return hasPointInCommon &&
+ matrix[Location.INTERIOR][Location.EXTERIOR] == Dimension.FALSE &&
+ matrix[Location.BOUNDARY][Location.EXTERIOR] == Dimension.FALSE;
+ }
+
+ /**
+ * Tests whether the argument dimensions are equal and
+ * this <code>IntersectionMatrix</code> matches
+ * the pattern <tt>T*F**FFF*</tt>.
+ * <p>
+ * <b>Note:</b> This pattern differs from the one stated in
+ * <i>Simple feature access - Part 1: Common architecture</i>.
+ * That document states the pattern as <tt>TFFFTFFFT</tt>. This would
+ * specify that
+ * two identical <tt>POINT</tt>s are not equal, which is not desirable behaviour.
+ * The pattern used here has been corrected to compute equality in this situation.
+ *
+ *@param dimensionOfGeometryA the dimension of the first <code>Geometry</code>
+ *@param dimensionOfGeometryB the dimension of the second <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s
+ * related by this <code>IntersectionMatrix</code> are equal; the
+ * <code>Geometry</code>s must have the same dimension to be equal
+ */
+ public boolean isEquals(int dimensionOfGeometryA, int dimensionOfGeometryB) {
+ if (dimensionOfGeometryA != dimensionOfGeometryB) {
+ return false;
+ }
+ return isTrue(matrix[Location.INTERIOR][Location.INTERIOR]) &&
+ matrix[Location.INTERIOR][Location.EXTERIOR] == Dimension.FALSE &&
+ matrix[Location.BOUNDARY][Location.EXTERIOR] == Dimension.FALSE &&
+ matrix[Location.EXTERIOR][Location.INTERIOR] == Dimension.FALSE &&
+ matrix[Location.EXTERIOR][Location.BOUNDARY] == Dimension.FALSE;
+ }
+
+ /**
+ * Returns <code>true</code> if this <code>IntersectionMatrix</code> is
+ * <UL>
+ * <LI> T*T***T** (for two points or two surfaces)
+ * <LI> 1*T***T** (for two curves)
+ * </UL>.
+ *
+ *@param dimensionOfGeometryA the dimension of the first <code>Geometry</code>
+ *@param dimensionOfGeometryB the dimension of the second <code>Geometry</code>
+ *@return <code>true</code> if the two <code>Geometry</code>s
+ * related by this <code>IntersectionMatrix</code> overlap. For this
+ * function to return <code>true</code>, the <code>Geometry</code>s must
+ * be two points, two curves or two surfaces.
+ */
+ public boolean isOverlaps(int dimensionOfGeometryA, int dimensionOfGeometryB) {
+ if ((dimensionOfGeometryA == Dimension.P && dimensionOfGeometryB == Dimension.P) ||
+ (dimensionOfGeometryA == Dimension.A && dimensionOfGeometryB == Dimension.A)) {
+ return isTrue(matrix[Location.INTERIOR][Location.INTERIOR])
+ && isTrue(matrix[Location.INTERIOR][Location.EXTERIOR])
+ && isTrue(matrix[Location.EXTERIOR][Location.INTERIOR]);
+ }
+ if (dimensionOfGeometryA == Dimension.L && dimensionOfGeometryB == Dimension.L) {
+ return matrix[Location.INTERIOR][Location.INTERIOR] == 1
+ && isTrue(matrix[Location.INTERIOR][Location.EXTERIOR])
+ && isTrue(matrix[Location.EXTERIOR][Location.INTERIOR]);
+ }
+ return false;
+ }
+
+ /**
+ * Returns whether the elements of this <code>IntersectionMatrix</code>
+ * satisfies the required dimension symbols.
+ *
+ *@param requiredDimensionSymbols nine dimension symbols with which to
+ * compare the elements of this <code>IntersectionMatrix</code>. Possible
+ * values are <code>{T, F, * , 0, 1, 2}</code>.
+ *@return <code>true</code> if this <code>IntersectionMatrix</code>
+ * matches the required dimension symbols
+ */
+ public boolean matches(String requiredDimensionSymbols) {
+ if (requiredDimensionSymbols.length() != 9) {
+ throw new IllegalArgumentException("Should be length 9: " + requiredDimensionSymbols);
+ }
+ for (int ai = 0; ai < 3; ai++) {
+ for (int bi = 0; bi < 3; bi++) {
+ if (!matches(matrix[ai][bi], requiredDimensionSymbols.charAt(3 * ai +
+ bi))) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Transposes this IntersectionMatrix.
+ *
+ *@return this <code>IntersectionMatrix</code> as a convenience
+ */
+ public IntersectionMatrix transpose() {
+ int temp = matrix[1][0];
+ matrix[1][0] = matrix[0][1];
+ matrix[0][1] = temp;
+ temp = matrix[2][0];
+ matrix[2][0] = matrix[0][2];
+ matrix[0][2] = temp;
+ temp = matrix[2][1];
+ matrix[2][1] = matrix[1][2];
+ matrix[1][2] = temp;
+ return this;
+ }
+
+ /**
+ * Returns a nine-character <code>String</code> representation of this <code>IntersectionMatrix</code>
+ * .
+ *
+ *@return the nine dimension symbols of this <code>IntersectionMatrix</code>
+ * in row-major order.
+ */
+ public String toString() {
+ StringBuilder builder = new StringBuilder("123456789");
+ for (int ai = 0; ai < 3; ai++) {
+ for (int bi = 0; bi < 3; bi++) {
+ builder.setCharAt(3 * ai + bi, Dimension.toDimensionSymbol(matrix[ai][bi]));
+ }
+ }
+ return builder.toString();
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/LineSegment.java b/modules/core/src/main/java/org/locationtech/jts/geom/LineSegment.java
new file mode 100644
index 0000000..7f8a301
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/LineSegment.java
@@ -0,0 +1,655 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.io.Serializable;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.algorithm.HCoordinate;
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.NotRepresentableException;
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+
+
+/**
+ * Represents a line segment defined by two {@link Coordinate}s.
+ * Provides methods to compute various geometric properties
+ * and relationships of line segments.
+ * <p>
+ * This class is designed to be easily mutable (to the extent of
+ * having its contained points public).
+ * This supports a common pattern of reusing a single LineSegment
+ * object as a way of computing segment properties on the
+ * segments defined by arrays or lists of {@link Coordinate}s.
+ *
+ *@version 1.7
+ */
+public class LineSegment
+ implements Comparable, Serializable
+{
+ private static final long serialVersionUID = 3252005833466256227L;
+
+ public Coordinate p0, p1;
+
+ public LineSegment(Coordinate p0, Coordinate p1) {
+ this.p0 = p0;
+ this.p1 = p1;
+ }
+
+ public LineSegment(double x0, double y0, double x1, double y1) {
+ this(new Coordinate(x0, y0), new Coordinate(x1, y1));
+ }
+
+ public LineSegment(LineSegment ls) {
+ this(ls.p0, ls.p1);
+ }
+
+ public LineSegment() {
+ this(new Coordinate(), new Coordinate());
+ }
+
+ public Coordinate getCoordinate(int i)
+ {
+ if (i == 0) return p0;
+ return p1;
+ }
+
+ public void setCoordinates(LineSegment ls)
+ {
+ setCoordinates(ls.p0, ls.p1);
+ }
+
+ public void setCoordinates(Coordinate p0, Coordinate p1)
+ {
+ this.p0.x = p0.x;
+ this.p0.y = p0.y;
+ this.p1.x = p1.x;
+ this.p1.y = p1.y;
+ }
+
+ /**
+ * Gets the minimum X ordinate.
+ * @return the minimum X ordinate
+ */
+ public double minX() {
+ return Math.min(p0.x, p1.x);
+ }
+
+ /**
+ * Gets the maximum X ordinate.
+ * @return the maximum X ordinate
+ */
+ public double maxX() {
+ return Math.max(p0.x, p1.x);
+ }
+
+ /**
+ * Gets the minimum Y ordinate.
+ * @return the minimum Y ordinate
+ */
+ public double minY() {
+ return Math.min(p0.y, p1.y);
+ }
+
+ /**
+ * Gets the maximum Y ordinate.
+ * @return the maximum Y ordinate
+ */
+ public double maxY() {
+ return Math.max(p0.y, p1.y);
+ }
+
+ /**
+ * Computes the length of the line segment.
+ * @return the length of the line segment
+ */
+ public double getLength()
+ {
+ return p0.distance(p1);
+ }
+
+ /**
+ * Tests whether the segment is horizontal.
+ *
+ * @return <code>true</code> if the segment is horizontal
+ */
+ public boolean isHorizontal() { return p0.y == p1.y; }
+
+ /**
+ * Tests whether the segment is vertical.
+ *
+ * @return <code>true</code> if the segment is vertical
+ */
+ public boolean isVertical() { return p0.x == p1.x; }
+
+ /**
+ * Determines the orientation of a LineSegment relative to this segment.
+ * The concept of orientation is specified as follows:
+ * Given two line segments A and L,
+ * <ul>
+ * <li>A is to the left of a segment L if A lies wholly in the
+ * closed half-plane lying to the left of L
+ * <li>A is to the right of a segment L if A lies wholly in the
+ * closed half-plane lying to the right of L
+ * <li>otherwise, A has indeterminate orientation relative to L. This
+ * happens if A is collinear with L or if A crosses the line determined by L.
+ * </ul>
+ *
+ * @param seg the LineSegment to compare
+ *
+ * @return 1 if <code>seg</code> is to the left of this segment
+ * @return -1 if <code>seg</code> is to the right of this segment
+ * @return 0 if <code>seg</code> is collinear to or crosses this segment
+ */
+ public int orientationIndex(LineSegment seg)
+ {
+ int orient0 = Orientation.index(p0, p1, seg.p0);
+ int orient1 = Orientation.index(p0, p1, seg.p1);
+ // this handles the case where the points are L or collinear
+ if (orient0 >= 0 && orient1 >= 0)
+ return Math.max(orient0, orient1);
+ // this handles the case where the points are R or collinear
+ if (orient0 <= 0 && orient1 <= 0)
+ return Math.max(orient0, orient1);
+ // points lie on opposite sides ==> indeterminate orientation
+ return 0;
+ }
+
+ /**
+ * Determines the orientation index of a {@link Coordinate} relative to this segment.
+ * The orientation index is as defined in {@link Orientation#computeOrientation}.
+ *
+ * @param p the coordinate to compare
+ *
+ * @return 1 (LEFT) if <code>p</code> is to the left of this segment
+ * @return -1 (RIGHT) if <code>p</code> is to the right of this segment
+ * @return 0 (COLLINEAR) if <code>p</code> is collinear with this segment
+ *
+ * @see Orientation#computeOrientation(Coordinate, Coordinate, Coordinate)
+ */
+ public int orientationIndex(Coordinate p)
+ {
+ return Orientation.index(p0, p1, p);
+ }
+
+ /**
+ * Reverses the direction of the line segment.
+ */
+ public void reverse()
+ {
+ Coordinate temp = p0;
+ p0 = p1;
+ p1 = temp;
+ }
+
+ /**
+ * Puts the line segment into a normalized form.
+ * This is useful for using line segments in maps and indexes when
+ * topological equality rather than exact equality is desired.
+ * A segment in normalized form has the first point smaller
+ * than the second (according to the standard ordering on {@link Coordinate}).
+ */
+ public void normalize()
+ {
+ if (p1.compareTo(p0) < 0) reverse();
+ }
+
+ /**
+ * Computes the angle that the vector defined by this segment
+ * makes with the X-axis.
+ * The angle will be in the range [ -PI, PI ] radians.
+ *
+ * @return the angle this segment makes with the X-axis (in radians)
+ */
+ public double angle()
+ {
+ return Math.atan2(p1.y - p0.y, p1.x - p0.x);
+ }
+
+ /**
+ * Computes the midpoint of the segment
+ *
+ * @return the midpoint of the segment
+ */
+ public Coordinate midPoint()
+ {
+ return midPoint(p0, p1);
+ }
+
+ /**
+ * Computes the midpoint of a segment
+ *
+ * @return the midpoint of the segment
+ */
+ public static Coordinate midPoint(Coordinate p0, Coordinate p1)
+ {
+ return new Coordinate( (p0.x + p1.x) / 2,
+ (p0.y + p1.y) / 2);
+ }
+
+ /**
+ * Computes the distance between this line segment and another segment.
+ *
+ * @return the distance to the other segment
+ */
+ public double distance(LineSegment ls)
+ {
+ return Distance.segmentToSegment(p0, p1, ls.p0, ls.p1);
+ }
+
+ /**
+ * Computes the distance between this line segment and a given point.
+ *
+ * @return the distance from this segment to the given point
+ */
+ public double distance(Coordinate p)
+ {
+ return Distance.pointToSegment(p, p0, p1);
+ }
+
+ /**
+ * Computes the perpendicular distance between the (infinite) line defined
+ * by this line segment and a point.
+ *
+ * @return the perpendicular distance between the defined line and the given point
+ */
+ public double distancePerpendicular(Coordinate p)
+ {
+ return Distance.pointToLinePerpendicular(p, p0, p1);
+ }
+
+ /**
+ * Computes the {@link Coordinate} that lies a given
+ * fraction along the line defined by this segment.
+ * A fraction of <code>0.0</code> returns the start point of the segment;
+ * a fraction of <code>1.0</code> returns the end point of the segment.
+ * If the fraction is < 0.0 or > 1.0 the point returned
+ * will lie before the start or beyond the end of the segment.
+ *
+ * @param segmentLengthFraction the fraction of the segment length along the line
+ * @return the point at that distance
+ */
+ public Coordinate pointAlong(double segmentLengthFraction)
+ {
+ Coordinate coord = new Coordinate();
+ coord.x = p0.x + segmentLengthFraction * (p1.x - p0.x);
+ coord.y = p0.y + segmentLengthFraction * (p1.y - p0.y);
+ return coord;
+ }
+
+ /**
+ * Computes the {@link Coordinate} that lies a given
+ * fraction along the line defined by this segment and offset from
+ * the segment by a given distance.
+ * A fraction of <code>0.0</code> offsets from the start point of the segment;
+ * a fraction of <code>1.0</code> offsets from the end point of the segment.
+ * The computed point is offset to the left of the line if the offset distance is
+ * positive, to the right if negative.
+ *
+ * @param segmentLengthFraction the fraction of the segment length along the line
+ * @param offsetDistance the distance the point is offset from the segment
+ * (positive is to the left, negative is to the right)
+ * @return the point at that distance and offset
+ *
+ * @throws IllegalStateException if the segment has zero length
+ */
+ public Coordinate pointAlongOffset(double segmentLengthFraction, double offsetDistance)
+ {
+ // the point on the segment line
+ double segx = p0.x + segmentLengthFraction * (p1.x - p0.x);
+ double segy = p0.y + segmentLengthFraction * (p1.y - p0.y);
+
+ double dx = p1.x - p0.x;
+ double dy = p1.y - p0.y;
+ double len = Math.sqrt(dx * dx + dy * dy);
+ double ux = 0.0;
+ double uy = 0.0;
+ if (offsetDistance != 0.0) {
+ if (len <= 0.0)
+ throw new IllegalStateException("Cannot compute offset from zero-length line segment");
+
+ // u is the vector that is the length of the offset, in the direction of the segment
+ ux = offsetDistance * dx / len;
+ uy = offsetDistance * dy / len;
+ }
+
+ // the offset point is the seg point plus the offset vector rotated 90 degrees CCW
+ double offsetx = segx - uy;
+ double offsety = segy + ux;
+
+ Coordinate coord = new Coordinate(offsetx, offsety);
+ return coord;
+ }
+
+ /**
+ * Computes the Projection Factor for the projection of the point p
+ * onto this LineSegment. The Projection Factor is the constant r
+ * by which the vector for this segment must be multiplied to
+ * equal the vector for the projection of <tt>p</tt> on the line
+ * defined by this segment.
+ * <p>
+ * The projection factor will lie in the range <tt>(-inf, +inf)</tt>,
+ * or be <code>NaN</code> if the line segment has zero length..
+ *
+ * @param p the point to compute the factor for
+ * @return the projection factor for the point
+ */
+ public double projectionFactor(Coordinate p)
+ {
+ if (p.equals(p0)) return 0.0;
+ if (p.equals(p1)) return 1.0;
+ // Otherwise, use comp.graphics.algorithms Frequently Asked Questions method
+ /* AC dot AB
+ r = ---------
+ ||AB||^2
+ r has the following meaning:
+ r=0 P = A
+ r=1 P = B
+ r<0 P is on the backward extension of AB
+ r>1 P is on the forward extension of AB
+ 0<r<1 P is interior to AB
+ */
+ double dx = p1.x - p0.x;
+ double dy = p1.y - p0.y;
+ double len = dx * dx + dy * dy;
+
+ // handle zero-length segments
+ if (len <= 0.0) return Double.NaN;
+
+ double r = ( (p.x - p0.x) * dx + (p.y - p0.y) * dy )
+ / len;
+ return r;
+ }
+
+ /**
+ * Computes the fraction of distance (in <tt>[0.0, 1.0]</tt>)
+ * that the projection of a point occurs along this line segment.
+ * If the point is beyond either ends of the line segment,
+ * the closest fractional value (<tt>0.0</tt> or <tt>1.0</tt>) is returned.
+ * <p>
+ * Essentially, this is the {@link #projectionFactor} clamped to
+ * the range <tt>[0.0, 1.0]</tt>.
+ * If the segment has zero length, 1.0 is returned.
+ *
+ * @param inputPt the point
+ * @return the fraction along the line segment the projection of the point occurs
+ */
+ public double segmentFraction(
+ Coordinate inputPt)
+ {
+ double segFrac = projectionFactor(inputPt);
+ if (segFrac < 0.0)
+ segFrac = 0.0;
+ else if (segFrac > 1.0 || Double.isNaN(segFrac))
+ segFrac = 1.0;
+ return segFrac;
+ }
+
+ /**
+ * Compute the projection of a point onto the line determined
+ * by this line segment.
+ * <p>
+ * Note that the projected point
+ * may lie outside the line segment. If this is the case,
+ * the projection factor will lie outside the range [0.0, 1.0].
+ */
+ public Coordinate project(Coordinate p)
+ {
+ if (p.equals(p0) || p.equals(p1)) return new Coordinate(p);
+
+ double r = projectionFactor(p);
+ Coordinate coord = new Coordinate();
+ coord.x = p0.x + r * (p1.x - p0.x);
+ coord.y = p0.y + r * (p1.y - p0.y);
+ return coord;
+ }
+ /**
+ * Project a line segment onto this line segment and return the resulting
+ * line segment. The returned line segment will be a subset of
+ * the target line line segment. This subset may be null, if
+ * the segments are oriented in such a way that there is no projection.
+ * <p>
+ * Note that the returned line may have zero length (i.e. the same endpoints).
+ * This can happen for instance if the lines are perpendicular to one another.
+ *
+ * @param seg the line segment to project
+ * @return the projected line segment, or <code>null</code> if there is no overlap
+ */
+ public LineSegment project(LineSegment seg)
+ {
+ double pf0 = projectionFactor(seg.p0);
+ double pf1 = projectionFactor(seg.p1);
+ // check if segment projects at all
+ if (pf0 >= 1.0 && pf1 >= 1.0) return null;
+ if (pf0 <= 0.0 && pf1 <= 0.0) return null;
+
+ Coordinate newp0 = project(seg.p0);
+ if (pf0 < 0.0) newp0 = p0;
+ if (pf0 > 1.0) newp0 = p1;
+
+ Coordinate newp1 = project(seg.p1);
+ if (pf1 < 0.0) newp1 = p0;
+ if (pf1 > 1.0) newp1 = p1;
+
+ return new LineSegment(newp0, newp1);
+ }
+ /**
+ * Computes the closest point on this line segment to another point.
+ * @param p the point to find the closest point to
+ * @return a Coordinate which is the closest point on the line segment to the point p
+ */
+ public Coordinate closestPoint(Coordinate p)
+ {
+ double factor = projectionFactor(p);
+ if (factor > 0 && factor < 1) {
+ return project(p);
+ }
+ double dist0 = p0.distance(p);
+ double dist1 = p1.distance(p);
+ if (dist0 < dist1)
+ return p0;
+ return p1;
+ }
+ /**
+ * Computes the closest points on two line segments.
+ *
+ * @param line the segment to find the closest point to
+ * @return a pair of Coordinates which are the closest points on the line segments
+ */
+ public Coordinate[] closestPoints(LineSegment line)
+ {
+ // test for intersection
+ Coordinate intPt = intersection(line);
+ if (intPt != null) {
+ return new Coordinate[] { intPt, intPt };
+ }
+
+ /**
+ * if no intersection closest pair contains at least one endpoint.
+ * Test each endpoint in turn.
+ */
+ Coordinate[] closestPt = new Coordinate[2];
+ double minDistance = Double.MAX_VALUE;
+ double dist;
+
+ Coordinate close00 = closestPoint(line.p0);
+ minDistance = close00.distance(line.p0);
+ closestPt[0] = close00;
+ closestPt[1] = line.p0;
+
+ Coordinate close01 = closestPoint(line.p1);
+ dist = close01.distance(line.p1);
+ if (dist < minDistance) {
+ minDistance = dist;
+ closestPt[0] = close01;
+ closestPt[1] = line.p1;
+ }
+
+ Coordinate close10 = line.closestPoint(p0);
+ dist = close10.distance(p0);
+ if (dist < minDistance) {
+ minDistance = dist;
+ closestPt[0] = p0;
+ closestPt[1] = close10;
+ }
+
+ Coordinate close11 = line.closestPoint(p1);
+ dist = close11.distance(p1);
+ if (dist < minDistance) {
+ minDistance = dist;
+ closestPt[0] = p1;
+ closestPt[1] = close11;
+ }
+
+ return closestPt;
+ }
+
+ /**
+ * Computes an intersection point between two line segments, if there is one.
+ * There may be 0, 1 or many intersection points between two segments.
+ * If there are 0, null is returned. If there is 1 or more,
+ * exactly one of them is returned
+ * (chosen at the discretion of the algorithm).
+ * If more information is required about the details of the intersection,
+ * the {@link RobustLineIntersector} class should be used.
+ *
+ * @param line a line segment
+ * @return an intersection point, or <code>null</code> if there is none
+ *
+ * @see RobustLineIntersector
+ */
+ public Coordinate intersection(LineSegment line)
+ {
+ LineIntersector li = new RobustLineIntersector();
+ li.computeIntersection(p0, p1, line.p0, line.p1);
+ if (li.hasIntersection())
+ return li.getIntersection(0);
+ return null;
+ }
+
+ /**
+ * Computes the intersection point of the lines of infinite extent defined
+ * by two line segments (if there is one).
+ * There may be 0, 1 or an infinite number of intersection points
+ * between two lines.
+ * If there is a unique intersection point, it is returned.
+ * Otherwise, <tt>null</tt> is returned.
+ * If more information is required about the details of the intersection,
+ * the {@link RobustLineIntersector} class should be used.
+ *
+ * @param line a line segment defining an straight line with infinite extent
+ * @return an intersection point,
+ * or <code>null</code> if there is no point of intersection
+ * or an infinite number of intersection points
+ *
+ * @see RobustLineIntersector
+ */
+ public Coordinate lineIntersection(LineSegment line)
+ {
+ try {
+ Coordinate intPt = HCoordinate.intersection(p0, p1, line.p0, line.p1);
+ return intPt;
+ }
+ catch (NotRepresentableException ex) {
+ // eat this exception, and return null;
+ }
+ return null;
+ }
+
+ /**
+ * Creates a LineString with the same coordinates as this segment
+ *
+ * @param geomFactory the geometry factory to use
+ * @return a LineString with the same geometry as this segment
+ */
+ public LineString toGeometry(GeometryFactory geomFactory)
+ {
+ return geomFactory.createLineString(new Coordinate[] { p0, p1 });
+ }
+
+ /**
+ * Returns <code>true</code> if <code>other</code> has the same values for
+ * its points.
+ *
+ *@param o a <code>LineSegment</code> with which to do the comparison.
+ *@return <code>true</code> if <code>other</code> is a <code>LineSegment</code>
+ * with the same values for the x and y ordinates.
+ */
+ public boolean equals(Object o) {
+ if (!(o instanceof LineSegment)) {
+ return false;
+ }
+ LineSegment other = (LineSegment) o;
+ return p0.equals(other.p0) && p1.equals(other.p1);
+ }
+
+ /**
+ * Gets a hashcode for this object.
+ *
+ * @return a hashcode for this object
+ */
+ public int hashCode() {
+ long bits0 = java.lang.Double.doubleToLongBits(p0.x);
+ bits0 ^= java.lang.Double.doubleToLongBits(p0.y) * 31;
+ int hash0 = (((int) bits0) ^ ((int) (bits0 >> 32)));
+
+ long bits1 = java.lang.Double.doubleToLongBits(p1.x);
+ bits1 ^= java.lang.Double.doubleToLongBits(p1.y) * 31;
+ int hash1 = (((int) bits1) ^ ((int) (bits1 >> 32)));
+
+ // XOR is supposed to be a good way to combine hashcodes
+ return hash0 ^ hash1;
+ }
+
+ /**
+ * Compares this object with the specified object for order.
+ * Uses the standard lexicographic ordering for the points in the LineSegment.
+ *
+ *@param o the <code>LineSegment</code> with which this <code>LineSegment</code>
+ * is being compared
+ *@return a negative integer, zero, or a positive integer as this <code>LineSegment</code>
+ * is less than, equal to, or greater than the specified <code>LineSegment</code>
+ */
+ public int compareTo(Object o) {
+ LineSegment other = (LineSegment) o;
+ int comp0 = p0.compareTo(other.p0);
+ if (comp0 != 0) return comp0;
+ return p1.compareTo(other.p1);
+ }
+
+ /**
+ * Returns <code>true</code> if <code>other</code> is
+ * topologically equal to this LineSegment (e.g. irrespective
+ * of orientation).
+ *
+ *@param other a <code>LineSegment</code> with which to do the comparison.
+ *@return <code>true</code> if <code>other</code> is a <code>LineSegment</code>
+ * with the same values for the x and y ordinates.
+ */
+ public boolean equalsTopo(LineSegment other)
+ {
+ return
+ p0.equals(other.p0) && p1.equals(other.p1)
+ || p0.equals(other.p1) && p1.equals(other.p0);
+ }
+
+ public String toString()
+ {
+ return "LINESTRING( " +
+ p0.x + " " + p0.y
+ + ", " +
+ p1.x + " " + p1.y + ")";
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/LineString.java b/modules/core/src/main/java/org/locationtech/jts/geom/LineString.java
new file mode 100644
index 0000000..67f8bf2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/LineString.java
@@ -0,0 +1,336 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.algorithm.Length;
+import org.locationtech.jts.operation.BoundaryOp;
+
+/**
+ * Models an OGC-style <code>LineString</code>.
+ * A LineString consists of a sequence of two or more vertices,
+ * along with all points along the linearly-interpolated curves
+ * (line segments) between each
+ * pair of consecutive vertices.
+ * Consecutive vertices may be equal.
+ * The line segments in the line may intersect each other (in other words,
+ * the linestring may "curl back" in itself and self-intersect.
+ * Linestrings with exactly two identical points are invalid.
+ * <p>
+ * A linestring must have either 0 or 2 or more points.
+ * If these conditions are not met, the constructors throw
+ * an {@link IllegalArgumentException}
+ *
+ *@version 1.7
+ */
+public class LineString
+ extends Geometry
+ implements Lineal
+{
+ private static final long serialVersionUID = 3110669828065365560L;
+ /**
+ * The points of this <code>LineString</code>.
+ */
+ protected CoordinateSequence points;
+
+ /**
+ * Constructs a <code>LineString</code> with the given points.
+ *
+ *@param points the points of the linestring, or <code>null</code>
+ * to create the empty geometry. This array must not contain <code>null</code>
+ * elements. Consecutive points may be equal.
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>LineString</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>LineString</code>
+ * @throws IllegalArgumentException if too few points are provided
+ */
+ /** @deprecated Use GeometryFactory instead */
+ public LineString(Coordinate points[], PrecisionModel precisionModel, int SRID)
+ {
+ super(new GeometryFactory(precisionModel, SRID));
+ init(getFactory().getCoordinateSequenceFactory().create(points));
+ }
+
+ /**
+ * Constructs a <code>LineString</code> with the given points.
+ *
+ *@param points the points of the linestring, or <code>null</code>
+ * to create the empty geometry.
+ * @throws IllegalArgumentException if too few points are provided
+ */
+ public LineString(CoordinateSequence points, GeometryFactory factory) {
+ super(factory);
+ init(points);
+ }
+
+ private void init(CoordinateSequence points)
+ {
+ if (points == null) {
+ points = getFactory().getCoordinateSequenceFactory().create(new Coordinate[]{});
+ }
+ if (points.size() == 1) {
+ throw new IllegalArgumentException("Invalid number of points in LineString (found "
+ + points.size() + " - must be 0 or >= 2)");
+ }
+ this.points = points;
+ }
+ public Coordinate[] getCoordinates() {
+ return points.toCoordinateArray();
+ }
+
+ public CoordinateSequence getCoordinateSequence() {
+ return points;
+ }
+
+ public Coordinate getCoordinateN(int n) {
+ return points.getCoordinate(n);
+ }
+
+ public Coordinate getCoordinate()
+ {
+ if (isEmpty()) return null;
+ return points.getCoordinate(0);
+ }
+
+ public int getDimension() {
+ return 1;
+ }
+
+ public int getBoundaryDimension() {
+ if (isClosed()) {
+ return Dimension.FALSE;
+ }
+ return 0;
+ }
+
+ public boolean isEmpty() {
+ return points.size() == 0;
+ }
+
+ public int getNumPoints() {
+ return points.size();
+ }
+
+ public Point getPointN(int n) {
+ return getFactory().createPoint(points.getCoordinate(n));
+ }
+
+ public Point getStartPoint() {
+ if (isEmpty()) {
+ return null;
+ }
+ return getPointN(0);
+ }
+
+ public Point getEndPoint() {
+ if (isEmpty()) {
+ return null;
+ }
+ return getPointN(getNumPoints() - 1);
+ }
+
+ public boolean isClosed() {
+ if (isEmpty()) {
+ return false;
+ }
+ return getCoordinateN(0).equals2D(getCoordinateN(getNumPoints() - 1));
+ }
+
+ public boolean isRing() {
+ return isClosed() && isSimple();
+ }
+
+ public String getGeometryType() {
+ return "LineString";
+ }
+
+ /**
+ * Returns the length of this <code>LineString</code>
+ *
+ *@return the length of the linestring
+ */
+ public double getLength()
+ {
+ return Length.ofLine(points);
+ }
+
+ /**
+ * Gets the boundary of this geometry.
+ * The boundary of a lineal geometry is always a zero-dimensional geometry (which may be empty).
+ *
+ * @return the boundary geometry
+ * @see Geometry#getBoundary
+ */
+ public Geometry getBoundary() {
+ return (new BoundaryOp(this)).getBoundary();
+ }
+
+ /**
+ * Creates a {@link LineString} whose coordinates are in the reverse
+ * order of this objects
+ *
+ * @return a {@link LineString} with coordinates in the reverse order
+ */
+ public Geometry reverse()
+ {
+ CoordinateSequence seq = points.copy();
+ CoordinateSequences.reverse(seq);
+ LineString revLine = getFactory().createLineString(seq);
+ return revLine;
+ }
+
+ /**
+ * Returns true if the given point is a vertex of this <code>LineString</code>.
+ *
+ *@param pt the <code>Coordinate</code> to check
+ *@return <code>true</code> if <code>pt</code> is one of this <code>LineString</code>
+ * 's vertices
+ */
+ public boolean isCoordinate(Coordinate pt) {
+ for (int i = 0; i < points.size(); i++) {
+ if (points.getCoordinate(i).equals(pt)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected Envelope computeEnvelopeInternal() {
+ if (isEmpty()) {
+ return new Envelope();
+ }
+ return points.expandEnvelope(new Envelope());
+ }
+
+ public boolean equalsExact(Geometry other, double tolerance) {
+ if (!isEquivalentClass(other)) {
+ return false;
+ }
+ LineString otherLineString = (LineString) other;
+ if (points.size() != otherLineString.points.size()) {
+ return false;
+ }
+ for (int i = 0; i < points.size(); i++) {
+ if (!equal(points.getCoordinate(i), otherLineString.points.getCoordinate(i), tolerance)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void apply(CoordinateFilter filter) {
+ for (int i = 0; i < points.size(); i++) {
+ filter.filter(points.getCoordinate(i));
+ }
+ }
+
+ public void apply(CoordinateSequenceFilter filter)
+ {
+ if (points.size() == 0)
+ return;
+ for (int i = 0; i < points.size(); i++) {
+ filter.filter(points, i);
+ if (filter.isDone())
+ break;
+ }
+ if (filter.isGeometryChanged())
+ geometryChanged();
+ }
+
+ public void apply(GeometryFilter filter) {
+ filter.filter(this);
+ }
+
+ public void apply(GeometryComponentFilter filter) {
+ filter.filter(this);
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link LineString} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a clone of this instance
+ * @deprecated
+ */
+ public Object clone() {
+ return copy();
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link LineString} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a copy of this instance
+ */
+ public LineString copy() {
+ return new LineString(points.copy(), factory);
+ }
+
+ /**
+ * Normalizes a LineString. A normalized linestring
+ * has the first point which is not equal to it's reflected point
+ * less than the reflected point.
+ */
+ public void normalize()
+ {
+ for (int i = 0; i < points.size() / 2; i++) {
+ int j = points.size() - 1 - i;
+ // skip equal points on both ends
+ if (!points.getCoordinate(i).equals(points.getCoordinate(j))) {
+ if (points.getCoordinate(i).compareTo(points.getCoordinate(j)) > 0) {
+ CoordinateSequence copy = points.copy();
+ CoordinateSequences.reverse(copy);
+ points = copy;
+ }
+ return;
+ }
+ }
+ }
+
+ protected boolean isEquivalentClass(Geometry other) {
+ return other instanceof LineString;
+ }
+
+ protected int compareToSameClass(Object o)
+ {
+ LineString line = (LineString) o;
+ // MD - optimized implementation
+ int i = 0;
+ int j = 0;
+ while (i < points.size() && j < line.points.size()) {
+ int comparison = points.getCoordinate(i).compareTo(line.points.getCoordinate(j));
+ if (comparison != 0) {
+ return comparison;
+ }
+ i++;
+ j++;
+ }
+ if (i < points.size()) {
+ return 1;
+ }
+ if (j < line.points.size()) {
+ return -1;
+ }
+ return 0;
+ }
+
+ protected int compareToSameClass(Object o, CoordinateSequenceComparator comp)
+ {
+ LineString line = (LineString) o;
+ return comp.compare(this.points, line.points);
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_LINESTRING;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Lineal.java b/modules/core/src/main/java/org/locationtech/jts/geom/Lineal.java
new file mode 100644
index 0000000..0ea89d6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Lineal.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+/**
+ * Identifies {@link Geometry} subclasses which
+ * are 1-dimensional and have components which are {@link LineString}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public interface Lineal {
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/LinearRing.java b/modules/core/src/main/java/org/locationtech/jts/geom/LinearRing.java
new file mode 100644
index 0000000..b5f4f1a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/LinearRing.java
@@ -0,0 +1,142 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * Models an OGC SFS <code>LinearRing</code>.
+ * A <code>LinearRing</code> is a {@link LineString} which is both closed and simple.
+ * In other words,
+ * the first and last coordinate in the ring must be equal,
+ * and the interior of the ring must not self-intersect.
+ * Either orientation of the ring is allowed.
+ * <p>
+ * A ring must have either 0 or 4 or more points.
+ * The first and last points must be equal (in 2D).
+ * If these conditions are not met, the constructors throw
+ * an {@link IllegalArgumentException}
+ *
+ * @version 1.7
+ */
+public class LinearRing extends LineString
+{
+ /**
+ * The minimum number of vertices allowed in a valid non-empty ring (= 4).
+ * Empty rings with 0 vertices are also valid.
+ */
+ public static final int MINIMUM_VALID_SIZE = 4;
+
+ private static final long serialVersionUID = -4261142084085851829L;
+
+ /**
+ * Constructs a <code>LinearRing</code> with the given points.
+ *
+ *@param points points forming a closed and simple linestring, or
+ * <code>null</code> or an empty array to create the empty geometry.
+ * This array must not contain <code>null</code> elements.
+ *
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>LinearRing</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>LinearRing</code>
+ * @throws IllegalArgumentException if the ring is not closed, or has too few points
+ *
+ * @deprecated Use GeometryFactory instead
+ */
+ public LinearRing(Coordinate points[], PrecisionModel precisionModel,
+ int SRID) {
+ this(points, new GeometryFactory(precisionModel, SRID));
+ validateConstruction();
+ }
+
+ /**
+ * This method is ONLY used to avoid deprecation warnings.
+ * @param points
+ * @param factory
+ * @throws IllegalArgumentException if the ring is not closed, or has too few points
+ */
+ private LinearRing(Coordinate points[], GeometryFactory factory) {
+ this(factory.getCoordinateSequenceFactory().create(points), factory);
+ }
+
+
+ /**
+ * Constructs a <code>LinearRing</code> with the vertices
+ * specified by the given {@link CoordinateSequence}.
+ *
+ *@param points a sequence points forming a closed and simple linestring, or
+ * <code>null</code> to create the empty geometry.
+ *
+ * @throws IllegalArgumentException if the ring is not closed, or has too few points
+ *
+ */
+ public LinearRing(CoordinateSequence points, GeometryFactory factory) {
+ super(points, factory);
+ validateConstruction();
+ }
+
+ private void validateConstruction() {
+ if (!isEmpty() && ! super.isClosed()) {
+ throw new IllegalArgumentException("Points of LinearRing do not form a closed linestring");
+ }
+ if (getCoordinateSequence().size() >= 1 && getCoordinateSequence().size() < MINIMUM_VALID_SIZE) {
+ throw new IllegalArgumentException("Invalid number of points in LinearRing (found "
+ + getCoordinateSequence().size() + " - must be 0 or >= 4)");
+ }
+ }
+
+ /**
+ * Returns <code>Dimension.FALSE</code>, since by definition LinearRings do
+ * not have a boundary.
+ *
+ * @return Dimension.FALSE
+ */
+ public int getBoundaryDimension() {
+ return Dimension.FALSE;
+ }
+
+ /**
+ * Tests whether this ring is closed.
+ * Empty rings are closed by definition.
+ *
+ * @return true if this ring is closed
+ */
+ public boolean isClosed() {
+ if (isEmpty()) {
+ // empty LinearRings are closed by definition
+ return true;
+ }
+ return super.isClosed();
+ }
+
+
+ public String getGeometryType() {
+ return "LinearRing";
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_LINEARRING;
+ }
+
+ public LinearRing copy() {
+ return new LinearRing(points.copy(), factory);
+ }
+
+ public Geometry reverse()
+ {
+ CoordinateSequence seq = points.copy();
+ CoordinateSequences.reverse(seq);
+ LinearRing rev = getFactory().createLinearRing(seq);
+ return rev;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Location.java b/modules/core/src/main/java/org/locationtech/jts/geom/Location.java
new file mode 100644
index 0000000..6bc37f5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Location.java
@@ -0,0 +1,71 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * Constants representing the different topological locations
+ * which can occur in a {@link Geometry}.
+ * The constants are also used as the row and column indices
+ * of DE-9IM {@link IntersectionMatrix}es.
+ *
+ *@version 1.7
+ */
+public class Location {
+ /**
+ * The location value for the interior of a geometry.
+ * Also, DE-9IM row index of the interior of the first geometry and column index of
+ * the interior of the second geometry.
+ */
+ public final static int INTERIOR = 0;
+ /**
+ * The location value for the boundary of a geometry.
+ * Also, DE-9IM row index of the boundary of the first geometry and column index of
+ * the boundary of the second geometry.
+ */
+ public final static int BOUNDARY = 1;
+ /**
+ * The location value for the exterior of a geometry.
+ * Also, DE-9IM row index of the exterior of the first geometry and column index of
+ * the exterior of the second geometry.
+ */
+ public final static int EXTERIOR = 2;
+
+ /**
+ * Used for uninitialized location values.
+ */
+ public final static int NONE = -1;
+
+ /**
+ * Converts the location value to a location symbol, for example, <code>EXTERIOR => 'e'</code>
+ * .
+ *
+ *@param locationValue either EXTERIOR, BOUNDARY, INTERIOR or NONE
+ *@return either 'e', 'b', 'i' or '-'
+ */
+ public static char toLocationSymbol(int locationValue) {
+ switch (locationValue) {
+ case EXTERIOR:
+ return 'e';
+ case BOUNDARY:
+ return 'b';
+ case INTERIOR:
+ return 'i';
+ case NONE:
+ return '-';
+ }
+ throw new IllegalArgumentException("Unknown location value: " + locationValue);
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/MultiLineString.java b/modules/core/src/main/java/org/locationtech/jts/geom/MultiLineString.java
new file mode 100644
index 0000000..8a93177
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/MultiLineString.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.operation.BoundaryOp;
+
+/**
+ * Models a collection of {@link LineString}s.
+ * <p>
+ * Any collection of LineStrings is a valid MultiLineString.
+ *
+ *@version 1.7
+ */
+public class MultiLineString
+ extends GeometryCollection
+ implements Lineal
+ {
+ private static final long serialVersionUID = 8166665132445433741L;
+ /**
+ * Constructs a <code>MultiLineString</code>.
+ *
+ *@param lineStrings the <code>LineString</code>s for this <code>MultiLineString</code>
+ * , or <code>null</code> or an empty array to create the empty geometry.
+ * Elements may be empty <code>LineString</code>s, but not <code>null</code>
+ * s.
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>MultiLineString</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>MultiLineString</code>
+ * @deprecated Use GeometryFactory instead
+ */
+ public MultiLineString(LineString[] lineStrings, PrecisionModel precisionModel, int SRID) {
+ super(lineStrings, new GeometryFactory(precisionModel, SRID));
+ }
+
+
+
+ /**
+ * @param lineStrings
+ * the <code>LineString</code>s for this <code>MultiLineString</code>,
+ * or <code>null</code> or an empty array to create the empty
+ * geometry. Elements may be empty <code>LineString</code>s,
+ * but not <code>null</code>s.
+ */
+ public MultiLineString(LineString[] lineStrings, GeometryFactory factory) {
+ super(lineStrings, factory);
+ }
+
+ public int getDimension() {
+ return 1;
+ }
+
+ public int getBoundaryDimension() {
+ if (isClosed()) {
+ return Dimension.FALSE;
+ }
+ return 0;
+ }
+
+ public String getGeometryType() {
+ return "MultiLineString";
+ }
+
+ public boolean isClosed() {
+ if (isEmpty()) {
+ return false;
+ }
+ for (int i = 0; i < geometries.length; i++) {
+ if (!((LineString) geometries[i]).isClosed()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Gets the boundary of this geometry.
+ * The boundary of a lineal geometry is always a zero-dimensional geometry (which may be empty).
+ *
+ * @return the boundary geometry
+ * @see Geometry#getBoundary
+ */
+ public Geometry getBoundary()
+ {
+ return (new BoundaryOp(this)).getBoundary();
+ }
+
+ /**
+ * Creates a {@link MultiLineString} in the reverse
+ * order to this object.
+ * Both the order of the component LineStrings
+ * and the order of their coordinate sequences
+ * are reversed.
+ *
+ * @return a {@link MultiLineString} in the reverse order
+ */
+ public Geometry reverse()
+ {
+ int nLines = geometries.length;
+ LineString[] revLines = new LineString[nLines];
+ for (int i = 0; i < geometries.length; i++) {
+ revLines[nLines - 1 - i] = (LineString)geometries[i].reverse();
+ }
+ return getFactory().createMultiLineString(revLines);
+ }
+
+ public MultiLineString copy() {
+ LineString[] lineStrings = new LineString[this.geometries.length];
+ for (int i = 0; i < lineStrings.length; i++) {
+ lineStrings[i] = (LineString) this.geometries[i].copy();
+ }
+ return new MultiLineString(lineStrings, factory);
+ }
+
+ public boolean equalsExact(Geometry other, double tolerance) {
+ if (!isEquivalentClass(other)) {
+ return false;
+ }
+ return super.equalsExact(other, tolerance);
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_MULTILINESTRING;
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/MultiPoint.java b/modules/core/src/main/java/org/locationtech/jts/geom/MultiPoint.java
new file mode 100644
index 0000000..fc5f0e5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/MultiPoint.java
@@ -0,0 +1,114 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * Models a collection of {@link Point}s.
+ * <p>
+ * Any collection of Points is a valid MultiPoint.
+ *
+ *@version 1.7
+ */
+public class MultiPoint
+ extends GeometryCollection
+ implements Puntal
+{
+
+ private static final long serialVersionUID = -8048474874175355449L;
+
+ /**
+ * Constructs a <code>MultiPoint</code>.
+ *
+ *@param points the <code>Point</code>s for this <code>MultiPoint</code>
+ * , or <code>null</code> or an empty array to create the empty geometry.
+ * Elements may be empty <code>Point</code>s, but not <code>null</code>s.
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>MultiPoint</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>MultiPoint</code>
+ * @deprecated Use GeometryFactory instead
+ */
+ public MultiPoint(Point[] points, PrecisionModel precisionModel, int SRID) {
+ super(points, new GeometryFactory(precisionModel, SRID));
+ }
+
+ /**
+ *@param points the <code>Point</code>s for this <code>MultiPoint</code>
+ * , or <code>null</code> or an empty array to create the empty geometry.
+ * Elements may be empty <code>Point</code>s, but not <code>null</code>s.
+ */
+ public MultiPoint(Point[] points, GeometryFactory factory) {
+ super(points, factory);
+ }
+
+ public int getDimension() {
+ return 0;
+ }
+
+ public int getBoundaryDimension() {
+ return Dimension.FALSE;
+ }
+
+ public String getGeometryType() {
+ return "MultiPoint";
+ }
+
+ /**
+ * Gets the boundary of this geometry.
+ * Zero-dimensional geometries have no boundary by definition,
+ * so an empty GeometryCollection is returned.
+ *
+ * @return an empty GeometryCollection
+ * @see Geometry#getBoundary
+ */
+ public Geometry getBoundary() {
+ return getFactory().createGeometryCollection();
+ }
+
+ public boolean isValid() {
+ return true;
+ }
+
+ public boolean equalsExact(Geometry other, double tolerance) {
+ if (!isEquivalentClass(other)) {
+ return false;
+ }
+ return super.equalsExact(other, tolerance);
+ }
+
+ /**
+ * Returns the <code>Coordinate</code> at the given position.
+ *
+ *@param n the index of the <code>Coordinate</code> to retrieve, beginning
+ * at 0
+ *@return the <code>n</code>th <code>Coordinate</code>
+ */
+ protected Coordinate getCoordinate(int n) {
+ return ((Point) geometries[n]).getCoordinate();
+ }
+
+ public MultiPoint copy() {
+ Point[] points = new Point[this.geometries.length];
+ for (int i = 0; i < points.length; i++) {
+ points[i] = (Point) this.geometries[i].copy();
+ }
+ return new MultiPoint(points, factory);
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_MULTIPOINT;
+ }
+
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/MultiPolygon.java b/modules/core/src/main/java/org/locationtech/jts/geom/MultiPolygon.java
new file mode 100644
index 0000000..e96231c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/MultiPolygon.java
@@ -0,0 +1,146 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.util.ArrayList;
+
+/**
+ * Models a collection of {@link Polygon}s.
+ * <p>
+ * As per the OGC SFS specification,
+ * the Polygons in a MultiPolygon may not overlap,
+ * and may only touch at single points.
+ * This allows the topological point-set semantics
+ * to be well-defined.
+ *
+ *
+ *@version 1.7
+ */
+public class MultiPolygon
+ extends GeometryCollection
+ implements Polygonal
+{
+ private static final long serialVersionUID = -551033529766975875L;
+ /**
+ * Constructs a <code>MultiPolygon</code>.
+ *
+ *@param polygons the <code>Polygon</code>s for this <code>MultiPolygon</code>
+ * , or <code>null</code> or an empty array to create the empty geometry.
+ * Elements may be empty <code>Polygon</code>s, but not <code>null</code>
+ * s. The polygons must conform to the assertions specified in the <A
+ * HREF="http://www.opengis.org/techno/specs.htm">OpenGIS Simple Features
+ * Specification for SQL</A> .
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>MultiPolygon</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>MultiPolygon</code>
+ * @deprecated Use GeometryFactory instead
+ */
+ public MultiPolygon(Polygon[] polygons, PrecisionModel precisionModel, int SRID) {
+ this(polygons, new GeometryFactory(precisionModel, SRID));
+ }
+
+
+ /**
+ * @param polygons
+ * the <code>Polygon</code>s for this <code>MultiPolygon</code>,
+ * or <code>null</code> or an empty array to create the empty
+ * geometry. Elements may be empty <code>Polygon</code>s, but
+ * not <code>null</code>s. The polygons must conform to the
+ * assertions specified in the <A
+ * HREF="http://www.opengis.org/techno/specs.htm">OpenGIS Simple
+ * Features Specification for SQL</A>.
+ */
+ public MultiPolygon(Polygon[] polygons, GeometryFactory factory) {
+ super(polygons, factory);
+ }
+
+ public int getDimension() {
+ return 2;
+ }
+
+ public int getBoundaryDimension() {
+ return 1;
+ }
+
+ public String getGeometryType() {
+ return "MultiPolygon";
+ }
+
+ /*
+ public boolean isSimple() {
+ return true;
+ }
+*/
+
+ /**
+ * Computes the boundary of this geometry
+ *
+ * @return a lineal geometry (which may be empty)
+ * @see Geometry#getBoundary
+ */
+ public Geometry getBoundary() {
+ if (isEmpty()) {
+ return getFactory().createMultiLineString();
+ }
+ ArrayList allRings = new ArrayList();
+ for (int i = 0; i < geometries.length; i++) {
+ Polygon polygon = (Polygon) geometries[i];
+ Geometry rings = polygon.getBoundary();
+ for (int j = 0; j < rings.getNumGeometries(); j++) {
+ allRings.add(rings.getGeometryN(j));
+ }
+ }
+ LineString[] allRingsArray = new LineString[allRings.size()];
+ return getFactory().createMultiLineString((LineString[]) allRings.toArray(allRingsArray));
+ }
+
+ public boolean equalsExact(Geometry other, double tolerance) {
+ if (!isEquivalentClass(other)) {
+ return false;
+ }
+ return super.equalsExact(other, tolerance);
+ }
+
+ /**
+ * Creates a {@link MultiPolygon} with
+ * every component reversed.
+ * The order of the components in the collection are not reversed.
+ *
+ * @return a MultiPolygon in the reverse order
+ */
+ public Geometry reverse()
+ {
+ int n = geometries.length;
+ Polygon[] revGeoms = new Polygon[n];
+ for (int i = 0; i < geometries.length; i++) {
+ revGeoms[i] = (Polygon) geometries[i].reverse();
+ }
+ return getFactory().createMultiPolygon(revGeoms);
+ }
+
+ public MultiPolygon copy() {
+ Polygon[] polygons = new Polygon[this.geometries.length];
+ for (int i = 0; i < polygons.length; i++) {
+ polygons[i] = (Polygon) this.geometries[i].copy();
+ }
+ return new MultiPolygon(polygons, factory);
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_MULTIPOLYGON;
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/OctagonalEnvelope.java b/modules/core/src/main/java/org/locationtech/jts/geom/OctagonalEnvelope.java
new file mode 100644
index 0000000..5c4ce9d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/OctagonalEnvelope.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * A bounding container for a {@link Geometry} which is in the shape of a general octagon.
+ * The OctagonalEnvelope of a geometric object
+ * is a geometry which is a tight bound
+ * along the (up to) four extremal rectilinear parallels
+ * and along the (up to) four extremal diagonal parallels.
+ * Depending on the shape of the contained
+ * geometry, the octagon may be degenerate to any extreme
+ * (e.g. it may be a rectangle, a line, or a point).
+ */
+public class OctagonalEnvelope
+{
+ /**
+ * Gets the octagonal envelope of a geometry
+ * @param geom the geometry
+ * @return the octagonal envelope of the geometry
+ */
+ public static Geometry octagonalEnvelope(Geometry geom) {
+ return (new OctagonalEnvelope(geom)).toGeometry(geom.getFactory());
+ }
+
+ private static double computeA(double x, double y)
+ {
+ return x + y;
+ }
+
+ private static double computeB(double x, double y)
+ {
+ return x - y;
+ }
+
+ private static double SQRT2 = Math.sqrt(2.0);
+
+ // initialize in the null state
+ private double minX = Double.NaN;
+ private double maxX;
+ private double minY;
+ private double maxY;
+ private double minA;
+ private double maxA;
+ private double minB;
+ private double maxB;
+
+ /**
+ * Creates a new null bounding octagon
+ */
+ public OctagonalEnvelope()
+ {
+ }
+
+ /**
+ * Creates a new null bounding octagon bounding a {@link Coordinate}
+ *
+ * @param p the coordinate to bound
+ */
+ public OctagonalEnvelope(Coordinate p)
+ {
+ expandToInclude(p);
+ }
+
+ /**
+ * Creates a new null bounding octagon bounding a pair of {@link Coordinate}s
+ *
+ * @param p0 a coordinate to bound
+ * @param p1 a coordinate to bound
+ */
+ public OctagonalEnvelope(Coordinate p0, Coordinate p1)
+ {
+ expandToInclude(p0);
+ expandToInclude(p1);
+ }
+
+ /**
+ * Creates a new null bounding octagon bounding an {@link Envelope}
+ */
+ public OctagonalEnvelope(Envelope env)
+ {
+ expandToInclude(env);
+ }
+
+ /**
+ * Creates a new null bounding octagon bounding an {@link OctagonalEnvelope}
+ * (the copy constructor).
+ */
+ public OctagonalEnvelope(OctagonalEnvelope oct)
+ {
+ expandToInclude(oct);
+ }
+
+ /**
+ * Creates a new null bounding octagon bounding a {@link Geometry}
+ */
+ public OctagonalEnvelope(Geometry geom)
+ {
+ expandToInclude(geom);
+ }
+
+
+ public double getMinX() { return minX; }
+ public double getMaxX() { return maxX; }
+ public double getMinY() { return minY; }
+ public double getMaxY() { return maxY; }
+ public double getMinA() { return minA; }
+ public double getMaxA() { return maxA; }
+ public double getMinB() { return minB; }
+ public double getMaxB() { return maxB; }
+
+ public boolean isNull() { return Double.isNaN(minX); }
+
+ /**
+ * Sets the value of this object to the null value
+ */
+ public void setToNull() {
+ minX = Double.NaN;
+ }
+
+ public void expandToInclude(Geometry g)
+ {
+ g.apply(new BoundingOctagonComponentFilter(this));
+ }
+
+ public OctagonalEnvelope expandToInclude(CoordinateSequence seq)
+ {
+ for (int i = 0; i < seq.size(); i++) {
+ double x = seq.getX(i);
+ double y = seq.getY(i);
+ expandToInclude(x, y);
+ }
+ return this;
+ }
+
+ public OctagonalEnvelope expandToInclude(OctagonalEnvelope oct)
+ {
+ if (oct.isNull()) return this;
+
+ if (isNull()) {
+ minX = oct.minX;
+ maxX = oct.maxX;
+ minY = oct.minY;
+ maxY = oct.maxY;
+ minA = oct.minA;
+ maxA = oct.maxA;
+ minB = oct.minB;
+ maxB = oct.maxB;
+ return this;
+ }
+ if (oct.minX < minX) minX = oct.minX;
+ if (oct.maxX > maxX) maxX = oct.maxX;
+ if (oct.minY < minY) minY = oct.minY;
+ if (oct.maxY > maxY) maxY = oct.maxY;
+ if (oct.minA < minA) minA = oct.minA;
+ if (oct.maxA > maxA) maxA = oct.maxA;
+ if (oct.minB < minB) minB = oct.minB;
+ if (oct.maxB > maxB) maxB = oct.maxB;
+ return this;
+ }
+
+ public OctagonalEnvelope expandToInclude(Coordinate p)
+ {
+ expandToInclude(p.x, p.y);
+ return this;
+ }
+
+ public OctagonalEnvelope expandToInclude(Envelope env)
+ {
+ expandToInclude(env.getMinX(), env.getMinY());
+ expandToInclude(env.getMinX(), env.getMaxY());
+ expandToInclude(env.getMaxX(), env.getMinY());
+ expandToInclude(env.getMaxX(), env.getMaxY());
+ return this;
+ }
+
+ public OctagonalEnvelope expandToInclude(double x, double y)
+ {
+ double A = computeA(x, y);
+ double B = computeB(x, y);
+
+ if (isNull()) {
+ minX = x;
+ maxX = x;
+ minY = y;
+ maxY = y;
+ minA = A;
+ maxA = A;
+ minB = B;
+ maxB = B;
+ }
+ else {
+ if (x < minX) minX = x;
+ if (x > maxX) maxX = x;
+ if (y < minY) minY = y;
+ if (y > maxY) maxY = y;
+ if (A < minA) minA = A;
+ if (A > maxA) maxA = A;
+ if (B < minB) minB = B;
+ if (B > maxB) maxB = B;
+ }
+ return this;
+ }
+
+ public void expandBy(double distance)
+ {
+ if (isNull()) return;
+
+ double diagonalDistance = SQRT2 * distance;
+
+ minX -= distance;
+ maxX += distance;
+ minY -= distance;
+ maxY += distance;
+ minA -= diagonalDistance;
+ maxA += diagonalDistance;
+ minB -= diagonalDistance;
+ maxB += diagonalDistance;
+
+ if (! isValid())
+ setToNull();
+ }
+
+ /**
+ * Tests if the extremal values for this octagon are valid.
+ *
+ * @return <code>true</code> if this object has valid values
+ */
+ private boolean isValid()
+ {
+ if (isNull()) return true;
+ return minX <= maxX
+ && minY <= maxY
+ && minA <= maxA
+ && minB <= maxB;
+ }
+
+ public boolean intersects(OctagonalEnvelope other)
+ {
+ if (isNull() || other.isNull()) { return false; }
+
+ if (minX > other.maxX) return false;
+ if (maxX < other.minX) return false;
+ if (minY > other.maxY) return false;
+ if (maxY < other.minY) return false;
+ if (minA > other.maxA) return false;
+ if (maxA < other.minA) return false;
+ if (minB > other.maxB) return false;
+ if (maxB < other.minB) return false;
+ return true;
+ }
+
+ public boolean intersects(Coordinate p)
+ {
+ if (minX > p.x) return false;
+ if (maxX < p.x) return false;
+ if (minY > p.y) return false;
+ if (maxY < p.y) return false;
+
+ double A = computeA(p.x, p.y);
+ double B = computeB(p.x, p.y);
+ if (minA > A) return false;
+ if (maxA < A) return false;
+ if (minB > B) return false;
+ if (maxB < B) return false;
+ return true;
+ }
+
+ public boolean contains(OctagonalEnvelope other)
+ {
+ if (isNull() || other.isNull()) { return false; }
+
+ return other.minX >= minX
+ && other.maxX <= maxX
+ && other.minY >= minY
+ && other.maxY <= maxY
+ && other.minA >= minA
+ && other.maxA <= maxA
+ && other.minB >= minB
+ && other.maxB <= maxB;
+ }
+
+ public Geometry toGeometry(GeometryFactory geomFactory)
+ {
+ if (isNull()) {
+ return geomFactory.createPoint();
+ }
+
+ Coordinate px00 = new Coordinate(minX, minA - minX);
+ Coordinate px01 = new Coordinate(minX, minX - minB);
+
+ Coordinate px10 = new Coordinate(maxX, maxX - maxB);
+ Coordinate px11 = new Coordinate(maxX, maxA - maxX);
+
+ Coordinate py00 = new Coordinate(minA - minY, minY);
+ Coordinate py01 = new Coordinate(minY + maxB, minY);
+
+ Coordinate py10 = new Coordinate(maxY + minB, maxY);
+ Coordinate py11 = new Coordinate(maxA - maxY, maxY);
+
+ PrecisionModel pm = geomFactory.getPrecisionModel();
+ pm.makePrecise(px00);
+ pm.makePrecise(px01);
+ pm.makePrecise(px10);
+ pm.makePrecise(px11);
+ pm.makePrecise(py00);
+ pm.makePrecise(py01);
+ pm.makePrecise(py10);
+ pm.makePrecise(py11);
+
+ CoordinateList coordList = new CoordinateList();
+ coordList.add(px00, false);
+ coordList.add(px01, false);
+ coordList.add(py10, false);
+ coordList.add(py11, false);
+ coordList.add(px11, false);
+ coordList.add(px10, false);
+ coordList.add(py01, false);
+ coordList.add(py00, false);
+
+ if (coordList.size() == 1) {
+ return geomFactory.createPoint(px00);
+ }
+ if (coordList.size() == 2) {
+ Coordinate[] pts = coordList.toCoordinateArray();
+ return geomFactory.createLineString(pts);
+ }
+ // must be a polygon, so add closing point
+ coordList.add(px00, false);
+ Coordinate[] pts = coordList.toCoordinateArray();
+ return geomFactory.createPolygon(geomFactory.createLinearRing(pts));
+ }
+
+ private static class BoundingOctagonComponentFilter
+ implements GeometryComponentFilter
+ {
+ OctagonalEnvelope oe;
+
+ BoundingOctagonComponentFilter(OctagonalEnvelope oe) {
+ this.oe = oe;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (geom instanceof LineString) {
+ oe.expandToInclude( ((LineString) geom).getCoordinateSequence());
+ }
+ else if (geom instanceof Point) {
+ oe.expandToInclude( ((Point) geom).getCoordinateSequence());
+ }
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Point.java b/modules/core/src/main/java/org/locationtech/jts/geom/Point.java
new file mode 100644
index 0000000..c910e1e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Point.java
@@ -0,0 +1,228 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Represents a single point.
+ *
+ * A <code>Point</code> is topologically valid if and only if:
+ * <ul>
+ * <li>the coordinate which defines it (if any) is a valid coordinate
+ * (i.e. does not have an <code>NaN</code> X or Y ordinate)
+ * </ul>
+ *
+ *@version 1.7
+ */
+public class Point
+ extends Geometry
+ implements Puntal
+{
+ private static final long serialVersionUID = 4902022702746614570L;
+ /**
+ * The <code>Coordinate</code> wrapped by this <code>Point</code>.
+ */
+ private CoordinateSequence coordinates;
+
+ /**
+ * Constructs a <code>Point</code> with the given coordinate.
+ *
+ *@param coordinate the coordinate on which to base this <code>Point</code>
+ * , or <code>null</code> to create the empty geometry.
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>Point</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>Point</code>
+ * @deprecated Use GeometryFactory instead
+ */
+ public Point(Coordinate coordinate, PrecisionModel precisionModel, int SRID) {
+ super(new GeometryFactory(precisionModel, SRID));
+ init(getFactory().getCoordinateSequenceFactory().create(
+ coordinate != null ? new Coordinate[]{coordinate} : new Coordinate[]{}));
+ }
+
+ /**
+ *@param coordinates contains the single coordinate on which to base this <code>Point</code>
+ * , or <code>null</code> to create the empty geometry.
+ */
+ public Point(CoordinateSequence coordinates, GeometryFactory factory) {
+ super(factory);
+ init(coordinates);
+ }
+
+ private void init(CoordinateSequence coordinates)
+ {
+ if (coordinates == null) {
+ coordinates = getFactory().getCoordinateSequenceFactory().create(new Coordinate[]{});
+ }
+ Assert.isTrue(coordinates.size() <= 1);
+ this.coordinates = coordinates;
+ }
+
+ public Coordinate[] getCoordinates() {
+ return isEmpty() ? new Coordinate[]{} : new Coordinate[]{
+ getCoordinate()
+ };
+ }
+
+ public int getNumPoints() {
+ return isEmpty() ? 0 : 1;
+ }
+
+ public boolean isEmpty() {
+ return coordinates.size() == 0;
+ }
+
+ public boolean isSimple() {
+ return true;
+ }
+
+ public int getDimension() {
+ return 0;
+ }
+
+ public int getBoundaryDimension() {
+ return Dimension.FALSE;
+ }
+
+ public double getX() {
+ if (getCoordinate() == null) {
+ throw new IllegalStateException("getX called on empty Point");
+ }
+ return getCoordinate().x;
+ }
+
+ public double getY() {
+ if (getCoordinate() == null) {
+ throw new IllegalStateException("getY called on empty Point");
+ }
+ return getCoordinate().y;
+ }
+
+ public Coordinate getCoordinate() {
+ return coordinates.size() != 0 ? coordinates.getCoordinate(0): null;
+ }
+
+ public String getGeometryType() {
+ return "Point";
+ }
+
+ /**
+ * Gets the boundary of this geometry.
+ * Zero-dimensional geometries have no boundary by definition,
+ * so an empty GeometryCollection is returned.
+ *
+ * @return an empty GeometryCollection
+ * @see Geometry#getBoundary
+ */
+ public Geometry getBoundary() {
+ return getFactory().createGeometryCollection();
+ }
+
+ protected Envelope computeEnvelopeInternal() {
+ if (isEmpty()) {
+ return new Envelope();
+ }
+ Envelope env = new Envelope();
+ env.expandToInclude(coordinates.getX(0), coordinates.getY(0));
+ return env;
+ }
+
+ public boolean equalsExact(Geometry other, double tolerance) {
+ if (!isEquivalentClass(other)) {
+ return false;
+ }
+ if (isEmpty() && other.isEmpty()) {
+ return true;
+ }
+ if (isEmpty() != other.isEmpty()) {
+ return false;
+ }
+ return equal(((Point) other).getCoordinate(), this.getCoordinate(), tolerance);
+ }
+
+ public void apply(CoordinateFilter filter) {
+ if (isEmpty()) { return; }
+ filter.filter(getCoordinate());
+ }
+
+ public void apply(CoordinateSequenceFilter filter)
+ {
+ if (isEmpty())
+ return;
+ filter.filter(coordinates, 0);
+ if (filter.isGeometryChanged())
+ geometryChanged();
+ }
+
+ public void apply(GeometryFilter filter) {
+ filter.filter(this);
+ }
+
+ public void apply(GeometryComponentFilter filter) {
+ filter.filter(this);
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link Point} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a clone of this instance
+ * @deprecated
+ */
+ public Object clone() {
+ return copy();
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link Point} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a copy of this instance
+ */
+ public Point copy() {
+ return new Point(coordinates.copy(), factory);
+ }
+
+ public Geometry reverse()
+ {
+ return copy();
+ }
+
+ public void normalize()
+ {
+ // a Point is always in normalized form
+ }
+
+ protected int compareToSameClass(Object other) {
+ Point point = (Point) other;
+ return getCoordinate().compareTo(point.getCoordinate());
+ }
+
+ protected int compareToSameClass(Object other, CoordinateSequenceComparator comp)
+ {
+ Point point = (Point) other;
+ return comp.compare(this.coordinates, point.coordinates);
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_POINT;
+ }
+
+ public CoordinateSequence getCoordinateSequence() {
+ return coordinates;
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Polygon.java b/modules/core/src/main/java/org/locationtech/jts/geom/Polygon.java
new file mode 100644
index 0000000..add9665
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Polygon.java
@@ -0,0 +1,446 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.util.Arrays;
+
+import org.locationtech.jts.algorithm.Area;
+import org.locationtech.jts.algorithm.Orientation;
+
+
+/**
+ * Represents a polygon with linear edges, which may include holes.
+ * The outer boundary (shell)
+ * and inner boundaries (holes) of the polygon are represented by {@link LinearRing}s.
+ * The boundary rings of the polygon may have any orientation.
+ * Polygons are closed, simple geometries by definition.
+ * <p>
+ * The polygon model conforms to the assertions specified in the
+ * <A HREF="http://www.opengis.org/techno/specs.htm">OpenGIS Simple Features
+ * Specification for SQL</A>.
+ * <p>
+ * A <code>Polygon</code> is topologically valid if and only if:
+ * <ul>
+ * <li>the coordinates which define it are valid coordinates
+ * <li>the linear rings for the shell and holes are valid
+ * (i.e. are closed and do not self-intersect)
+ * <li>holes touch the shell or another hole at at most one point
+ * (which implies that the rings of the shell and holes must not cross)
+ * <li>the interior of the polygon is connected,
+ * or equivalently no sequence of touching holes
+ * makes the interior of the polygon disconnected
+ * (i.e. effectively split the polygon into two pieces).
+ * </ul>
+ *
+ *@version 1.7
+ */
+public class Polygon
+ extends Geometry
+ implements Polygonal
+{
+ private static final long serialVersionUID = -3494792200821764533L;
+
+ /**
+ * The exterior boundary,
+ * or <code>null</code> if this <code>Polygon</code>
+ * is empty.
+ */
+ protected LinearRing shell = null;
+
+ /**
+ * The interior boundaries, if any.
+ * This instance var is never null.
+ * If there are no holes, the array is of zero length.
+ */
+ protected LinearRing[] holes;
+
+ /**
+ * Constructs a <code>Polygon</code> with the given exterior boundary.
+ *
+ *@param shell the outer boundary of the new <code>Polygon</code>,
+ * or <code>null</code> or an empty <code>LinearRing</code> if the empty
+ * geometry is to be created.
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>Polygon</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>Polygon</code>
+ * @deprecated Use GeometryFactory instead
+ */
+ public Polygon(LinearRing shell, PrecisionModel precisionModel, int SRID) {
+ this(shell, new LinearRing[]{}, new GeometryFactory(precisionModel, SRID));
+ }
+
+ /**
+ * Constructs a <code>Polygon</code> with the given exterior boundary and
+ * interior boundaries.
+ *
+ *@param shell the outer boundary of the new <code>Polygon</code>,
+ * or <code>null</code> or an empty <code>LinearRing</code> if the empty
+ * geometry is to be created.
+ *@param holes the inner boundaries of the new <code>Polygon</code>
+ * , or <code>null</code> or empty <code>LinearRing</code>s if the empty
+ * geometry is to be created.
+ *@param precisionModel the specification of the grid of allowable points
+ * for this <code>Polygon</code>
+ *@param SRID the ID of the Spatial Reference System used by this
+ * <code>Polygon</code>
+ * @deprecated Use GeometryFactory instead
+ */
+ public Polygon(LinearRing shell, LinearRing[] holes, PrecisionModel precisionModel, int SRID) {
+ this(shell, holes, new GeometryFactory(precisionModel, SRID));
+ }
+
+ /**
+ * Constructs a <code>Polygon</code> with the given exterior boundary and
+ * interior boundaries.
+ *
+ *@param shell the outer boundary of the new <code>Polygon</code>,
+ * or <code>null</code> or an empty <code>LinearRing</code> if the empty
+ * geometry is to be created.
+ *@param holes the inner boundaries of the new <code>Polygon</code>
+ * , or <code>null</code> or empty <code>LinearRing</code>s if the empty
+ * geometry is to be created.
+ */
+ public Polygon(LinearRing shell, LinearRing[] holes, GeometryFactory factory) {
+ super(factory);
+ if (shell == null) {
+ shell = getFactory().createLinearRing();
+ }
+ if (holes == null) {
+ holes = new LinearRing[]{};
+ }
+ if (hasNullElements(holes)) {
+ throw new IllegalArgumentException("holes must not contain null elements");
+ }
+ if (shell.isEmpty() && hasNonEmptyElements(holes)) {
+ throw new IllegalArgumentException("shell is empty but holes are not");
+ }
+ this.shell = shell;
+ this.holes = holes;
+ }
+
+ public Coordinate getCoordinate() {
+ return shell.getCoordinate();
+ }
+
+ public Coordinate[] getCoordinates() {
+ if (isEmpty()) {
+ return new Coordinate[]{};
+ }
+ Coordinate[] coordinates = new Coordinate[getNumPoints()];
+ int k = -1;
+ Coordinate[] shellCoordinates = shell.getCoordinates();
+ for (int x = 0; x < shellCoordinates.length; x++) {
+ k++;
+ coordinates[k] = shellCoordinates[x];
+ }
+ for (int i = 0; i < holes.length; i++) {
+ Coordinate[] childCoordinates = holes[i].getCoordinates();
+ for (int j = 0; j < childCoordinates.length; j++) {
+ k++;
+ coordinates[k] = childCoordinates[j];
+ }
+ }
+ return coordinates;
+ }
+
+ public int getNumPoints() {
+ int numPoints = shell.getNumPoints();
+ for (int i = 0; i < holes.length; i++) {
+ numPoints += holes[i].getNumPoints();
+ }
+ return numPoints;
+ }
+
+ public int getDimension() {
+ return 2;
+ }
+
+ public int getBoundaryDimension() {
+ return 1;
+ }
+
+ public boolean isEmpty() {
+ return shell.isEmpty();
+ }
+
+ /**
+ * Tests if a valid polygon is simple.
+ * This method always returns true, since a valid polygon is always simple
+ *
+ * @return <code>true</code>
+ */
+ /*
+ public boolean isSimple() {
+ return true;
+ }
+*/
+
+ public boolean isRectangle()
+ {
+ if (getNumInteriorRing() != 0) return false;
+ if (shell == null) return false;
+ if (shell.getNumPoints() != 5) return false;
+
+ CoordinateSequence seq = shell.getCoordinateSequence();
+
+ // check vertices have correct values
+ Envelope env = getEnvelopeInternal();
+ for (int i = 0; i < 5; i++) {
+ double x = seq.getX(i);
+ if (! (x == env.getMinX() || x == env.getMaxX())) return false;
+ double y = seq.getY(i);
+ if (! (y == env.getMinY() || y == env.getMaxY())) return false;
+ }
+
+ // check vertices are in right order
+ double prevX = seq.getX(0);
+ double prevY = seq.getY(0);
+ for (int i = 1; i <= 4; i++) {
+ double x = seq.getX(i);
+ double y = seq.getY(i);
+ boolean xChanged = x != prevX;
+ boolean yChanged = y != prevY;
+ if (xChanged == yChanged)
+ return false;
+ prevX = x;
+ prevY = y;
+ }
+ return true;
+ }
+
+ public LineString getExteriorRing() {
+ return shell;
+ }
+
+ public int getNumInteriorRing() {
+ return holes.length;
+ }
+
+ public LineString getInteriorRingN(int n) {
+ return holes[n];
+ }
+
+ public String getGeometryType() {
+ return "Polygon";
+ }
+
+ /**
+ * Returns the area of this <code>Polygon</code>
+ *
+ *@return the area of the polygon
+ */
+ public double getArea()
+ {
+ double area = 0.0;
+ area += Area.ofRing(shell.getCoordinateSequence());
+ for (int i = 0; i < holes.length; i++) {
+ area -= Area.ofRing(holes[i].getCoordinateSequence());
+ }
+ return area;
+ }
+
+ /**
+ * Returns the perimeter of this <code>Polygon</code>
+ *
+ *@return the perimeter of the polygon
+ */
+ public double getLength()
+ {
+ double len = 0.0;
+ len += shell.getLength();
+ for (int i = 0; i < holes.length; i++) {
+ len += holes[i].getLength();
+ }
+ return len;
+ }
+
+ /**
+ * Computes the boundary of this geometry
+ *
+ * @return a lineal geometry (which may be empty)
+ * @see Geometry#getBoundary
+ */
+ public Geometry getBoundary() {
+ if (isEmpty()) {
+ return getFactory().createMultiLineString();
+ }
+ LinearRing[] rings = new LinearRing[holes.length + 1];
+ rings[0] = shell;
+ for (int i = 0; i < holes.length; i++) {
+ rings[i + 1] = holes[i];
+ }
+ // create LineString or MultiLineString as appropriate
+ if (rings.length <= 1)
+ return getFactory().createLinearRing(rings[0].getCoordinateSequence());
+ return getFactory().createMultiLineString(rings);
+ }
+
+ protected Envelope computeEnvelopeInternal() {
+ return shell.getEnvelopeInternal();
+ }
+
+ public boolean equalsExact(Geometry other, double tolerance) {
+ if (!isEquivalentClass(other)) {
+ return false;
+ }
+ Polygon otherPolygon = (Polygon) other;
+ Geometry thisShell = shell;
+ Geometry otherPolygonShell = otherPolygon.shell;
+ if (!thisShell.equalsExact(otherPolygonShell, tolerance)) {
+ return false;
+ }
+ if (holes.length != otherPolygon.holes.length) {
+ return false;
+ }
+ for (int i = 0; i < holes.length; i++) {
+ if (!((Geometry) holes[i]).equalsExact(otherPolygon.holes[i], tolerance)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void apply(CoordinateFilter filter) {
+ shell.apply(filter);
+ for (int i = 0; i < holes.length; i++) {
+ holes[i].apply(filter);
+ }
+ }
+
+ public void apply(CoordinateSequenceFilter filter)
+ {
+ shell.apply(filter);
+ if (! filter.isDone()) {
+ for (int i = 0; i < holes.length; i++) {
+ holes[i].apply(filter);
+ if (filter.isDone())
+ break;
+ }
+ }
+ if (filter.isGeometryChanged())
+ geometryChanged();
+ }
+
+ public void apply(GeometryFilter filter) {
+ filter.filter(this);
+ }
+
+ public void apply(GeometryComponentFilter filter) {
+ filter.filter(this);
+ shell.apply(filter);
+ for (int i = 0; i < holes.length; i++) {
+ holes[i].apply(filter);
+ }
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link Polygon} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a clone of this instance
+ * @deprecated
+ */
+ public Object clone() {
+
+ return copy();
+ }
+
+ /**
+ * Creates and returns a full copy of this {@link Polygon} object.
+ * (including all coordinates contained by it).
+ *
+ * @return a copy of this instance
+ */
+ public Polygon copy() {
+ LinearRing shellCopy = shell.copy();
+ LinearRing[] holeCopies = new LinearRing[this.holes.length];
+ for (int i = 0; i < holes.length; i++) {
+ holeCopies[i] = holes[i].copy();
+ }
+ return new Polygon(shellCopy, holeCopies, factory);
+ }
+
+ public Geometry convexHull() {
+ return getExteriorRing().convexHull();
+ }
+
+ public void normalize() {
+ normalize(shell, true);
+ for (int i = 0; i < holes.length; i++) {
+ normalize(holes[i], false);
+ }
+ Arrays.sort(holes);
+ }
+
+ protected int compareToSameClass(Object o) {
+ LinearRing thisShell = shell;
+ LinearRing otherShell = ((Polygon) o).shell;
+ return thisShell.compareToSameClass(otherShell);
+ }
+
+ protected int compareToSameClass(Object o, CoordinateSequenceComparator comp) {
+ Polygon poly = (Polygon) o;
+
+ LinearRing thisShell = shell;
+ LinearRing otherShell = poly.shell;
+ int shellComp = thisShell.compareToSameClass(otherShell, comp);
+ if (shellComp != 0) return shellComp;
+
+ int nHole1 = getNumInteriorRing();
+ int nHole2 = poly.getNumInteriorRing();
+ int i = 0;
+ while (i < nHole1 && i < nHole2) {
+ LinearRing thisHole = (LinearRing) getInteriorRingN(i);
+ LinearRing otherHole = (LinearRing) poly.getInteriorRingN(i);
+ int holeComp = thisHole.compareToSameClass(otherHole, comp);
+ if (holeComp != 0) return holeComp;
+ i++;
+ }
+ if (i < nHole1) return 1;
+ if (i < nHole2) return -1;
+ return 0;
+ }
+
+ protected int getSortIndex() {
+ return Geometry.SORTINDEX_POLYGON;
+ }
+
+ private void normalize(LinearRing ring, boolean clockwise) {
+ if (ring.isEmpty()) {
+ return;
+ }
+ Coordinate[] uniqueCoordinates = new Coordinate[ring.getCoordinates().length - 1];
+ System.arraycopy(ring.getCoordinates(), 0, uniqueCoordinates, 0, uniqueCoordinates.length);
+ Coordinate minCoordinate = CoordinateArrays.minCoordinate(ring.getCoordinates());
+ CoordinateArrays.scroll(uniqueCoordinates, minCoordinate);
+ System.arraycopy(uniqueCoordinates, 0, ring.getCoordinates(), 0, uniqueCoordinates.length);
+ ring.getCoordinates()[uniqueCoordinates.length] = uniqueCoordinates[0];
+ if (Orientation.isCCW(ring.getCoordinates()) == clockwise) {
+ CoordinateArrays.reverse(ring.getCoordinates());
+ }
+ }
+
+ public Geometry reverse()
+ {
+ Polygon poly = copy();
+ poly.shell = (LinearRing) shell.copy().reverse();
+ poly.holes = new LinearRing[holes.length];
+ for (int i = 0; i < holes.length; i++) {
+ poly.holes[i] = (LinearRing) holes[i].copy().reverse();
+ }
+ return poly;// return the clone
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Polygonal.java b/modules/core/src/main/java/org/locationtech/jts/geom/Polygonal.java
new file mode 100644
index 0000000..1abee48
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Polygonal.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+/**
+ * Identifies {@link Geometry} subclasses which
+ * are 2-dimensional
+ * and have components which have {@link Lineal} boundaries.
+ *
+ * @author Martin Davis
+ *
+ */
+public interface Polygonal
+{
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/PrecisionModel.java b/modules/core/src/main/java/org/locationtech/jts/geom/PrecisionModel.java
new file mode 100644
index 0000000..cd73a7e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/PrecisionModel.java
@@ -0,0 +1,469 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.locationtech.jts.io.WKTWriter;
+
+/**
+ * Specifies the precision model of the {@link Coordinate}s in a {@link Geometry}.
+ * In other words, specifies the grid of allowable
+ * points for all <code>Geometry</code>s.
+ * <p>
+ * The {@link #makePrecise(Coordinate)} method allows rounding a coordinate to
+ * a "precise" value; that is, one whose
+ * precision is known exactly.
+ *<p>
+ * Coordinates are assumed to be precise in geometries.
+ * That is, the coordinates are assumed to be rounded to the
+ * precision model given for the geometry.
+ * JTS input routines automatically round coordinates to the precision model
+ * before creating Geometries.
+ * All internal operations
+ * assume that coordinates are rounded to the precision model.
+ * Constructive methods (such as boolean operations) always round computed
+ * coordinates to the appropriate precision model.
+ * <p>
+ * Currently three types of precision model are supported:
+ * <ul>
+ * <li>FLOATING - represents full double precision floating point.
+ * This is the default precision model used in JTS
+ * <li>FLOATING_SINGLE - represents single precision floating point.
+ * <li>FIXED - represents a model with a fixed number of decimal places.
+ * A Fixed Precision Model is specified by a scale factor.
+ * The scale factor specifies the size of the grid which numbers are rounded to.
+ * Input coordinates are mapped to fixed coordinates according to the following
+ * equations:
+ * <UL>
+ * <LI> jtsPt.x = round( (inputPt.x * scale ) / scale
+ * <LI> jtsPt.y = round( (inputPt.y * scale ) / scale
+ * </UL>
+ * </ul>
+ * For example, to specify 3 decimal places of precision, use a scale factor
+ * of 1000. To specify -3 decimal places of precision (i.e. rounding to
+ * the nearest 1000), use a scale factor of 0.001.
+ * <p>
+ * Coordinates are represented internally as Java double-precision values.
+ * Since Java uses the IEEE-394 floating point standard, this
+ * provides 53 bits of precision. (Thus the maximum precisely representable
+ * <i>integer</i> is 9,007,199,254,740,992 - or almost 16 decimal digits of precision).
+ * <p>
+ * JTS binary methods currently do not handle inputs which have different precision models.
+ * The precision model of any constructed geometric value is undefined.
+ *
+ *@version 1.7
+ */
+public class PrecisionModel implements Serializable, Comparable
+{
+ /**
+ * Determines which of two {@link PrecisionModel}s is the most precise
+ * (allows the greatest number of significant digits).
+ *
+ * @param pm1 a PrecisionModel
+ * @param pm2 a PrecisionModel
+ * @return the PrecisionModel which is most precise
+ */
+ public static PrecisionModel mostPrecise(PrecisionModel pm1, PrecisionModel pm2)
+ {
+ if (pm1.compareTo(pm2) >= 0)
+ return pm1;
+ return pm2;
+ }
+
+ private static final long serialVersionUID = 7777263578777803835L;
+
+ /**
+ * The types of Precision Model which JTS supports.
+ */
+ public static class Type
+ implements Serializable
+ {
+ private static final long serialVersionUID = -5528602631731589822L;
+ private static Map nameToTypeMap = new HashMap();
+ public Type(String name) {
+ this.name = name;
+ nameToTypeMap.put(name, this);
+ }
+ private String name;
+ public String toString() { return name; }
+
+
+ /*
+ * Ssee http://www.javaworld.com/javaworld/javatips/jw-javatip122.html
+ */
+ private Object readResolve() {
+ return nameToTypeMap.get(name);
+ }
+ }
+
+ /**
+ * Fixed Precision indicates that coordinates have a fixed number of decimal places.
+ * The number of decimal places is determined by the log10 of the scale factor.
+ */
+ public static final Type FIXED = new Type("FIXED");
+ /**
+ * Floating precision corresponds to the standard Java
+ * double-precision floating-point representation, which is
+ * based on the IEEE-754 standard
+ */
+ public static final Type FLOATING = new Type("FLOATING");
+ /**
+ * Floating single precision corresponds to the standard Java
+ * single-precision floating-point representation, which is
+ * based on the IEEE-754 standard
+ */
+ public static final Type FLOATING_SINGLE = new Type("FLOATING SINGLE");
+
+
+ /**
+ * The maximum precise value representable in a double. Since IEE754
+ * double-precision numbers allow 53 bits of mantissa, the value is equal to
+ * 2^53 - 1. This provides <i>almost</i> 16 decimal digits of precision.
+ */
+ public final static double maximumPreciseValue = 9007199254740992.0;
+
+ /**
+ * The type of PrecisionModel this represents.
+ */
+ private Type modelType;
+ /**
+ * The scale factor which determines the number of decimal places in fixed precision.
+ */
+ private double scale;
+
+ /**
+ * Creates a <code>PrecisionModel</code> with a default precision
+ * of FLOATING.
+ */
+ public PrecisionModel() {
+ // default is floating precision
+ modelType = FLOATING;
+ }
+
+ /**
+ * Creates a <code>PrecisionModel</code> that specifies
+ * an explicit precision model type.
+ * If the model type is FIXED the scale factor will default to 1.
+ *
+ * @param modelType the type of the precision model
+ */
+ public PrecisionModel(Type modelType)
+ {
+ this.modelType = modelType;
+ if (modelType == FIXED)
+ {
+ setScale(1.0);
+ }
+ }
+ /**
+ * Creates a <code>PrecisionModel</code> that specifies Fixed precision.
+ * Fixed-precision coordinates are represented as precise internal coordinates,
+ * which are rounded to the grid defined by the scale factor.
+ *
+ *@param scale amount by which to multiply a coordinate after subtracting
+ * the offset, to obtain a precise coordinate
+ *@param offsetX not used.
+ *@param offsetY not used.
+ *
+ * @deprecated offsets are no longer supported, since internal representation is rounded floating point
+ */
+ public PrecisionModel(double scale, double offsetX, double offsetY) {
+ modelType = FIXED;
+ setScale(scale);
+ }
+ /**
+ * Creates a <code>PrecisionModel</code> that specifies Fixed precision.
+ * Fixed-precision coordinates are represented as precise internal coordinates,
+ * which are rounded to the grid defined by the scale factor.
+ *
+ *@param scale amount by which to multiply a coordinate after subtracting
+ * the offset, to obtain a precise coordinate
+ */
+ public PrecisionModel(double scale) {
+ modelType = FIXED;
+ setScale(scale);
+ }
+ /**
+ * Copy constructor to create a new <code>PrecisionModel</code>
+ * from an existing one.
+ */
+ public PrecisionModel(PrecisionModel pm) {
+ modelType = pm.modelType;
+ scale = pm.scale;
+ }
+
+
+ /**
+ * Tests whether the precision model supports floating point
+ * @return <code>true</code> if the precision model supports floating point
+ */
+ public boolean isFloating()
+ {
+ return modelType == FLOATING || modelType == FLOATING_SINGLE;
+ }
+
+ /**
+ * Returns the maximum number of significant digits provided by this
+ * precision model.
+ * Intended for use by routines which need to print out
+ * decimal representations of precise values (such as {@link WKTWriter}).
+ * <p>
+ * This method would be more correctly called
+ * <tt>getMinimumDecimalPlaces</tt>,
+ * since it actually computes the number of decimal places
+ * that is required to correctly display the full
+ * precision of an ordinate value.
+ * <p>
+ * Since it is difficult to compute the required number of
+ * decimal places for scale factors which are not powers of 10,
+ * the algorithm uses a very rough approximation in this case.
+ * This has the side effect that for scale factors which are
+ * powers of 10 the value returned is 1 greater than the true value.
+ *
+ *
+ * @return the maximum number of decimal places provided by this precision model
+ */
+ public int getMaximumSignificantDigits() {
+ int maxSigDigits = 16;
+ if (modelType == FLOATING) {
+ maxSigDigits = 16;
+ } else if (modelType == FLOATING_SINGLE) {
+ maxSigDigits = 6;
+ } else if (modelType == FIXED) {
+ maxSigDigits = 1 + (int) Math.ceil(Math.log(getScale()) / Math.log(10));
+ }
+ return maxSigDigits;
+ }
+
+ /**
+ * Returns the scale factor used to specify a fixed precision model.
+ * The number of decimal places of precision is
+ * equal to the base-10 logarithm of the scale factor.
+ * Non-integral and negative scale factors are supported.
+ * Negative scale factors indicate that the places
+ * of precision is to the left of the decimal point.
+ *
+ *@return the scale factor for the fixed precision model
+ */
+ public double getScale() {
+ return scale;
+ }
+
+ /**
+ * Gets the type of this precision model
+ * @return the type of this precision model
+ * @see Type
+ */
+ public Type getType()
+ {
+ return modelType;
+ }
+ /**
+ * Sets the multiplying factor used to obtain a precise coordinate.
+ * This method is private because PrecisionModel is an immutable (value) type.
+ */
+ private void setScale(double scale)
+ {
+ this.scale = Math.abs(scale);
+ }
+
+ /**
+ * Returns the x-offset used to obtain a precise coordinate.
+ *
+ * @return the amount by which to subtract the x-coordinate before
+ * multiplying by the scale
+ * @deprecated Offsets are no longer used
+ */
+ public double getOffsetX() {
+ //We actually don't use offsetX and offsetY anymore ... [Jon Aquino]
+ return 0;
+ }
+
+
+
+ /**
+ * Returns the y-offset used to obtain a precise coordinate.
+ *
+ * @return the amount by which to subtract the y-coordinate before
+ * multiplying by the scale
+ * @deprecated Offsets are no longer used
+ */
+ public double getOffsetY() {
+ return 0;
+ }
+
+ /**
+ * Sets <code>internal</code> to the precise representation of <code>external</code>.
+ *
+ * @param external the original coordinate
+ * @param internal the coordinate whose values will be changed to the
+ * precise representation of <code>external</code>
+ * @deprecated use makePrecise instead
+ */
+ public void toInternal (Coordinate external, Coordinate internal) {
+ if (isFloating()) {
+ internal.x = external.x;
+ internal.y = external.y;
+ }
+ else {
+ internal.x = makePrecise(external.x);
+ internal.y = makePrecise(external.y);
+ }
+ internal.z = external.z;
+ }
+
+ /**
+ * Returns the precise representation of <code>external</code>.
+ *
+ *@param external the original coordinate
+ *@return the coordinate whose values will be changed to the precise
+ * representation of <code>external</code>
+ * @deprecated use makePrecise instead
+ */
+ public Coordinate toInternal(Coordinate external) {
+ Coordinate internal = new Coordinate(external);
+ makePrecise(internal);
+ return internal;
+ }
+
+ /**
+ * Returns the external representation of <code>internal</code>.
+ *
+ *@param internal the original coordinate
+ *@return the coordinate whose values will be changed to the
+ * external representation of <code>internal</code>
+ * @deprecated no longer needed, since internal representation is same as external representation
+ */
+ public Coordinate toExternal(Coordinate internal) {
+ Coordinate external = new Coordinate(internal);
+ return external;
+ }
+
+ /**
+ * Sets <code>external</code> to the external representation of <code>internal</code>.
+ *
+ *@param internal the original coordinate
+ *@param external the coordinate whose values will be changed to the
+ * external representation of <code>internal</code>
+ * @deprecated no longer needed, since internal representation is same as external representation
+ */
+ public void toExternal(Coordinate internal, Coordinate external) {
+ external.x = internal.x;
+ external.y = internal.y;
+ }
+
+ /**
+ * Rounds a numeric value to the PrecisionModel grid.
+ * Asymmetric Arithmetic Rounding is used, to provide
+ * uniform rounding behaviour no matter where the number is
+ * on the number line.
+ * <p>
+ * This method has no effect on NaN values.
+ * <p>
+ * <b>Note:</b> Java's <code>Math#rint</code> uses the "Banker's Rounding" algorithm,
+ * which is not suitable for precision operations elsewhere in JTS.
+ */
+ public double makePrecise(double val)
+ {
+ // don't change NaN values
+ if (Double.isNaN(val)) return val;
+
+ if (modelType == FLOATING_SINGLE) {
+ float floatSingleVal = (float) val;
+ return (double) floatSingleVal;
+ }
+ if (modelType == FIXED) {
+ return Math.round(val * scale) / scale;
+// return Math.rint(val * scale) / scale;
+ }
+ // modelType == FLOATING - no rounding necessary
+ return val;
+ }
+
+ /**
+ * Rounds a Coordinate to the PrecisionModel grid.
+ */
+ public void makePrecise(Coordinate coord)
+ {
+ // optimization for full precision
+ if (modelType == FLOATING) return;
+
+ coord.x = makePrecise(coord.x);
+ coord.y = makePrecise(coord.y);
+ //MD says it's OK that we're not makePrecise'ing the z [Jon Aquino]
+ }
+
+
+ public String toString() {
+ String description = "UNKNOWN";
+ if (modelType == FLOATING) {
+ description = "Floating";
+ } else if (modelType == FLOATING_SINGLE) {
+ description = "Floating-Single";
+ } else if (modelType == FIXED) {
+ description = "Fixed (Scale=" + getScale() + ")";
+ }
+ return description;
+ }
+
+ public boolean equals(Object other) {
+ if (! (other instanceof PrecisionModel)) {
+ return false;
+ }
+ PrecisionModel otherPrecisionModel = (PrecisionModel) other;
+ return modelType == otherPrecisionModel.modelType
+ && scale == otherPrecisionModel.scale;
+ }
+ /**
+ * Compares this {@link PrecisionModel} object with the specified object for order.
+ * A PrecisionModel is greater than another if it provides greater precision.
+ * The comparison is based on the value returned by the
+ * {@link #getMaximumSignificantDigits} method.
+ * This comparison is not strictly accurate when comparing floating precision models
+ * to fixed models; however, it is correct when both models are either floating or fixed.
+ *
+ *@param o the <code>PrecisionModel</code> with which this <code>PrecisionModel</code>
+ * is being compared
+ *@return a negative integer, zero, or a positive integer as this <code>PrecisionModel</code>
+ * is less than, equal to, or greater than the specified <code>PrecisionModel</code>
+ */
+ public int compareTo(Object o) {
+ PrecisionModel other = (PrecisionModel) o;
+
+ int sigDigits = getMaximumSignificantDigits();
+ int otherSigDigits = other.getMaximumSignificantDigits();
+ return (new Integer(sigDigits)).compareTo(new Integer(otherSigDigits));
+// if (sigDigits > otherSigDigits)
+// return 1;
+// else if
+// if (modelType == FLOATING && other.modelType == FLOATING) return 0;
+// if (modelType == FLOATING && other.modelType != FLOATING) return 1;
+// if (modelType != FLOATING && other.modelType == FLOATING) return -1;
+// if (modelType == FIXED && other.modelType == FIXED) {
+// if (scale > other.scale)
+// return 1;
+// else if (scale < other.scale)
+// return -1;
+// else
+// return 0;
+// }
+// Assert.shouldNeverReachHere("Unknown Precision Model type encountered");
+// return 0;
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Puntal.java b/modules/core/src/main/java/org/locationtech/jts/geom/Puntal.java
new file mode 100644
index 0000000..13ee22b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Puntal.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+/**
+ * Identifies {@link Geometry} subclasses which
+ * are 0-dimensional and with components which are {@link Point}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public interface Puntal {
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/TopologyException.java b/modules/core/src/main/java/org/locationtech/jts/geom/TopologyException.java
new file mode 100644
index 0000000..6a986ba
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/TopologyException.java
@@ -0,0 +1,47 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+/**
+ * Indicates an invalid or inconsistent topological situation encountered during processing
+ *
+ * @version 1.7
+ */
+public class TopologyException
+ extends RuntimeException
+{
+ private static String msgWithCoord(String msg, Coordinate pt)
+ {
+ if (pt != null)
+ return msg + " [ " + pt + " ]";
+ return msg;
+ }
+
+ private Coordinate pt = null;
+
+ public TopologyException(String msg)
+ {
+ super(msg);
+ }
+
+ public TopologyException(String msg, Coordinate pt)
+ {
+ super(msgWithCoord(msg, pt));
+ this.pt = new Coordinate(pt);
+ }
+
+ public Coordinate getCoordinate() { return pt; }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Triangle.java b/modules/core/src/main/java/org/locationtech/jts/geom/Triangle.java
new file mode 100644
index 0000000..edd4deb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Triangle.java
@@ -0,0 +1,559 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.algorithm.Angle;
+import org.locationtech.jts.algorithm.HCoordinate;
+import org.locationtech.jts.algorithm.Orientation;
+
+/**
+ * Represents a planar triangle, and provides methods for calculating various
+ * properties of triangles.
+ *
+ * @version 1.7
+ */
+public class Triangle
+{
+
+ /**
+ * Tests whether a triangle is acute. A triangle is acute iff all interior
+ * angles are acute. This is a strict test - right triangles will return
+ * <tt>false</tt> A triangle which is not acute is either right or obtuse.
+ * <p>
+ * Note: this implementation is not robust for angles very close to 90
+ * degrees.
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return true if the triangle is acute
+ */
+ public static boolean isAcute(Coordinate a, Coordinate b, Coordinate c)
+ {
+ if (!Angle.isAcute(a, b, c))
+ return false;
+ if (!Angle.isAcute(b, c, a))
+ return false;
+ if (!Angle.isAcute(c, a, b))
+ return false;
+ return true;
+ }
+
+ /**
+ * Computes the line which is the perpendicular bisector of the line segment
+ * a-b.
+ *
+ * @param a
+ * a point
+ * @param b
+ * another point
+ * @return the perpendicular bisector, as an HCoordinate
+ */
+ public static HCoordinate perpendicularBisector(Coordinate a, Coordinate b)
+ {
+ // returns the perpendicular bisector of the line segment ab
+ double dx = b.x - a.x;
+ double dy = b.y - a.y;
+ HCoordinate l1 = new HCoordinate(a.x + dx / 2.0, a.y + dy / 2.0, 1.0);
+ HCoordinate l2 = new HCoordinate(a.x - dy + dx / 2.0, a.y + dx + dy / 2.0,
+ 1.0);
+ return new HCoordinate(l1, l2);
+ }
+
+ /**
+ * Computes the circumcentre of a triangle. The circumcentre is the centre of
+ * the circumcircle, the smallest circle which encloses the triangle. It is
+ * also the common intersection point of the perpendicular bisectors of the
+ * sides of the triangle, and is the only point which has equal distance to
+ * all three vertices of the triangle.
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the circumcentre of the triangle
+ */
+ /*
+ * // original non-robust algorithm public static Coordinate
+ * circumcentre(Coordinate a, Coordinate b, Coordinate c) { // compute the
+ * perpendicular bisector of chord ab HCoordinate cab =
+ * perpendicularBisector(a, b); // compute the perpendicular bisector of chord
+ * bc HCoordinate cbc = perpendicularBisector(b, c); // compute the
+ * intersection of the bisectors (circle radii) HCoordinate hcc = new
+ * HCoordinate(cab, cbc); Coordinate cc = null; try { cc = new
+ * Coordinate(hcc.getX(), hcc.getY()); } catch (NotRepresentableException ex)
+ * { // MD - not sure what we can do to prevent this (robustness problem) //
+ * Idea - can we condition which edges we choose? throw new
+ * IllegalStateException(ex.getMessage()); }
+ *
+ * //System.out.println("Acc = " + a.distance(cc) + ", Bcc = " +
+ * b.distance(cc) + ", Ccc = " + c.distance(cc) );
+ *
+ * return cc; }
+ */
+
+ /**
+ * Computes the circumcentre of a triangle. The circumcentre is the centre of
+ * the circumcircle, the smallest circle which encloses the triangle. It is
+ * also the common intersection point of the perpendicular bisectors of the
+ * sides of the triangle, and is the only point which has equal distance to
+ * all three vertices of the triangle.
+ * <p>
+ * The circumcentre does not necessarily lie within the triangle. For example,
+ * the circumcentre of an obtuse isosceles triangle lies outside the triangle.
+ * <p>
+ * This method uses an algorithm due to J.R.Shewchuk which uses normalization
+ * to the origin to improve the accuracy of computation. (See <i>Lecture Notes
+ * on Geometric Robustness</i>, Jonathan Richard Shewchuk, 1999).
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the circumcentre of the triangle
+ */
+ public static Coordinate circumcentre(Coordinate a, Coordinate b, Coordinate c)
+ {
+ double cx = c.x;
+ double cy = c.y;
+ double ax = a.x - cx;
+ double ay = a.y - cy;
+ double bx = b.x - cx;
+ double by = b.y - cy;
+
+ double denom = 2 * det(ax, ay, bx, by);
+ double numx = det(ay, ax * ax + ay * ay, by, bx * bx + by * by);
+ double numy = det(ax, ax * ax + ay * ay, bx, bx * bx + by * by);
+
+ double ccx = cx - numx / denom;
+ double ccy = cy + numy / denom;
+
+ return new Coordinate(ccx, ccy);
+ }
+
+ /**
+ * Computes the determinant of a 2x2 matrix. Uses standard double-precision
+ * arithmetic, so is susceptible to round-off error.
+ *
+ * @param m00
+ * the [0,0] entry of the matrix
+ * @param m01
+ * the [0,1] entry of the matrix
+ * @param m10
+ * the [1,0] entry of the matrix
+ * @param m11
+ * the [1,1] entry of the matrix
+ * @return the determinant
+ */
+ private static double det(double m00, double m01, double m10, double m11)
+ {
+ return m00 * m11 - m01 * m10;
+ }
+
+ /**
+ * Computes the incentre of a triangle. The <i>inCentre</i> of a triangle is
+ * the point which is equidistant from the sides of the triangle. It is also
+ * the point at which the bisectors of the triangle's angles meet. It is the
+ * centre of the triangle's <i>incircle</i>, which is the unique circle that
+ * is tangent to each of the triangle's three sides.
+ * <p>
+ * The incentre always lies within the triangle.
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the point which is the incentre of the triangle
+ */
+ public static Coordinate inCentre(Coordinate a, Coordinate b, Coordinate c)
+ {
+ // the lengths of the sides, labelled by their opposite vertex
+ double len0 = b.distance(c);
+ double len1 = a.distance(c);
+ double len2 = a.distance(b);
+ double circum = len0 + len1 + len2;
+
+ double inCentreX = (len0 * a.x + len1 * b.x + len2 * c.x) / circum;
+ double inCentreY = (len0 * a.y + len1 * b.y + len2 * c.y) / circum;
+ return new Coordinate(inCentreX, inCentreY);
+ }
+
+ /**
+ * Computes the centroid (centre of mass) of a triangle. This is also the
+ * point at which the triangle's three medians intersect (a triangle median is
+ * the segment from a vertex of the triangle to the midpoint of the opposite
+ * side). The centroid divides each median in a ratio of 2:1.
+ * <p>
+ * The centroid always lies within the triangle.
+ *
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the centroid of the triangle
+ */
+ public static Coordinate centroid(Coordinate a, Coordinate b, Coordinate c)
+ {
+ double x = (a.x + b.x + c.x) / 3;
+ double y = (a.y + b.y + c.y) / 3;
+ return new Coordinate(x, y);
+ }
+
+ /**
+ * Computes the length of the longest side of a triangle
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the length of the longest side of the triangle
+ */
+ public static double longestSideLength(Coordinate a, Coordinate b,
+ Coordinate c)
+ {
+ double lenAB = a.distance(b);
+ double lenBC = b.distance(c);
+ double lenCA = c.distance(a);
+ double maxLen = lenAB;
+ if (lenBC > maxLen)
+ maxLen = lenBC;
+ if (lenCA > maxLen)
+ maxLen = lenCA;
+ return maxLen;
+ }
+
+ /**
+ * Computes the point at which the bisector of the angle ABC cuts the segment
+ * AC.
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the angle bisector cut point
+ */
+ public static Coordinate angleBisector(Coordinate a, Coordinate b,
+ Coordinate c)
+ {
+ /**
+ * Uses the fact that the lengths of the parts of the split segment are
+ * proportional to the lengths of the adjacent triangle sides
+ */
+ double len0 = b.distance(a);
+ double len2 = b.distance(c);
+ double frac = len0 / (len0 + len2);
+ double dx = c.x - a.x;
+ double dy = c.y - a.y;
+
+ Coordinate splitPt = new Coordinate(a.x + frac * dx, a.y + frac * dy);
+ return splitPt;
+ }
+
+ /**
+ * Computes the 2D area of a triangle. The area value is always non-negative.
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the area of the triangle
+ *
+ * @see #signedArea(Coordinate, Coordinate, Coordinate)
+ */
+ public static double area(Coordinate a, Coordinate b, Coordinate c)
+ {
+ return Math
+ .abs(((c.x - a.x) * (b.y - a.y) - (b.x - a.x) * (c.y - a.y)) / 2);
+ }
+
+ /**
+ * Computes the signed 2D area of a triangle. The area value is positive if
+ * the triangle is oriented CW, and negative if it is oriented CCW.
+ * <p>
+ * The signed area value can be used to determine point orientation, but the
+ * implementation in this method is susceptible to round-off errors. Use
+ * {@link Orientation#index(Coordinate, Coordinate, Coordinate)}
+ * for robust orientation calculation.
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the signed 2D area of the triangle
+ *
+ * @see Orientation#index(Coordinate, Coordinate, Coordinate)
+ */
+ public static double signedArea(Coordinate a, Coordinate b, Coordinate c)
+ {
+ /**
+ * Uses the formula 1/2 * | u x v | where u,v are the side vectors of the
+ * triangle x is the vector cross-product For 2D vectors, this formula
+ * simplifies to the expression below
+ */
+ return ((c.x - a.x) * (b.y - a.y) - (b.x - a.x) * (c.y - a.y)) / 2;
+ }
+
+ /**
+ * Computes the 3D area of a triangle. The value computed is always
+ * non-negative.
+ *
+ * @param a
+ * a vertex of the triangle
+ * @param b
+ * a vertex of the triangle
+ * @param c
+ * a vertex of the triangle
+ * @return the 3D area of the triangle
+ */
+ public static double area3D(Coordinate a, Coordinate b, Coordinate c)
+ {
+ /**
+ * Uses the formula 1/2 * | u x v | where u,v are the side vectors of the
+ * triangle x is the vector cross-product
+ */
+ // side vectors u and v
+ double ux = b.x - a.x;
+ double uy = b.y - a.y;
+ double uz = b.z - a.z;
+
+ double vx = c.x - a.x;
+ double vy = c.y - a.y;
+ double vz = c.z - a.z;
+
+ // cross-product = u x v
+ double crossx = uy * vz - uz * vy;
+ double crossy = uz * vx - ux * vz;
+ double crossz = ux * vy - uy * vx;
+
+ // tri area = 1/2 * | u x v |
+ double absSq = crossx * crossx + crossy * crossy + crossz * crossz;
+ double area3D = Math.sqrt(absSq) / 2;
+
+ return area3D;
+ }
+
+ /**
+ * Computes the Z-value (elevation) of an XY point on a three-dimensional
+ * plane defined by a triangle whose vertices have Z-values. The defining
+ * triangle must not be degenerate (in other words, the triangle must enclose
+ * a non-zero area), and must not be parallel to the Z-axis.
+ * <p>
+ * This method can be used to interpolate the Z-value of a point inside a
+ * triangle (for example, of a TIN facet with elevations on the vertices).
+ *
+ * @param p
+ * the point to compute the Z-value of
+ * @param v0
+ * a vertex of a triangle, with a Z ordinate
+ * @param v1
+ * a vertex of a triangle, with a Z ordinate
+ * @param v2
+ * a vertex of a triangle, with a Z ordinate
+ * @return the computed Z-value (elevation) of the point
+ */
+ public static double interpolateZ(Coordinate p, Coordinate v0, Coordinate v1,
+ Coordinate v2)
+ {
+ double x0 = v0.x;
+ double y0 = v0.y;
+ double a = v1.x - x0;
+ double b = v2.x - x0;
+ double c = v1.y - y0;
+ double d = v2.y - y0;
+ double det = a * d - b * c;
+ double dx = p.x - x0;
+ double dy = p.y - y0;
+ double t = (d * dx - b * dy) / det;
+ double u = (-c * dx + a * dy) / det;
+ double z = v0.z + t * (v1.z - v0.z) + u * (v2.z - v0.z);
+ return z;
+ }
+
+ /**
+ * The coordinates of the vertices of the triangle
+ */
+ public Coordinate p0, p1, p2;
+
+ /**
+ * Creates a new triangle with the given vertices.
+ *
+ * @param p0
+ * a vertex
+ * @param p1
+ * a vertex
+ * @param p2
+ * a vertex
+ */
+ public Triangle(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ this.p0 = p0;
+ this.p1 = p1;
+ this.p2 = p2;
+ }
+
+ /**
+ * Computes the incentre of this triangle. The <i>incentre</i> of a triangle
+ * is the point which is equidistant from the sides of the triangle. It is
+ * also the point at which the bisectors of the triangle's angles meet. It is
+ * the centre of the triangle's <i>incircle</i>, which is the unique circle
+ * that is tangent to each of the triangle's three sides.
+ *
+ * @return the point which is the inCentre of this triangle
+ */
+ public Coordinate inCentre()
+ {
+ return inCentre(p0, p1, p2);
+ }
+
+ /**
+ * Tests whether this triangle is acute. A triangle is acute iff all interior
+ * angles are acute. This is a strict test - right triangles will return
+ * <tt>false</tt> A triangle which is not acute is either right or obtuse.
+ * <p>
+ * Note: this implementation is not robust for angles very close to 90
+ * degrees.
+ *
+ * @return true if this triangle is acute
+ */
+ public boolean isAcute()
+ {
+ return isAcute(this.p0, this.p1, this.p2);
+ }
+
+ /**
+ * Computes the circumcentre of this triangle. The circumcentre is the centre
+ * of the circumcircle, the smallest circle which encloses the triangle. It is
+ * also the common intersection point of the perpendicular bisectors of the
+ * sides of the triangle, and is the only point which has equal distance to
+ * all three vertices of the triangle.
+ * <p>
+ * The circumcentre does not necessarily lie within the triangle.
+ * <p>
+ * This method uses an algorithm due to J.R.Shewchuk which uses normalization
+ * to the origin to improve the accuracy of computation. (See <i>Lecture Notes
+ * on Geometric Robustness</i>, Jonathan Richard Shewchuk, 1999).
+ *
+ * @return the circumcentre of this triangle
+ */
+ public Coordinate circumcentre()
+ {
+ return circumcentre(this.p0, this.p1, this.p2);
+ }
+
+ /**
+ * Computes the centroid (centre of mass) of this triangle. This is also the
+ * point at which the triangle's three medians intersect (a triangle median is
+ * the segment from a vertex of the triangle to the midpoint of the opposite
+ * side). The centroid divides each median in a ratio of 2:1.
+ * <p>
+ * The centroid always lies within the triangle.
+ *
+ * @return the centroid of this triangle
+ */
+ public Coordinate centroid()
+ {
+ return centroid(this.p0, this.p1, this.p2);
+ }
+
+ /**
+ * Computes the length of the longest side of this triangle
+ *
+ * @return the length of the longest side of this triangle
+ */
+ public double longestSideLength()
+ {
+ return longestSideLength(this.p0, this.p1, this.p2);
+ }
+
+ /**
+ * Computes the 2D area of this triangle. The area value is always
+ * non-negative.
+ *
+ * @return the area of this triangle
+ *
+ * @see #signedArea()
+ */
+ public double area()
+ {
+ return area(this.p0, this.p1, this.p2);
+ }
+
+ /**
+ * Computes the signed 2D area of this triangle. The area value is positive if
+ * the triangle is oriented CW, and negative if it is oriented CCW.
+ * <p>
+ * The signed area value can be used to determine point orientation, but the
+ * implementation in this method is susceptible to round-off errors. Use
+ * {@link Orientation#index(Coordinate, Coordinate, Coordinate)}
+ * for robust orientation calculation.
+ *
+ * @return the signed 2D area of this triangle
+ *
+ * @see Orientation#index(Coordinate, Coordinate, Coordinate)
+ */
+ public double signedArea()
+ {
+ return signedArea(this.p0, this.p1, this.p2);
+ }
+
+ /**
+ * Computes the 3D area of this triangle. The value computed is always
+ * non-negative.
+ *
+ * @return the 3D area of this triangle
+ */
+ public double area3D()
+ {
+ return area3D(this.p0, this.p1, this.p2);
+ }
+
+ /**
+ * Computes the Z-value (elevation) of an XY point on a three-dimensional
+ * plane defined by this triangle (whose vertices must have Z-values). This
+ * triangle must not be degenerate (in other words, the triangle must enclose
+ * a non-zero area), and must not be parallel to the Z-axis.
+ * <p>
+ * This method can be used to interpolate the Z-value of a point inside this
+ * triangle (for example, of a TIN facet with elevations on the vertices).
+ *
+ * @param p
+ * the point to compute the Z-value of
+ * @return the computed Z-value (elevation) of the point
+ */
+ public double interpolateZ(Coordinate p)
+ {
+ if (p == null)
+ throw new IllegalArgumentException("Supplied point is null.");
+ return interpolateZ(p, this.p0, this.p1, this.p2);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/impl/CoordinateArraySequence.java b/modules/core/src/main/java/org/locationtech/jts/geom/impl/CoordinateArraySequence.java
new file mode 100644
index 0000000..83cf252
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/impl/CoordinateArraySequence.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.impl;
+
+import java.io.Serializable;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * A {@link CoordinateSequence} backed by an array of {@link Coordinate}s.
+ * This is the implementation that {@link Geometry}s use by default.
+ * Coordinates returned by #toArray and #getCoordinate are live --
+ * modifications to them are actually changing the
+ * CoordinateSequence's underlying data.
+ * A dimension may be specified for the coordinates in the sequence,
+ * which may be 2 or 3.
+ * The actual coordinates will always have 3 ordinates,
+ * but the dimension is useful as metadata in some situations.
+ *
+ * @version 1.7
+ */
+public class CoordinateArraySequence
+ implements CoordinateSequence, Serializable
+{
+ //With contributions from Markus Schaber [schabios at logi-track.com] 2004-03-26
+ private static final long serialVersionUID = -915438501601840650L;
+
+ /**
+ * The actual dimension of the coordinates in the sequence.
+ * Allowable values are 2 or 3.
+ */
+ private int dimension = 3;
+
+ private Coordinate[] coordinates;
+
+ /**
+ * Constructs a sequence based on the given array
+ * of {@link Coordinate}s (the
+ * array is not copied).
+ * The coordinate dimension defaults to 3.
+ *
+ * @param coordinates the coordinate array that will be referenced.
+ */
+ public CoordinateArraySequence(Coordinate[] coordinates) {
+ this(coordinates, 3);
+ }
+
+ /**
+ * Constructs a sequence based on the given array
+ * of {@link Coordinate}s (the
+ * array is not copied).
+ *
+ * @param coordinates the coordinate array that will be referenced.
+ * @param dimension the dimension of the coordinates
+ */
+ public CoordinateArraySequence(Coordinate[] coordinates, int dimension) {
+ this.coordinates = coordinates;
+ this.dimension = dimension;
+ if (coordinates == null)
+ this.coordinates = new Coordinate[0];
+ }
+
+ /**
+ * Constructs a sequence of a given size, populated
+ * with new {@link Coordinate}s.
+ *
+ * @param size the size of the sequence to create
+ */
+ public CoordinateArraySequence(int size) {
+ coordinates = new Coordinate[size];
+ for (int i = 0; i < size; i++) {
+ coordinates[i] = new Coordinate();
+ }
+ }
+
+ /**
+ * Constructs a sequence of a given size, populated
+ * with new {@link Coordinate}s.
+ *
+ * @param size the size of the sequence to create
+ * @param dimension the dimension of the coordinates
+ */
+ public CoordinateArraySequence(int size, int dimension) {
+ coordinates = new Coordinate[size];
+ this.dimension = dimension;
+ for (int i = 0; i < size; i++) {
+ coordinates[i] = new Coordinate();
+ }
+ }
+
+ /**
+ * Creates a new sequence based on a deep copy of the given {@link CoordinateSequence}.
+ * The coordinate dimension is set to equal the dimension of the input.
+ *
+ * @param coordSeq the coordinate sequence that will be copied.
+ */
+ public CoordinateArraySequence(CoordinateSequence coordSeq)
+ {
+ // NOTE: this will make a sequence of the default dimension
+ if (coordSeq == null) {
+ coordinates = new Coordinate[0];
+ return;
+ }
+ dimension = coordSeq.getDimension();
+ coordinates = new Coordinate[coordSeq.size()];
+
+ for (int i = 0; i < coordinates.length; i++) {
+ coordinates[i] = coordSeq.getCoordinateCopy(i);
+ }
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getDimension()
+ */
+ public int getDimension() { return dimension; }
+
+ /**
+ * Get the Coordinate with index i.
+ *
+ * @param i
+ * the index of the coordinate
+ * @return the requested Coordinate instance
+ */
+ public Coordinate getCoordinate(int i) {
+ return coordinates[i];
+ }
+
+ /**
+ * Get a copy of the Coordinate with index i.
+ *
+ * @param i the index of the coordinate
+ * @return a copy of the requested Coordinate
+ */
+ public Coordinate getCoordinateCopy(int i) {
+ return new Coordinate(coordinates[i]);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getX(int)
+ */
+ public void getCoordinate(int index, Coordinate coord) {
+ coord.x = coordinates[index].x;
+ coord.y = coordinates[index].y;
+ coord.z = coordinates[index].z;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getX(int)
+ */
+ public double getX(int index) {
+ return coordinates[index].x;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getY(int)
+ */
+ public double getY(int index) {
+ return coordinates[index].y;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getOrdinate(int, int)
+ */
+ public double getOrdinate(int index, int ordinateIndex)
+ {
+ switch (ordinateIndex) {
+ case CoordinateSequence.X: return coordinates[index].x;
+ case CoordinateSequence.Y: return coordinates[index].y;
+ case CoordinateSequence.Z: return coordinates[index].z;
+ }
+ return Double.NaN;
+ }
+
+ /**
+ * Creates a deep copy of the Object
+ *
+ * @return The deep copy
+ * @deprecated
+ */
+ public Object clone() {
+ return copy();
+ }
+ /**
+ * Creates a deep copy of the CoordinateArraySequence
+ *
+ * @return The deep copy
+ */
+ public CoordinateArraySequence copy() {
+ Coordinate[] cloneCoordinates = new Coordinate[size()];
+ for (int i = 0; i < coordinates.length; i++) {
+ cloneCoordinates[i] = coordinates[i].copy();
+ }
+ return new CoordinateArraySequence(cloneCoordinates, dimension);
+ }
+ /**
+ * Returns the size of the coordinate sequence
+ *
+ * @return the number of coordinates
+ */
+ public int size() {
+ return coordinates.length;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#setOrdinate(int, int, double)
+ */
+ public void setOrdinate(int index, int ordinateIndex, double value)
+ {
+ switch (ordinateIndex) {
+ case CoordinateSequence.X:
+ coordinates[index].x = value;
+ break;
+ case CoordinateSequence.Y:
+ coordinates[index].y = value;
+ break;
+ case CoordinateSequence.Z:
+ coordinates[index].z = value;
+ break;
+ default:
+ throw new IllegalArgumentException("invalid ordinateIndex");
+ }
+ }
+
+ /**
+ * This method exposes the internal Array of Coordinate Objects
+ *
+ * @return the Coordinate[] array.
+ */
+ public Coordinate[] toCoordinateArray() {
+ return coordinates;
+ }
+
+ public Envelope expandEnvelope(Envelope env)
+ {
+ for (int i = 0; i < coordinates.length; i++ ) {
+ env.expandToInclude(coordinates[i]);
+ }
+ return env;
+ }
+
+ /**
+ * Returns the string Representation of the coordinate array
+ *
+ * @return The string
+ */
+ public String toString() {
+ if (coordinates.length > 0) {
+ StringBuilder strBuilder = new StringBuilder(17 * coordinates.length);
+ strBuilder.append('(');
+ strBuilder.append(coordinates[0]);
+ for (int i = 1; i < coordinates.length; i++) {
+ strBuilder.append(", ");
+ strBuilder.append(coordinates[i]);
+ }
+ strBuilder.append(')');
+ return strBuilder.toString();
+ } else {
+ return "()";
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/impl/CoordinateArraySequenceFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/impl/CoordinateArraySequenceFactory.java
new file mode 100644
index 0000000..bf97600
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/impl/CoordinateArraySequenceFactory.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.impl;
+
+import java.io.Serializable;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
+
+/**
+ * Creates {@link CoordinateSequence}s represented as an array of {@link Coordinate}s.
+ *
+ * @version 1.7
+ */
+public final class CoordinateArraySequenceFactory
+ implements CoordinateSequenceFactory, Serializable
+{
+ private static final long serialVersionUID = -4099577099607551657L;
+ private static final CoordinateArraySequenceFactory instanceObject = new CoordinateArraySequenceFactory();
+
+ private CoordinateArraySequenceFactory() {
+ }
+
+ private Object readResolve() {
+ // http://www.javaworld.com/javaworld/javatips/jw-javatip122.html
+ return CoordinateArraySequenceFactory.instance();
+ }
+
+ /**
+ * Returns the singleton instance of {@link CoordinateArraySequenceFactory}
+ */
+ public static CoordinateArraySequenceFactory instance() {
+ return instanceObject;
+ }
+
+ /**
+ * Returns a {@link CoordinateArraySequence} based on the given array (the array is
+ * not copied).
+ *
+ * @param coordinates
+ * the coordinates, which may not be null nor contain null
+ * elements
+ */
+ public CoordinateSequence create(Coordinate[] coordinates) {
+ return new CoordinateArraySequence(coordinates);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(org.locationtech.jts.geom.CoordinateSequence)
+ */
+ public CoordinateSequence create(CoordinateSequence coordSeq) {
+ return new CoordinateArraySequence(coordSeq);
+ }
+
+ /**
+ * The created sequence dimension is clamped to be <= 3.
+ *
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(int, int)
+ *
+ */
+ public CoordinateSequence create(int size, int dimension) {
+ if (dimension > 3)
+ dimension = 3;
+ //throw new IllegalArgumentException("dimension must be <= 3");
+ // handle bogus dimension
+ if (dimension < 2)
+ // TODO: change to dimension = 2 ???
+ return new CoordinateArraySequence(size);
+ return new CoordinateArraySequence(size, dimension);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/impl/PackedCoordinateSequence.java b/modules/core/src/main/java/org/locationtech/jts/geom/impl/PackedCoordinateSequence.java
new file mode 100644
index 0000000..1c425c3
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/impl/PackedCoordinateSequence.java
@@ -0,0 +1,492 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.impl;
+
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.ref.SoftReference;
+import java.util.Arrays;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequences;
+import org.locationtech.jts.geom.Envelope;
+
+/**
+ * A {@link CoordinateSequence} implementation based on a packed arrays.
+ * In this implementation, {@link Coordinate}s returned by #toArray and #get are copies
+ * of the internal values.
+ * To change the actual values, use the provided setters.
+ * <p>
+ * For efficiency, created Coordinate arrays
+ * are cached using a soft reference.
+ * The cache is cleared each time the coordinate sequence contents are
+ * modified through a setter method.
+ *
+ * @version 1.7
+ */
+public abstract class PackedCoordinateSequence
+ implements CoordinateSequence, Serializable
+{
+ private static final long serialVersionUID = -3151899011275603L;
+ /**
+ * The dimensions of the coordinates hold in the packed array
+ */
+ protected int dimension;
+
+ /**
+ * A soft reference to the Coordinate[] representation of this sequence.
+ * Makes repeated coordinate array accesses more efficient.
+ */
+ protected transient SoftReference coordRef;
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getDimension()
+ */
+ public int getDimension() {
+ return this.dimension;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int)
+ */
+ public Coordinate getCoordinate(int i) {
+ Coordinate[] coords = getCachedCoords();
+ if(coords != null)
+ return coords[i];
+ else
+ return getCoordinateInternal(i);
+ }
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int)
+ */
+ public Coordinate getCoordinateCopy(int i) {
+ return getCoordinateInternal(i);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int)
+ */
+ public void getCoordinate(int i, Coordinate coord) {
+ coord.x = getOrdinate(i, 0);
+ coord.y = getOrdinate(i, 1);
+ if (dimension > 2) coord.z = getOrdinate(i, 2);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#toCoordinateArray()
+ */
+ public Coordinate[] toCoordinateArray() {
+ Coordinate[] coords = getCachedCoords();
+// testing - never cache
+ if (coords != null)
+ return coords;
+
+ coords = new Coordinate[size()];
+ for (int i = 0; i < coords.length; i++) {
+ coords[i] = getCoordinateInternal(i);
+ }
+ coordRef = new SoftReference(coords);
+
+ return coords;
+ }
+
+ /**
+ * @return
+ */
+ private Coordinate[] getCachedCoords() {
+ if (coordRef != null) {
+ Coordinate[] coords = (Coordinate[]) coordRef.get();
+ if (coords != null) {
+ return coords;
+ } else {
+ // System.out.print("-");
+ coordRef = null;
+ return null;
+ }
+ } else {
+ // System.out.print("-");
+ return null;
+ }
+
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getX(int)
+ */
+ public double getX(int index) {
+ return getOrdinate(index, 0);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getY(int)
+ */
+ public double getY(int index) {
+ return getOrdinate(index, 1);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getOrdinate(int, int)
+ */
+ public abstract double getOrdinate(int index, int ordinateIndex);
+
+ /**
+ * Sets the first ordinate of a coordinate in this sequence.
+ *
+ * @param index the coordinate index
+ * @param value the new ordinate value
+ */
+ public void setX(int index, double value) {
+ coordRef = null;
+ setOrdinate(index, 0, value);
+ }
+
+ /**
+ * Sets the second ordinate of a coordinate in this sequence.
+ *
+ * @param index the coordinate index
+ * @param value the new ordinate value
+ */
+ public void setY(int index, double value) {
+ coordRef = null;
+ setOrdinate(index, 1, value);
+ }
+
+ public String toString()
+ {
+ return CoordinateSequences.toString(this);
+ }
+
+ protected Object readResolve() throws ObjectStreamException {
+ coordRef = null;
+ return this;
+ }
+
+ /**
+ * Returns a Coordinate representation of the specified coordinate, by always
+ * building a new Coordinate object
+ *
+ * @param index
+ * @return
+ */
+ protected abstract Coordinate getCoordinateInternal(int index);
+
+ /**
+ * @see java.lang.Object#clone()
+ * @deprecated
+ */
+ public abstract Object clone();
+
+ public abstract PackedCoordinateSequence copy();
+
+ /**
+ * Sets the ordinate of a coordinate in this sequence.
+ * <br>
+ * Warning: for performance reasons the ordinate index is not checked
+ * - if it is over dimensions you may not get an exception but a meaningless value.
+ *
+ * @param index
+ * the coordinate index
+ * @param ordinate
+ * the ordinate index in the coordinate, 0 based, smaller than the
+ * number of dimensions
+ * @param value
+ * the new ordinate value
+ */
+ public abstract void setOrdinate(int index, int ordinate, double value);
+
+ /**
+ * Packed coordinate sequence implementation based on doubles
+ */
+ public static class Double extends PackedCoordinateSequence {
+
+ /**
+ * The packed coordinate array
+ */
+ double[] coords;
+
+ /**
+ * Builds a new packed coordinate sequence
+ *
+ * @param coords
+ * @param dimensions
+ */
+ public Double(double[] coords, int dimensions) {
+ if (dimensions < 2) {
+ throw new IllegalArgumentException("Must have at least 2 dimensions");
+ }
+ if (coords.length % dimensions != 0) {
+ throw new IllegalArgumentException("Packed array does not contain "
+ + "an integral number of coordinates");
+ }
+ this.dimension = dimensions;
+ this.coords = coords;
+ }
+
+ /**
+ * Builds a new packed coordinate sequence out of a float coordinate array
+ *
+ * @param coordinates
+ */
+ public Double(float[] coordinates, int dimensions) {
+ this.coords = new double[coordinates.length];
+ this.dimension = dimensions;
+ for (int i = 0; i < coordinates.length; i++) {
+ this.coords[i] = coordinates[i];
+ }
+ }
+
+ /**
+ * Builds a new packed coordinate sequence out of a coordinate array
+ *
+ * @param coordinates
+ */
+ public Double(Coordinate[] coordinates, int dimension) {
+ if (coordinates == null)
+ coordinates = new Coordinate[0];
+ this.dimension = dimension;
+
+ coords = new double[coordinates.length * this.dimension];
+ for (int i = 0; i < coordinates.length; i++) {
+ coords[i * this.dimension] = coordinates[i].x;
+ if (this.dimension >= 2)
+ coords[i * this.dimension + 1] = coordinates[i].y;
+ if (this.dimension >= 3)
+ coords[i * this.dimension + 2] = coordinates[i].z;
+ }
+ }
+ /**
+ * Builds a new packed coordinate sequence out of a coordinate array
+ *
+ * @param coordinates
+ */
+ public Double(Coordinate[] coordinates) {
+ this(coordinates, 3);
+ }
+
+ /**
+ * Builds a new empty packed coordinate sequence of a given size and dimension
+ */
+ public Double(int size, int dimension) {
+ this.dimension = dimension;
+ coords = new double[size * this.dimension];
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int)
+ */
+ public Coordinate getCoordinateInternal(int i) {
+ double x = coords[i * dimension];
+ double y = coords[i * dimension + 1];
+ double z = dimension == 2 ? Coordinate.NULL_ORDINATE : coords[i * dimension + 2];
+ return new Coordinate(x, y, z);
+ }
+
+ /**
+ * Gets the underlying array containing the coordinate values.
+ *
+ * @return the array of coordinate values
+ */
+ public double[] getRawCoordinates()
+ {
+ return coords;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#size()
+ */
+ public int size() {
+ return coords.length / dimension;
+ }
+
+ /**
+ * @see java.lang.Object#clone()
+ * @deprecated
+ */
+ public Object clone() {
+ return copy();
+ }
+
+ public Double copy() {
+ double[] clone = Arrays.copyOf(coords, coords.length);
+ return new Double(clone, dimension);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getOrdinate(int, int)
+ * Beware, for performance reasons the ordinate index is not checked, if
+ * it's over dimensions you may not get an exception but a meaningless
+ * value.
+ */
+ public double getOrdinate(int index, int ordinate) {
+ return coords[index * dimension + ordinate];
+ }
+
+ /**
+ * @see com.vividsolutions.jts.geom.PackedCoordinateSequence#setOrdinate(int,
+ * int, double)
+ */
+ public void setOrdinate(int index, int ordinate, double value) {
+ coordRef = null;
+ coords[index * dimension + ordinate] = value;
+ }
+
+ public Envelope expandEnvelope(Envelope env)
+ {
+ for (int i = 0; i < coords.length; i += dimension ) {
+ env.expandToInclude(coords[i], coords[i + 1]);
+ }
+ return env;
+ }
+ }
+
+ /**
+ * Packed coordinate sequence implementation based on floats
+ */
+ public static class Float extends PackedCoordinateSequence {
+
+ /**
+ * The packed coordinate array
+ */
+ float[] coords;
+
+ /**
+ * Constructs a packed coordinate sequence from an array of <code>float</code>s
+ *
+ * @param coords
+ * @param dimensions
+ */
+ public Float(float[] coords, int dimensions) {
+ if (dimensions < 2) {
+ throw new IllegalArgumentException("Must have at least 2 dimensions");
+ }
+ if (coords.length % dimensions != 0) {
+ throw new IllegalArgumentException("Packed array does not contain "
+ + "an integral number of coordinates");
+ }
+ this.dimension = dimensions;
+ this.coords = coords;
+ }
+
+ /**
+ * Constructs a packed coordinate sequence from an array of <code>double</code>s
+ *
+ * @param coordinates
+ * @param dimension
+ */
+ public Float(double[] coordinates, int dimension) {
+ this.coords = new float[coordinates.length];
+ this.dimension = dimension;
+ for (int i = 0; i < coordinates.length; i++) {
+ this.coords[i] = (float) coordinates[i];
+ }
+ }
+
+ /**
+ * Constructs a packed coordinate sequence out of a coordinate array
+ *
+ * @param coordinates
+ */
+ public Float(Coordinate[] coordinates, int dimension) {
+ if (coordinates == null)
+ coordinates = new Coordinate[0];
+ this.dimension = dimension;
+
+ coords = new float[coordinates.length * this.dimension];
+ for (int i = 0; i < coordinates.length; i++) {
+ coords[i * this.dimension] = (float) coordinates[i].x;
+ if (this.dimension >= 2)
+ coords[i * this.dimension + 1] = (float) coordinates[i].y;
+ if (this.dimension >= 3)
+ coords[i * this.dimension + 2] = (float) coordinates[i].z;
+ }
+ }
+
+ /**
+ * Constructs an empty packed coordinate sequence of a given size and dimension
+ */
+ public Float(int size, int dimension) {
+ this.dimension = dimension;
+ coords = new float[size * this.dimension];
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int)
+ */
+ public Coordinate getCoordinateInternal(int i) {
+ double x = coords[i * dimension];
+ double y = coords[i * dimension + 1];
+ double z = dimension == 2 ? Coordinate.NULL_ORDINATE : coords[i * dimension + 2];
+ return new Coordinate(x, y, z);
+ }
+
+ /**
+ * Gets the underlying array containing the coordinate values.
+ *
+ * @return the array of coordinate values
+ */
+ public float[] getRawCoordinates()
+ {
+ return coords;
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#size()
+ */
+ public int size() {
+ return coords.length / dimension;
+ }
+
+ /**
+ * @see java.lang.Object#clone()
+ * @deprecated
+ */
+ public Object clone() {
+ return copy();
+ }
+
+ public Float copy() {
+ float[] clone = Arrays.copyOf(coords, coords.length);
+ return new Float(clone, dimension);
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequence#getOrdinate(int, int)
+ * For performance reasons the ordinate index is not checked.
+ * If it is larger than the dimension a meaningless
+ * value may be returned.
+ */
+ public double getOrdinate(int index, int ordinate) {
+ return coords[index * dimension + ordinate];
+ }
+
+ /**
+ * @see com.vividsolutions.jts.geom.PackedCoordinateSequence#setOrdinate(int,
+ * int, double)
+ */
+ public void setOrdinate(int index, int ordinate, double value) {
+ coordRef = null;
+ coords[index * dimension + ordinate] = (float) value;
+ }
+
+ public Envelope expandEnvelope(Envelope env)
+ {
+ for (int i = 0; i < coords.length; i += dimension ) {
+ env.expandToInclude(coords[i], coords[i + 1]);
+ }
+ return env;
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/impl/PackedCoordinateSequenceFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/impl/PackedCoordinateSequenceFactory.java
new file mode 100644
index 0000000..dac9063
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/impl/PackedCoordinateSequenceFactory.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.impl;
+
+import java.io.Serializable;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
+
+/**
+ * Builds packed array coordinate sequences. The array data type can be either
+ * double or float, and defaults to float.
+ */
+public class PackedCoordinateSequenceFactory implements
+ CoordinateSequenceFactory, Serializable
+{
+ private static final long serialVersionUID = -3558264771905224525L;
+
+ public static final int DOUBLE = 0;
+ public static final int FLOAT = 1;
+
+ public static final PackedCoordinateSequenceFactory DOUBLE_FACTORY =
+ new PackedCoordinateSequenceFactory(DOUBLE);
+ public static final PackedCoordinateSequenceFactory FLOAT_FACTORY =
+ new PackedCoordinateSequenceFactory(FLOAT);
+
+ private int type = DOUBLE;
+ private int dimension = 3;
+
+ /**
+ * Creates a new PackedCoordinateSequenceFactory
+ * of type DOUBLE.
+ */
+ public PackedCoordinateSequenceFactory()
+ {
+ this(DOUBLE);
+ }
+
+ /**
+ * Creates a new PackedCoordinateSequenceFactory
+ * of the given type.
+ * Acceptable type values are
+ * {@linkplain PackedCoordinateSequenceFactory#Float}or
+ * {@linkplain PackedCoordinateSequenceFactory#Double}
+ */
+ public PackedCoordinateSequenceFactory(int type)
+ {
+ this(type, 3);
+ }
+ /**
+ * Creates a new PackedCoordinateSequenceFactory
+ * of the given type.
+ * Acceptable type values are
+ * {@linkplain PackedCoordinateSequenceFactory#FLOAT}or
+ * {@linkplain PackedCoordinateSequenceFactory#DOUBLE}
+ */
+ public PackedCoordinateSequenceFactory(int type, int dimension)
+ {
+ setType(type);
+ setDimension(dimension);
+ }
+
+ /**
+ * Returns the type of packed coordinate sequences this factory builds, either
+ * {@linkplain PackedCoordinateSequenceFactory#Float} or
+ * {@linkplain PackedCoordinateSequenceFactory#Double}
+ */
+ public int getType() {
+ return type;
+ }
+
+ /**
+ * Sets the type of packed coordinate sequences this factory builds,
+ * acceptable values are {@linkplain PackedCoordinateSequenceFactory#Float}or
+ * {@linkplain PackedCoordinateSequenceFactory#Double}
+ */
+ public void setType(int type) {
+ if (type != DOUBLE && type != FLOAT)
+ throw new IllegalArgumentException("Unknown type " + type);
+ this.type = type;
+ }
+
+
+ public int getDimension() { return dimension; }
+
+ public void setDimension(int dimension) { this.dimension = dimension; }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(org.locationtech.jts.geom.Coordinate[])
+ */
+ public CoordinateSequence create(Coordinate[] coordinates) {
+ if (type == DOUBLE) {
+ return new PackedCoordinateSequence.Double(coordinates, dimension);
+ } else {
+ return new PackedCoordinateSequence.Float(coordinates, dimension);
+ }
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(org.locationtech.jts.geom.CoordinateSequence)
+ */
+ public CoordinateSequence create(CoordinateSequence coordSeq) {
+ if (type == DOUBLE) {
+ return new PackedCoordinateSequence.Double(coordSeq.toCoordinateArray(), dimension);
+ } else {
+ return new PackedCoordinateSequence.Float(coordSeq.toCoordinateArray(), dimension);
+ }
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(double[],
+ * int)
+ */
+ public CoordinateSequence create(double[] packedCoordinates, int dimension) {
+ if (type == DOUBLE) {
+ return new PackedCoordinateSequence.Double(packedCoordinates, dimension);
+ } else {
+ return new PackedCoordinateSequence.Float(packedCoordinates, dimension);
+ }
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(float[],
+ * int)
+ */
+ public CoordinateSequence create(float[] packedCoordinates, int dimension) {
+ if (type == DOUBLE) {
+ return new PackedCoordinateSequence.Double(packedCoordinates, dimension);
+ } else {
+ return new PackedCoordinateSequence.Float(packedCoordinates, dimension);
+ }
+ }
+
+ /**
+ * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(int, int)
+ */
+ public CoordinateSequence create(int size, int dimension) {
+ if (type == DOUBLE) {
+ return new PackedCoordinateSequence.Double(size, dimension);
+ } else {
+ return new PackedCoordinateSequence.Float(size, dimension);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/impl/package.html b/modules/core/src/main/java/org/locationtech/jts/geom/impl/package.html
new file mode 100644
index 0000000..3c5e4db
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/impl/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Implementations of interfaces for geometric structures.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/package.html b/modules/core/src/main/java/org/locationtech/jts/geom/package.html
new file mode 100644
index 0000000..54500b0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/package.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains the <CODE>Geometry</CODE> interface hierarchy and supporting classes.
+<P>
+The Java Topology Suite (JTS) is a Java API that implements a core set of spatial data operations using an explicit precision model and robust geometric algorithms. JTS is intended to be used in the development of applications that support the validation, cleaning, integration and querying of spatial datasets.
+<P>
+JTS attempts to implement the OpenGIS Simple Features Specification (SFS) as accurately as possible. In some cases the SFS is unclear or omits a specification; in this case JTS attempts to choose a reasonable and consistent alternative. Differences from and elaborations of the SFS are documented in this specification.
+
+<h2>Package Specification</h2>
+
+<ul>
+ <li>Java Topology Suite Technical Specifications
+ <li><A HREF="http://www.opengis.org/techno/specs.htm">
+ OpenGIS Simple Features Specification for SQL</A>
+</ul>
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/AbstractPreparedPolygonContains.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/AbstractPreparedPolygonContains.java
new file mode 100644
index 0000000..23cd30f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/AbstractPreparedPolygonContains.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.noding.SegmentIntersectionDetector;
+import org.locationtech.jts.noding.SegmentStringUtil;
+
+
+
+/**
+ * A base class containing the logic for computes the <tt>contains</tt>
+ * and <tt>covers</tt> spatial relationship predicates
+ * for a {@link PreparedPolygon} relative to all other {@link Geometry} classes.
+ * Uses short-circuit tests and indexing to improve performance.
+ * <p>
+ * Contains and covers are very similar, and differ only in how certain
+ * cases along the boundary are handled. These cases require
+ * full topological evaluation to handle, so all the code in
+ * this class is common to both predicates.
+ * <p>
+ * It is not possible to short-circuit in all cases, in particular
+ * in the case where line segments of the test geometry touches the polygon linework.
+ * In this case full topology must be computed.
+ * (However, if the test geometry consists of only points, this
+ * <i>can</i> be evaluated in an optimized fashion.
+ *
+ * @author Martin Davis
+ *
+ */
+abstract class AbstractPreparedPolygonContains
+ extends PreparedPolygonPredicate
+{
+ /**
+ * This flag controls a difference between contains and covers.
+ *
+ * For contains the value is true.
+ * For covers the value is false.
+ */
+ protected boolean requireSomePointInInterior = true;
+
+ // information about geometric situation
+ private boolean hasSegmentIntersection = false;
+ private boolean hasProperIntersection = false;
+ private boolean hasNonProperIntersection = false;
+
+ /**
+ * Creates an instance of this operation.
+ *
+ * @param prepPoly the PreparedPolygon to evaluate
+ */
+ public AbstractPreparedPolygonContains(PreparedPolygon prepPoly)
+ {
+ super(prepPoly);
+ }
+
+ /**
+ * Evaluate the <tt>contains</tt> or <tt>covers</tt> relationship
+ * for the given geometry.
+ *
+ * @param geom the test geometry
+ * @return true if the test geometry is contained
+ */
+ protected boolean eval(Geometry geom)
+ {
+ /**
+ * Do point-in-poly tests first, since they are cheaper and may result
+ * in a quick negative result.
+ *
+ * If a point of any test components does not lie in target, result is false
+ */
+ boolean isAllInTargetArea = isAllTestComponentsInTarget(geom);
+ if (! isAllInTargetArea) return false;
+
+ /**
+ * If the test geometry consists of only Points,
+ * then it is now sufficient to test if any of those
+ * points lie in the interior of the target geometry.
+ * If so, the test is contained.
+ * If not, all points are on the boundary of the area,
+ * which implies not contained.
+ */
+ if (requireSomePointInInterior
+ && geom.getDimension() == 0) {
+ boolean isAnyInTargetInterior = isAnyTestComponentInTargetInterior(geom);
+ return isAnyInTargetInterior;
+ }
+
+ /**
+ * Check if there is any intersection between the line segments
+ * in target and test.
+ * In some important cases, finding a proper intersection implies that the
+ * test geometry is NOT contained.
+ * These cases are:
+ * <ul>
+ * <li>If the test geometry is polygonal
+ * <li>If the target geometry is a single polygon with no holes
+ * <ul>
+ * In both of these cases, a proper intersection implies that there
+ * is some portion of the interior of the test geometry lying outside
+ * the target, which means that the test is not contained.
+ */
+ boolean properIntersectionImpliesNotContained = isProperIntersectionImpliesNotContainedSituation(geom);
+ // MD - testing only
+// properIntersectionImpliesNotContained = true;
+
+ // find all intersection types which exist
+ findAndClassifyIntersections(geom);
+
+ if (properIntersectionImpliesNotContained && hasProperIntersection)
+ return false;
+
+ /**
+ * If all intersections are proper
+ * (i.e. no non-proper intersections occur)
+ * we can conclude that the test geometry is not contained in the target area,
+ * by the Epsilon-Neighbourhood Exterior Intersection condition.
+ * In real-world data this is likely to be by far the most common situation,
+ * since natural data is unlikely to have many exact vertex segment intersections.
+ * Thus this check is very worthwhile, since it avoid having to perform
+ * a full topological check.
+ *
+ * (If non-proper (vertex) intersections ARE found, this may indicate
+ * a situation where two shells touch at a single vertex, which admits
+ * the case where a line could cross between the shells and still be wholely contained in them.
+ */
+ if (hasSegmentIntersection && ! hasNonProperIntersection)
+ return false;
+
+ /**
+ * If there is a segment intersection and the situation is not one
+ * of the ones above, the only choice is to compute the full topological
+ * relationship. This is because contains/covers is very sensitive
+ * to the situation along the boundary of the target.
+ */
+ if (hasSegmentIntersection) {
+ return fullTopologicalPredicate(geom);
+// System.out.println(geom);
+ }
+
+ /**
+ * This tests for the case where a ring of the target lies inside
+ * a test polygon - which implies the exterior of the Target
+ * intersects the interior of the Test, and hence the result is false
+ */
+ if (geom instanceof Polygonal) {
+ // TODO: generalize this to handle GeometryCollections
+ boolean isTargetInTestArea = isAnyTargetComponentInAreaTest(geom, prepPoly.getRepresentativePoints());
+ if (isTargetInTestArea) return false;
+ }
+ return true;
+ }
+
+ private boolean isProperIntersectionImpliesNotContainedSituation(Geometry testGeom)
+ {
+ /**
+ * If the test geometry is polygonal we have the A/A situation.
+ * In this case, a proper intersection indicates that
+ * the Epsilon-Neighbourhood Exterior Intersection condition exists.
+ * This condition means that in some small
+ * area around the intersection point, there must exist a situation
+ * where the interior of the test intersects the exterior of the target.
+ * This implies the test is NOT contained in the target.
+ */
+ if (testGeom instanceof Polygonal) return true;
+ /**
+ * A single shell with no holes allows concluding that
+ * a proper intersection implies not contained
+ * (due to the Epsilon-Neighbourhood Exterior Intersection condition)
+ */
+ if (isSingleShell(prepPoly.getGeometry())) return true;
+ return false;
+ }
+
+ /**
+ * Tests whether a geometry consists of a single polygon with no holes.
+ *
+ * @return true if the geometry is a single polygon with no holes
+ */
+ private boolean isSingleShell(Geometry geom)
+ {
+ // handles single-element MultiPolygons, as well as Polygons
+ if (geom.getNumGeometries() != 1) return false;
+
+ Polygon poly = (Polygon) geom.getGeometryN(0);
+ int numHoles = poly.getNumInteriorRing();
+ if (numHoles == 0) return true;
+ return false;
+ }
+
+ private void findAndClassifyIntersections(Geometry geom)
+ {
+ List lineSegStr = SegmentStringUtil.extractSegmentStrings(geom);
+
+ SegmentIntersectionDetector intDetector = new SegmentIntersectionDetector();
+ intDetector.setFindAllIntersectionTypes(true);
+ prepPoly.getIntersectionFinder().intersects(lineSegStr, intDetector);
+
+ hasSegmentIntersection = intDetector.hasIntersection();
+ hasProperIntersection = intDetector.hasProperIntersection();
+ hasNonProperIntersection = intDetector.hasNonProperIntersection();
+ }
+
+ /**
+ * Computes the full topological predicate.
+ * Used when short-circuit tests are not conclusive.
+ *
+ * @param geom the test geometry
+ * @return true if this prepared polygon has the relationship with the test geometry
+ */
+ protected abstract boolean fullTopologicalPredicate(Geometry geom);
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/BasicPreparedGeometry.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/BasicPreparedGeometry.java
new file mode 100644
index 0000000..b0350f7
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/BasicPreparedGeometry.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.util.ComponentCoordinateExtracter;
+
+
+/**
+ * A base class for {@link PreparedGeometry} subclasses.
+ * Contains default implementations for methods, which simply delegate
+ * to the equivalent {@link Geometry} methods.
+ * This class may be used as a "no-op" class for Geometry types
+ * which do not have a corresponding {@link PreparedGeometry} implementation.
+ *
+ * @author Martin Davis
+ *
+ */
+class BasicPreparedGeometry
+ implements PreparedGeometry
+{
+ private final Geometry baseGeom;
+ private final List representativePts; // List<Coordinate>
+
+ public BasicPreparedGeometry(Geometry geom)
+ {
+ baseGeom = geom;
+ representativePts = ComponentCoordinateExtracter.getCoordinates(geom);
+ }
+
+ public Geometry getGeometry() { return baseGeom; }
+
+ /**
+ * Gets the list of representative points for this geometry.
+ * One vertex is included for every component of the geometry
+ * (i.e. including one for every ring of polygonal geometries).
+ *
+ * Do not modify the returned list!
+ *
+ * @return a List of Coordinate
+ */
+ public List getRepresentativePoints()
+ {
+ //TODO wrap in unmodifiable?
+ return representativePts;
+ }
+
+ /**
+ * Tests whether any representative of the target geometry
+ * intersects the test geometry.
+ * This is useful in A/A, A/L, A/P, L/P, and P/P cases.
+ *
+ * @param testGeom the test geometry
+ * @return true if any component intersects the areal test geometry
+ */
+ public boolean isAnyTargetComponentInTest(Geometry testGeom)
+ {
+ PointLocator locator = new PointLocator();
+ for (Iterator i = representativePts.iterator(); i.hasNext(); ) {
+ Coordinate p = (Coordinate) i.next();
+ if (locator.intersects(p, testGeom))
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Determines whether a Geometry g interacts with
+ * this geometry by testing the geometry envelopes.
+ *
+ * @param g a Geometry
+ * @return true if the envelopes intersect
+ */
+ protected boolean envelopesIntersect(Geometry g)
+ {
+ if (! baseGeom.getEnvelopeInternal().intersects(g.getEnvelopeInternal()))
+ return false;
+ return true;
+ }
+
+ /**
+ * Determines whether the envelope of
+ * this geometry covers the Geometry g.
+ *
+ *
+ * @param g a Geometry
+ * @return true if g is contained in this envelope
+ */
+ protected boolean envelopeCovers(Geometry g)
+ {
+ if (! baseGeom.getEnvelopeInternal().covers(g.getEnvelopeInternal()))
+ return false;
+ return true;
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean contains(Geometry g)
+ {
+ return baseGeom.contains(g);
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean containsProperly(Geometry g)
+ {
+ // since raw relate is used, provide some optimizations
+
+ // short-circuit test
+ if (! baseGeom.getEnvelopeInternal().contains(g.getEnvelopeInternal()))
+ return false;
+
+ // otherwise, compute using relate mask
+ return baseGeom.relate(g, "T**FF*FF*");
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean coveredBy(Geometry g)
+ {
+ return baseGeom.coveredBy(g);
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean covers(Geometry g)
+ {
+ return baseGeom.covers(g);
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean crosses(Geometry g)
+ {
+ return baseGeom.crosses(g);
+ }
+
+ /**
+ * Standard implementation for all geometries.
+ * Supports {@link GeometryCollection}s as input.
+ */
+ public boolean disjoint(Geometry g)
+ {
+ return ! intersects(g);
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean intersects(Geometry g)
+ {
+ return baseGeom.intersects(g);
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean overlaps(Geometry g)
+ {
+ return baseGeom.overlaps(g);
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean touches(Geometry g)
+ {
+ return baseGeom.touches(g);
+ }
+
+ /**
+ * Default implementation.
+ */
+ public boolean within(Geometry g)
+ {
+ return baseGeom.within(g);
+ }
+
+ public String toString()
+ {
+ return baseGeom.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedGeometry.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedGeometry.java
new file mode 100644
index 0000000..849b9be
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedGeometry.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+
+/**
+ * An interface for classes which prepare {@link Geometry}s
+ * in order to optimize the performance
+ * of repeated calls to specific geometric operations.
+ * <p>
+ * A given implementation may provide optimized implementations
+ * for only some of the specified methods,
+ * and delegate the remaining methods to the original {@link Geometry} operations.
+ * An implementation may also only optimize certain situations,
+ * and delegate others.
+ * See the implementing classes for documentation about which methods and situations
+ * they optimize.
+ * <p>
+ * Subclasses are intended to be thread-safe, to allow <code>PreparedGeometry</code>
+ * to be used in a multi-threaded context
+ * (which allows extracting maximum benefit from the prepared state).
+ *
+ * @author Martin Davis
+ *
+ */
+public interface PreparedGeometry
+{
+
+ /**
+ * Gets the original {@link Geometry} which has been prepared.
+ *
+ * @return the base geometry
+ */
+ Geometry getGeometry();
+
+ /**
+ * Tests whether the base {@link Geometry} contains a given geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry contains the given Geometry
+ *
+ * @see Geometry#contains(Geometry)
+ */
+ boolean contains(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} properly contains a given geometry.
+ * <p>
+ * The <code>containsProperly</code> predicate has the following equivalent definitions:
+ * <ul>
+ * <li>Every point of the other geometry is a point of this geometry's interior.
+ * <li>The DE-9IM Intersection Matrix for the two geometries matches
+ * <code>[T**FF*FF*]</code>
+ * </ul>
+ * In other words, if the test geometry has any interaction with the boundary of the target
+ * geometry the result of <tt>containsProperly</tt> is <tt>false</tt>.
+ * This is different semantics to the {@link Geometry#contains} predicate,
+ * in which test geometries can intersect the target's boundary and still be contained.
+ * <p>
+ * The advantage of using this predicate is that it can be computed
+ * efficiently, since it avoids the need to compute the full topological relationship
+ * of the input boundaries in cases where they intersect.
+ * <p>
+ * An example use case is computing the intersections
+ * of a set of geometries with a large polygonal geometry.
+ * Since <tt>intersection</tt> is a fairly slow operation, it can be more efficient
+ * to use <tt>containsProperly</tt> to filter out test geometries which lie
+ * wholly inside the area. In these cases the intersection is
+ * known <i>a priori</i> to be exactly the original test geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry properly contains the given Geometry
+ *
+ * @see Geometry#contains
+ *
+ */
+ boolean containsProperly(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} is covered by a given geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry is covered by the given Geometry
+ *
+ * @see Geometry#coveredBy(Geometry)
+ */
+ boolean coveredBy(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} covers a given geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry covers the given Geometry
+ *
+ * @see Geometry#covers(Geometry)
+ */
+ boolean covers(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} crosses a given geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry crosses the given Geometry
+ *
+ * @see Geometry#crosses(Geometry)
+ */
+ boolean crosses(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} is disjoint from a given geometry.
+ * This method supports {@link GeometryCollection}s as input
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry is disjoint from the given Geometry
+ *
+ * @see Geometry#disjoint(Geometry)
+ */
+ boolean disjoint(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} intersects a given geometry.
+ * This method supports {@link GeometryCollection}s as input
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry intersects the given Geometry
+ *
+ * @see Geometry#intersects(Geometry)
+ */
+ boolean intersects(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} overlaps a given geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry overlaps the given Geometry
+ *
+ * @see Geometry#overlaps(Geometry)
+ */
+ boolean overlaps(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} touches a given geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry touches the given Geometry
+ *
+ * @see Geometry#touches(Geometry)
+ */
+ boolean touches(Geometry geom);
+
+ /**
+ * Tests whether the base {@link Geometry} is within a given geometry.
+ *
+ * @param geom the Geometry to test
+ * @return true if this Geometry is within the given Geometry
+ *
+ * @see Geometry#within(Geometry)
+ */
+ boolean within(Geometry geom);
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedGeometryFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedGeometryFactory.java
new file mode 100644
index 0000000..d9c9975
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedGeometryFactory.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Lineal;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.Puntal;
+
+/**
+ * A factory for creating {@link PreparedGeometry}s.
+ * It chooses an appropriate implementation of PreparedGeometry
+ * based on the geometric type of the input geometry.
+ * <p>
+ * In the future, the factory may accept hints that indicate
+ * special optimizations which can be performed.
+ *
+ *
+ * @author Martin Davis
+ *
+ */
+public class PreparedGeometryFactory
+{
+ /**
+ * Creates a new {@link PreparedGeometry} appropriate for the argument {@link Geometry}.
+ *
+ * @param geom the geometry to prepare
+ * @return the prepared geometry
+ */
+ public static PreparedGeometry prepare(Geometry geom)
+ {
+ return (new PreparedGeometryFactory()).create(geom);
+ }
+
+ public PreparedGeometryFactory() {
+ }
+
+ /**
+ * Creates a new {@link PreparedGeometry} appropriate for the argument {@link Geometry}.
+ *
+ * @param geom the geometry to prepare
+ * @return the prepared geometry
+ */
+ public PreparedGeometry create(Geometry geom)
+ {
+ if (geom instanceof Polygonal)
+ return new PreparedPolygon((Polygonal) geom);
+ if (geom instanceof Lineal)
+ return new PreparedLineString((Lineal) geom);
+ if (geom instanceof Puntal)
+ return new PreparedPoint((Puntal) geom);
+
+ /**
+ * Default representation.
+ */
+ return new BasicPreparedGeometry(geom);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedLineString.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedLineString.java
new file mode 100644
index 0000000..09ff995
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedLineString.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Lineal;
+import org.locationtech.jts.noding.FastSegmentSetIntersectionFinder;
+import org.locationtech.jts.noding.SegmentStringUtil;
+
+/**
+ * A prepared version for {@link Lineal} geometries.
+ * <p>
+ * Instances of this class are thread-safe.
+ *
+ * @author mbdavis
+ *
+ */
+public class PreparedLineString
+ extends BasicPreparedGeometry
+{
+ private FastSegmentSetIntersectionFinder segIntFinder = null;
+
+ public PreparedLineString(Lineal line) {
+ super((Geometry) line);
+ }
+
+ public synchronized FastSegmentSetIntersectionFinder getIntersectionFinder()
+ {
+ /**
+ * MD - Another option would be to use a simple scan for
+ * segment testing for small geometries.
+ * However, testing indicates that there is no particular advantage
+ * to this approach.
+ */
+ if (segIntFinder == null)
+ segIntFinder = new FastSegmentSetIntersectionFinder(SegmentStringUtil.extractSegmentStrings(getGeometry()));
+ return segIntFinder;
+ }
+
+ public boolean intersects(Geometry g)
+ {
+ if (! envelopesIntersect(g)) return false;
+ return PreparedLineStringIntersects.intersects(this, g);
+ }
+
+ /**
+ * There's not much point in trying to optimize contains, since
+ * contains for linear targets requires the entire test geometry
+ * to exactly match the target linework.
+ */
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedLineStringIntersects.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedLineStringIntersects.java
new file mode 100644
index 0000000..9a8f68b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedLineStringIntersects.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.util.ComponentCoordinateExtracter;
+import org.locationtech.jts.noding.SegmentStringUtil;
+
+
+
+/**
+ * Computes the <tt>intersects</tt> spatial relationship predicate
+ * for a target {@link PreparedLineString} relative to other {@link Geometry} classes.
+ * Uses short-circuit tests and indexing to improve performance.
+ *
+ * @author Martin Davis
+ *
+ */
+class PreparedLineStringIntersects
+{
+ /**
+ * Computes the intersects predicate between a {@link PreparedLineString}
+ * and a {@link Geometry}.
+ *
+ * @param prep the prepared linestring
+ * @param geom a test geometry
+ * @return true if the linestring intersects the geometry
+ */
+ public static boolean intersects(PreparedLineString prep, Geometry geom)
+ {
+ PreparedLineStringIntersects op = new PreparedLineStringIntersects(prep);
+ return op.intersects(geom);
+ }
+
+ protected PreparedLineString prepLine;
+
+ /**
+ * Creates an instance of this operation.
+ *
+ * @param prepPoly the target PreparedLineString
+ */
+ public PreparedLineStringIntersects(PreparedLineString prepLine)
+ {
+ this.prepLine = prepLine;
+ }
+
+ /**
+ * Tests whether this geometry intersects a given geometry.
+ *
+ * @param geom the test geometry
+ * @return true if the test geometry intersects
+ */
+ public boolean intersects(Geometry geom)
+ {
+ /**
+ * If any segments intersect, obviously intersects = true
+ */
+ List lineSegStr = SegmentStringUtil.extractSegmentStrings(geom);
+ // only request intersection finder if there are segments (ie NOT for point inputs)
+ if (lineSegStr.size() > 0) {
+ boolean segsIntersect = prepLine.getIntersectionFinder().intersects(lineSegStr);
+ // MD - performance testing
+ // boolean segsIntersect = false;
+ if (segsIntersect)
+ return true;
+ }
+ /**
+ * For L/L case we are done
+ */
+ if (geom.getDimension() == 1) return false;
+
+ /**
+ * For L/A case, need to check for proper inclusion of the target in the test
+ */
+ if (geom.getDimension() == 2
+ && prepLine.isAnyTargetComponentInTest(geom)) return true;
+
+ /**
+ * For L/P case, need to check if any points lie on line(s)
+ */
+ if (geom.getDimension() == 0)
+ return isAnyTestPointInTarget(geom);
+
+ return false;
+ }
+
+ /**
+ * Tests whether any representative point of the test Geometry intersects
+ * the target geometry.
+ * Only handles test geometries which are Puntal (dimension 0)
+ *
+ * @param geom a Puntal geometry to test
+ * @return true if any point of the argument intersects the prepared geometry
+ */
+ protected boolean isAnyTestPointInTarget(Geometry testGeom)
+ {
+ /**
+ * This could be optimized by using the segment index on the lineal target.
+ * However, it seems like the L/P case would be pretty rare in practice.
+ */
+ PointLocator locator = new PointLocator();
+ List coords = ComponentCoordinateExtracter.getCoordinates(testGeom);
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate p = (Coordinate) i.next();
+ if (locator.intersects(p, prepLine.getGeometry()))
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPoint.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPoint.java
new file mode 100644
index 0000000..1a49630
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPoint.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Puntal;
+
+
+/**
+ * A prepared version for {@link Puntal} geometries.
+ * <p>
+ * Instances of this class are thread-safe.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PreparedPoint
+ extends BasicPreparedGeometry
+{
+ public PreparedPoint(Puntal point) {
+ super((Geometry) point);
+ }
+
+ /**
+ * Tests whether this point intersects a {@link Geometry}.
+ * <p>
+ * The optimization here is that computing topology for the test geometry
+ * is avoided. This can be significant for large geometries.
+ */
+ public boolean intersects(Geometry g)
+ {
+ if (! envelopesIntersect(g)) return false;
+
+ /**
+ * This avoids computing topology for the test geometry
+ */
+ return isAnyTargetComponentInTest(g);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygon.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygon.java
new file mode 100644
index 0000000..59d9982
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygon.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+
+import org.locationtech.jts.algorithm.locate.IndexedPointInAreaLocator;
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.noding.FastSegmentSetIntersectionFinder;
+import org.locationtech.jts.noding.SegmentStringUtil;
+import org.locationtech.jts.operation.predicate.RectangleContains;
+import org.locationtech.jts.operation.predicate.RectangleIntersects;
+
+/**
+ * A prepared version for {@link Polygonal} geometries.
+ * This class supports both {@link Polygon}s and {@link MultiPolygon}s.
+ * <p>
+ * This class does <b>not</b> support MultiPolygons which are non-valid
+ * (e.g. with overlapping elements).
+ * <p>
+ * Instances of this class are thread-safe and immutable.
+ *
+ * @author mbdavis
+ *
+ */
+public class PreparedPolygon
+ extends BasicPreparedGeometry
+{
+ private final boolean isRectangle;
+ // create these lazily, since they are expensive
+ private FastSegmentSetIntersectionFinder segIntFinder = null;
+ private PointOnGeometryLocator pia = null;
+
+ public PreparedPolygon(Polygonal poly) {
+ super((Geometry) poly);
+ isRectangle = getGeometry().isRectangle();
+ }
+
+ /**
+ * Gets the indexed intersection finder for this geometry.
+ *
+ * @return the intersection finder
+ */
+ public synchronized FastSegmentSetIntersectionFinder getIntersectionFinder()
+ {
+ /**
+ * MD - Another option would be to use a simple scan for
+ * segment testing for small geometries.
+ * However, testing indicates that there is no particular advantage
+ * to this approach.
+ */
+ if (segIntFinder == null)
+ segIntFinder = new FastSegmentSetIntersectionFinder(SegmentStringUtil.extractSegmentStrings(getGeometry()));
+ return segIntFinder;
+ }
+
+ public synchronized PointOnGeometryLocator getPointLocator()
+ {
+ if (pia == null)
+ pia = new IndexedPointInAreaLocator(getGeometry());
+
+ return pia;
+ }
+
+ public boolean intersects(Geometry g)
+ {
+ // envelope test
+ if (! envelopesIntersect(g)) return false;
+
+ // optimization for rectangles
+ if (isRectangle) {
+ return RectangleIntersects.intersects((Polygon) getGeometry(), g);
+ }
+
+ return PreparedPolygonIntersects.intersects(this, g);
+ }
+
+ public boolean contains(Geometry g)
+ {
+ // short-circuit test
+ if (! envelopeCovers(g))
+ return false;
+
+ // optimization for rectangles
+ if (isRectangle) {
+ return RectangleContains.contains((Polygon) getGeometry(), g);
+ }
+
+ return PreparedPolygonContains.contains(this, g);
+ }
+
+ public boolean containsProperly(Geometry g)
+ {
+ // short-circuit test
+ if (! envelopeCovers(g))
+ return false;
+ return PreparedPolygonContainsProperly.containsProperly(this, g);
+ }
+
+ public boolean covers(Geometry g)
+ {
+ // short-circuit test
+ if (! envelopeCovers(g))
+ return false;
+ // optimization for rectangle arguments
+ if (isRectangle) {
+ return true;
+ }
+ return PreparedPolygonCovers.covers(this, g);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContains.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContains.java
new file mode 100644
index 0000000..9c04c27
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContains.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Computes the <tt>contains</tt> spatial relationship predicate
+ * for a {@link PreparedPolygon} relative to all other {@link Geometry} classes.
+ * Uses short-circuit tests and indexing to improve performance.
+ * <p>
+ * It is not possible to short-circuit in all cases, in particular
+ * in the case where the test geometry touches the polygon linework.
+ * In this case full topology must be computed.
+ *
+ * @author Martin Davis
+ *
+ */
+class PreparedPolygonContains
+ extends AbstractPreparedPolygonContains
+{
+ /**
+ * Computes the </tt>contains</tt> predicate between a {@link PreparedPolygon}
+ * and a {@link Geometry}.
+ *
+ * @param prep the prepared polygon
+ * @param geom a test geometry
+ * @return true if the polygon contains the geometry
+ */
+ public static boolean contains(PreparedPolygon prep, Geometry geom)
+ {
+ PreparedPolygonContains polyInt = new PreparedPolygonContains(prep);
+ return polyInt.contains(geom);
+ }
+
+ /**
+ * Creates an instance of this operation.
+ *
+ * @param prepPoly the PreparedPolygon to evaluate
+ */
+ public PreparedPolygonContains(PreparedPolygon prepPoly)
+ {
+ super(prepPoly);
+ }
+
+ /**
+ * Tests whether this PreparedPolygon <tt>contains</tt> a given geometry.
+ *
+ * @param geom the test geometry
+ * @return true if the test geometry is contained
+ */
+ public boolean contains(Geometry geom)
+ {
+ return eval(geom);
+ }
+
+ /**
+ * Computes the full topological <tt>contains</tt> predicate.
+ * Used when short-circuit tests are not conclusive.
+ *
+ * @param geom the test geometry
+ * @return true if this prepared polygon contains the test geometry
+ */
+ protected boolean fullTopologicalPredicate(Geometry geom)
+ {
+ boolean isContained = prepPoly.getGeometry().contains(geom);
+ return isContained;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContainsProperly.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContainsProperly.java
new file mode 100644
index 0000000..d899d79
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContainsProperly.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.noding.SegmentStringUtil;
+
+
+
+/**
+ * Computes the <tt>containsProperly</tt> spatial relationship predicate
+ * for {@link PreparedPolygon}s relative to all other {@link Geometry} classes.
+ * Uses short-circuit tests and indexing to improve performance.
+ * <p>
+ * A Geometry A <tt>containsProperly</tt> another Geometry B iff
+ * all points of B are contained in the Interior of A.
+ * Equivalently, B is contained in A AND B does not intersect
+ * the Boundary of A.
+ * <p>
+ * The advantage to using this predicate is that it can be computed
+ * efficiently, with no need to compute topology at individual points.
+ * In a situation with many geometries intersecting the boundary
+ * of the target geometry, this can make a performance difference.
+ *
+ * @author Martin Davis
+ */
+class PreparedPolygonContainsProperly
+ extends PreparedPolygonPredicate
+{
+ /**
+ * Computes the </tt>containsProperly</tt> predicate between a {@link PreparedPolygon}
+ * and a {@link Geometry}.
+ *
+ * @param prep the prepared polygon
+ * @param geom a test geometry
+ * @return true if the polygon properly contains the geometry
+ */
+ public static boolean containsProperly(PreparedPolygon prep, Geometry geom)
+ {
+ PreparedPolygonContainsProperly polyInt = new PreparedPolygonContainsProperly(prep);
+ return polyInt.containsProperly(geom);
+ }
+
+ /**
+ * Creates an instance of this operation.
+ *
+ * @param prepPoly the PreparedPolygon to evaluate
+ */
+ public PreparedPolygonContainsProperly(PreparedPolygon prepPoly)
+ {
+ super(prepPoly);
+ }
+
+ /**
+ * Tests whether this PreparedPolygon containsProperly a given geometry.
+ *
+ * @param geom the test geometry
+ * @return true if the test geometry is contained properly
+ */
+ public boolean containsProperly(Geometry geom)
+ {
+ /**
+ * Do point-in-poly tests first, since they are cheaper and may result
+ * in a quick negative result.
+ *
+ * If a point of any test components does not lie in the target interior, result is false
+ */
+ boolean isAllInPrepGeomAreaInterior = isAllTestComponentsInTargetInterior(geom);
+ if (! isAllInPrepGeomAreaInterior) return false;
+
+ /**
+ * If any segments intersect, result is false.
+ */
+ List lineSegStr = SegmentStringUtil.extractSegmentStrings(geom);
+ boolean segsIntersect = prepPoly.getIntersectionFinder().intersects(lineSegStr);
+ if (segsIntersect)
+ return false;
+
+ /**
+ * Given that no segments intersect, if any vertex of the target
+ * is contained in some test component.
+ * the test is NOT properly contained.
+ */
+ if (geom instanceof Polygonal) {
+ // TODO: generalize this to handle GeometryCollections
+ boolean isTargetGeomInTestArea = isAnyTargetComponentInAreaTest(geom, prepPoly.getRepresentativePoints());
+ if (isTargetGeomInTestArea) return false;
+ }
+
+ return true;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonCovers.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonCovers.java
new file mode 100644
index 0000000..ebf60d1
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonCovers.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Computes the <tt>covers</tt> spatial relationship predicate
+ * for a {@link PreparedPolygon} relative to all other {@link Geometry} classes.
+ * Uses short-circuit tests and indexing to improve performance.
+ * <p>
+ * It is not possible to short-circuit in all cases, in particular
+ * in the case where the test geometry touches the polygon linework.
+ * In this case full topology must be computed.
+ *
+ * @author Martin Davis
+ *
+ */
+class PreparedPolygonCovers
+ extends AbstractPreparedPolygonContains
+{
+ /**
+ * Computes the </tt>covers</tt> predicate between a {@link PreparedPolygon}
+ * and a {@link Geometry}.
+ *
+ * @param prep the prepared polygon
+ * @param geom a test geometry
+ * @return true if the polygon covers the geometry
+ */
+ public static boolean covers(PreparedPolygon prep, Geometry geom)
+ {
+ PreparedPolygonCovers polyInt = new PreparedPolygonCovers(prep);
+ return polyInt.covers(geom);
+ }
+
+ /**
+ * Creates an instance of this operation.
+ *
+ * @param prepPoly the PreparedPolygon to evaluate
+ */
+ public PreparedPolygonCovers(PreparedPolygon prepPoly)
+ {
+ super(prepPoly);
+ requireSomePointInInterior = false;
+ }
+
+ /**
+ * Tests whether this PreparedPolygon <tt>covers</tt> a given geometry.
+ *
+ * @param geom the test geometry
+ * @return true if the test geometry is covered
+ */
+ public boolean covers(Geometry geom)
+ {
+ return eval(geom);
+ }
+
+ /**
+ * Computes the full topological <tt>covers</tt> predicate.
+ * Used when short-circuit tests are not conclusive.
+ *
+ * @param geom the test geometry
+ * @return true if this prepared polygon covers the test geometry
+ */
+ protected boolean fullTopologicalPredicate(Geometry geom)
+ {
+ boolean result = prepPoly.getGeometry().covers(geom);
+ return result;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonIntersects.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonIntersects.java
new file mode 100644
index 0000000..134730e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonIntersects.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.noding.SegmentStringUtil;
+
+
+/**
+ * Computes the <tt>intersects</tt> spatial relationship predicate for
+ * {@link PreparedPolygon}s relative to all other {@link Geometry} classes. Uses
+ * short-circuit tests and indexing to improve performance.
+ *
+ * @author Martin Davis
+ *
+ */
+class PreparedPolygonIntersects extends PreparedPolygonPredicate {
+ /**
+ * Computes the intersects predicate between a {@link PreparedPolygon} and a
+ * {@link Geometry}.
+ *
+ * @param prep
+ * the prepared polygon
+ * @param geom
+ * a test geometry
+ * @return true if the polygon intersects the geometry
+ */
+ public static boolean intersects(PreparedPolygon prep, Geometry geom) {
+ PreparedPolygonIntersects polyInt = new PreparedPolygonIntersects(prep);
+ return polyInt.intersects(geom);
+ }
+
+ /**
+ * Creates an instance of this operation.
+ *
+ * @param prepPoly
+ * the PreparedPolygon to evaluate
+ */
+ public PreparedPolygonIntersects(PreparedPolygon prepPoly) {
+ super(prepPoly);
+ }
+
+ /**
+ * Tests whether this PreparedPolygon intersects a given geometry.
+ *
+ * @param geom
+ * the test geometry
+ * @return true if the test geometry intersects
+ */
+ public boolean intersects(Geometry geom) {
+ /**
+ * Do point-in-poly tests first, since they are cheaper and may result in a
+ * quick positive result.
+ *
+ * If a point of any test components lie in target, result is true
+ */
+ boolean isInPrepGeomArea = isAnyTestComponentInTarget(geom);
+ if (isInPrepGeomArea)
+ return true;
+ /**
+ * If input contains only points, then at
+ * this point it is known that none of them are contained in the target
+ */
+ if (geom.getDimension() == 0)
+ return false;
+ /**
+ * If any segments intersect, result is true
+ */
+ List lineSegStr = SegmentStringUtil.extractSegmentStrings(geom);
+ // only request intersection finder if there are segments
+ // (i.e. NOT for point inputs)
+ if (lineSegStr.size() > 0) {
+ boolean segsIntersect = prepPoly.getIntersectionFinder().intersects(
+ lineSegStr);
+ if (segsIntersect)
+ return true;
+ }
+
+ /**
+ * If the test has dimension = 2 as well, it is necessary to test for proper
+ * inclusion of the target. Since no segments intersect, it is sufficient to
+ * test representative points.
+ */
+ if (geom.getDimension() == 2) {
+ // TODO: generalize this to handle GeometryCollections
+ boolean isPrepGeomInArea = isAnyTargetComponentInAreaTest(geom,
+ prepPoly.getRepresentativePoints());
+ if (isPrepGeomInArea)
+ return true;
+ }
+
+ return false;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicate.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicate.java
new file mode 100644
index 0000000..5f5fbb0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicate.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.prep;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.algorithm.locate.SimplePointInAreaLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.util.ComponentCoordinateExtracter;
+
+
+/**
+ * A base class for predicate operations on {@link PreparedPolygon}s.
+ *
+ * @author mbdavis
+ *
+ */
+abstract class PreparedPolygonPredicate
+{
+ protected PreparedPolygon prepPoly;
+ private PointOnGeometryLocator targetPointLocator;
+
+ /**
+ * Creates an instance of this operation.
+ *
+ * @param prepPoly the PreparedPolygon to evaluate
+ */
+ public PreparedPolygonPredicate(PreparedPolygon prepPoly)
+ {
+ this.prepPoly = prepPoly;
+ targetPointLocator = prepPoly.getPointLocator();
+ }
+
+ /**
+ * Tests whether all components of the test Geometry
+ * are contained in the target geometry.
+ * Handles both linear and point components.
+ *
+ * @param geom a geometry to test
+ * @return true if all components of the argument are contained in the target geometry
+ */
+ protected boolean isAllTestComponentsInTarget(Geometry testGeom)
+ {
+ List coords = ComponentCoordinateExtracter.getCoordinates(testGeom);
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate p = (Coordinate) i.next();
+ int loc = targetPointLocator.locate(p);
+ if (loc == Location.EXTERIOR)
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Tests whether all components of the test Geometry
+ * are contained in the interior of the target geometry.
+ * Handles both linear and point components.
+ *
+ * @param geom a geometry to test
+ * @return true if all components of the argument are contained in the target geometry interior
+ */
+ protected boolean isAllTestComponentsInTargetInterior(Geometry testGeom)
+ {
+ List coords = ComponentCoordinateExtracter.getCoordinates(testGeom);
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate p = (Coordinate) i.next();
+ int loc = targetPointLocator.locate(p);
+ if (loc != Location.INTERIOR)
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Tests whether any component of the test Geometry intersects
+ * the area of the target geometry.
+ * Handles test geometries with both linear and point components.
+ *
+ * @param geom a geometry to test
+ * @return true if any component of the argument intersects the prepared area geometry
+ */
+ protected boolean isAnyTestComponentInTarget(Geometry testGeom)
+ {
+ List coords = ComponentCoordinateExtracter.getCoordinates(testGeom);
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate p = (Coordinate) i.next();
+ int loc = targetPointLocator.locate(p);
+ if (loc != Location.EXTERIOR)
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether any component of the test Geometry intersects
+ * the interior of the target geometry.
+ * Handles test geometries with both linear and point components.
+ *
+ * @param geom a geometry to test
+ * @return true if any component of the argument intersects the prepared area geometry interior
+ */
+ protected boolean isAnyTestComponentInTargetInterior(Geometry testGeom)
+ {
+ List coords = ComponentCoordinateExtracter.getCoordinates(testGeom);
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate p = (Coordinate) i.next();
+ int loc = targetPointLocator.locate(p);
+ if (loc == Location.INTERIOR)
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * Tests whether any component of the target geometry
+ * intersects the test geometry (which must be an areal geometry)
+ *
+ * @param geom the test geometry
+ * @param repPts the representative points of the target geometry
+ * @return true if any component intersects the areal test geometry
+ */
+ protected boolean isAnyTargetComponentInAreaTest(Geometry testGeom, List targetRepPts)
+ {
+ PointOnGeometryLocator piaLoc = new SimplePointInAreaLocator(testGeom);
+ for (Iterator i = targetRepPts.iterator(); i.hasNext(); ) {
+ Coordinate p = (Coordinate) i.next();
+ int loc = piaLoc.locate(p);
+ if (loc != Location.EXTERIOR)
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/package.html b/modules/core/src/main/java/org/locationtech/jts/geom/prep/package.html
new file mode 100644
index 0000000..ba5ef77
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to perform optimized geometric operations on suitably prepared geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformation.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformation.java
new file mode 100644
index 0000000..7e7f281
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformation.java
@@ -0,0 +1,1097 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.util.Assert;
+/**
+ * Represents an affine transformation on the 2D Cartesian plane.
+ * It can be used to transform a {@link Coordinate} or {@link Geometry}.
+ * An affine transformation is a mapping of the 2D plane into itself
+ * via a series of transformations of the following basic types:
+ * <ul>
+ * <li>reflection (through a line)
+ * <li>rotation (around the origin)
+ * <li>scaling (relative to the origin)
+ * <li>shearing (in both the X and Y directions)
+ * <li>translation
+ * </ul>
+ * In general, affine transformations preserve straightness and parallel lines,
+ * but do not preserve distance or shape.
+ * <p>
+ * An affine transformation can be represented by a 3x3
+ * matrix in the following form:
+ * <blockquote><pre>
+ * T = | m00 m01 m02 |
+ * | m10 m11 m12 |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ * A coordinate P = (x, y) can be transformed to a new coordinate P' = (x', y')
+ * by representing it as a 3x1 matrix and using matrix multiplication to compute:
+ * <blockquote><pre>
+ * | x' | = T x | x |
+ * | y' | | y |
+ * | 1 | | 1 |
+ * </pre></blockquote>
+ * <h3>Transformation Composition</h3>
+ * Affine transformations can be composed using the {@link #compose} method.
+ * Composition is computed via multiplication of the
+ * transformation matrices, and is defined as:
+ * <blockquote><pre>
+ * A.compose(B) = T<sub>B</sub> x T<sub>A</sub>
+ * </pre></blockquote>
+ * This produces a transformation whose effect is that of A followed by B.
+ * The methods {@link #reflect}, {@link #rotate},
+ * {@link #scale}, {@link #shear}, and {@link #translate}
+ * have the effect of composing a transformation of that type with
+ * the transformation they are invoked on.
+ * <p>
+ * The composition of transformations is in general <i>not</i> commutative.
+ *
+ * <h3>Transformation Inversion</h3>
+ * Affine transformations may be invertible or non-invertible.
+ * If a transformation is invertible, then there exists
+ * an inverse transformation which when composed produces
+ * the identity transformation.
+ * The {@link #getInverse} method
+ * computes the inverse of a transformation, if one exists.
+ *
+ * @author Martin Davis
+ *
+ */
+public class AffineTransformation
+ implements Cloneable, CoordinateSequenceFilter
+{
+
+ /**
+ * Creates a transformation for a reflection about the
+ * line (x0,y0) - (x1,y1).
+ *
+ * @param x0 the x-ordinate of a point on the reflection line
+ * @param y0 the y-ordinate of a point on the reflection line
+ * @param x1 the x-ordinate of a another point on the reflection line
+ * @param y1 the y-ordinate of a another point on the reflection line
+ * @return a transformation for the reflection
+ */
+ public static AffineTransformation reflectionInstance(double x0, double y0, double x1, double y1)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.setToReflection(x0, y0, x1, y1);
+ return trans;
+ }
+
+ /**
+ * Creates a transformation for a reflection about the
+ * line (0,0) - (x,y).
+ *
+ * @param x the x-ordinate of a point on the reflection line
+ * @param y the y-ordinate of a point on the reflection line
+ * @return a transformation for the reflection
+ */
+ public static AffineTransformation reflectionInstance(double x, double y)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.setToReflection(x, y);
+ return trans;
+ }
+
+ /**
+ * Creates a transformation for a rotation
+ * about the origin
+ * by an angle <i>theta</i>.
+ * Positive angles correspond to a rotation
+ * in the counter-clockwise direction.
+ *
+ * @param theta the rotation angle, in radians
+ * @return a transformation for the rotation
+ */
+ public static AffineTransformation rotationInstance(double theta)
+ {
+ return rotationInstance(Math.sin(theta), Math.cos(theta));
+ }
+
+ /**
+ * Creates a transformation for a rotation
+ * by an angle <i>theta</i>,
+ * specified by the sine and cosine of the angle.
+ * This allows providing exact values for sin(theta) and cos(theta)
+ * for the common case of rotations of multiples of quarter-circles.
+ *
+ * @param sinTheta the sine of the rotation angle
+ * @param cosTheta the cosine of the rotation angle
+ * @return a transformation for the rotation
+ */
+ public static AffineTransformation rotationInstance(double sinTheta, double cosTheta)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.setToRotation(sinTheta, cosTheta);
+ return trans;
+ }
+
+ /**
+ * Creates a transformation for a rotation
+ * about the point (x,y) by an angle <i>theta</i>.
+ * Positive angles correspond to a rotation
+ * in the counter-clockwise direction.
+ *
+ * @param theta the rotation angle, in radians
+ * @param x the x-ordinate of the rotation point
+ * @param y the y-ordinate of the rotation point
+ * @return a transformation for the rotation
+ */
+ public static AffineTransformation rotationInstance(double theta, double x, double y)
+ {
+ return rotationInstance(Math.sin(theta), Math.cos(theta), x, y);
+ }
+
+ /**
+ * Creates a transformation for a rotation
+ * about the point (x,y) by an angle <i>theta</i>,
+ * specified by the sine and cosine of the angle.
+ * This allows providing exact values for sin(theta) and cos(theta)
+ * for the common case of rotations of multiples of quarter-circles.
+ *
+ * @param sinTheta the sine of the rotation angle
+ * @param cosTheta the cosine of the rotation angle
+ * @param x the x-ordinate of the rotation point
+ * @param y the y-ordinate of the rotation point
+ * @return a transformation for the rotation
+ */
+ public static AffineTransformation rotationInstance(double sinTheta, double cosTheta, double x, double y)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.setToRotation(sinTheta, cosTheta, x, y);
+ return trans;
+ }
+
+ /**
+ * Creates a transformation for a scaling relative to the origin.
+ *
+ * @param xScale the value to scale by in the x direction
+ * @param yScale the value to scale by in the y direction
+ * @return a transformation for the scaling
+ */
+ public static AffineTransformation scaleInstance(double xScale, double yScale)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.setToScale(xScale, yScale);
+ return trans;
+ }
+
+ /**
+ * Creates a transformation for a scaling relative to the point (x,y).
+ *
+ * @param xScale the value to scale by in the x direction
+ * @param yScale the value to scale by in the y direction
+ * @param x the x-ordinate of the point to scale around
+ * @param y the y-ordinate of the point to scale around
+ * @return a transformation for the scaling
+ */
+ public static AffineTransformation scaleInstance(double xScale, double yScale, double x, double y)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.translate(-x, -y);
+ trans.scale(xScale, yScale);
+ trans.translate(x, y);
+ return trans;
+ }
+
+
+ /**
+ * Creates a transformation for a shear.
+ *
+ * @param xShear the value to shear by in the x direction
+ * @param yShear the value to shear by in the y direction
+ * @return a transformation for the shear
+ */
+ public static AffineTransformation shearInstance(double xShear, double yShear)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.setToShear(xShear, yShear);
+ return trans;
+ }
+
+ /**
+ * Creates a transformation for a translation.
+ *
+ * @param x the value to translate by in the x direction
+ * @param y the value to translate by in the y direction
+ * @return a transformation for the translation
+ */
+ public static AffineTransformation translationInstance(double x, double y)
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.setToTranslation(x, y);
+ return trans;
+ }
+
+ // affine matrix entries
+ // (bottom row is always [ 0 0 1 ])
+ private double m00;
+ private double m01;
+ private double m02;
+ private double m10;
+ private double m11;
+ private double m12;
+
+ /**
+ * Constructs a new identity transformation
+ */
+ public AffineTransformation()
+ {
+ setToIdentity();
+ }
+
+ /**
+ * Constructs a new transformation whose
+ * matrix has the specified values.
+ *
+ * @param matrix an array containing the 6 values { m00, m01, m02, m10, m11, m12 }
+ * @throws NullPointerException if matrix is null
+ * @throws ArrayIndexOutOfBoundsException if matrix is too small
+ */
+ public AffineTransformation(double[] matrix)
+ {
+ m00 = matrix[0];
+ m01 = matrix[1];
+ m02 = matrix[2];
+ m10 = matrix[3];
+ m11 = matrix[4];
+ m12 = matrix[5];
+ }
+
+ /**
+ * Constructs a new transformation whose
+ * matrix has the specified values.
+ *
+ * @param m00 the entry for the [0, 0] element in the transformation matrix
+ * @param m01 the entry for the [0, 1] element in the transformation matrix
+ * @param m02 the entry for the [0, 2] element in the transformation matrix
+ * @param m10 the entry for the [1, 0] element in the transformation matrix
+ * @param m11 the entry for the [1, 1] element in the transformation matrix
+ * @param m12 the entry for the [1, 2] element in the transformation matrix
+ */
+ public AffineTransformation(double m00,
+ double m01,
+ double m02,
+ double m10,
+ double m11,
+ double m12)
+ {
+ setTransformation(m00, m01, m02, m10, m11, m12);
+ }
+
+ /**
+ * Constructs a transformation which is
+ * a copy of the given one.
+ *
+ * @param trans the transformation to copy
+ */
+ public AffineTransformation(AffineTransformation trans)
+ {
+ setTransformation(trans);
+ }
+
+ /**
+ * Constructs a transformation
+ * which maps the given source
+ * points into the given destination points.
+ *
+ * @param src0 source point 0
+ * @param src1 source point 1
+ * @param src2 source point 2
+ * @param dest0 the mapped point for source point 0
+ * @param dest1 the mapped point for source point 1
+ * @param dest2 the mapped point for source point 2
+ *
+ */
+ public AffineTransformation(Coordinate src0,
+ Coordinate src1,
+ Coordinate src2,
+ Coordinate dest0,
+ Coordinate dest1,
+ Coordinate dest2)
+ {
+ }
+
+ /**
+ * Sets this transformation to be the identity transformation.
+ * The identity transformation has the matrix:
+ * <blockquote><pre>
+ * | 1 0 0 |
+ * | 0 1 0 |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToIdentity()
+ {
+ m00 = 1.0; m01 = 0.0; m02 = 0.0;
+ m10 = 0.0; m11 = 1.0; m12 = 0.0;
+ return this;
+ }
+
+ /**
+ * Sets this transformation's matrix to have the given values.
+ *
+ * @param m00 the entry for the [0, 0] element in the transformation matrix
+ * @param m01 the entry for the [0, 1] element in the transformation matrix
+ * @param m02 the entry for the [0, 2] element in the transformation matrix
+ * @param m10 the entry for the [1, 0] element in the transformation matrix
+ * @param m11 the entry for the [1, 1] element in the transformation matrix
+ * @param m12 the entry for the [1, 2] element in the transformation matrix
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setTransformation(double m00,
+ double m01,
+ double m02,
+ double m10,
+ double m11,
+ double m12)
+ {
+ this.m00 = m00;
+ this.m01 = m01;
+ this.m02 = m02;
+ this.m10 = m10;
+ this.m11 = m11;
+ this.m12 = m12;
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a copy of the given one
+ *
+ * @param trans a transformation to copy
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setTransformation(AffineTransformation trans)
+ {
+ m00 = trans.m00; m01 = trans.m01; m02 = trans.m02;
+ m10 = trans.m10; m11 = trans.m11; m12 = trans.m12;
+ return this;
+ }
+
+ /**
+ * Gets an array containing the entries
+ * of the transformation matrix.
+ * Only the 6 non-trivial entries are returned,
+ * in the sequence:
+ * <pre>
+ * m00, m01, m02, m10, m11, m12
+ * </pre>
+ *
+ * @return an array of length 6
+ */
+ public double[] getMatrixEntries()
+ {
+ return new double[] { m00, m01, m02, m10, m11, m12 };
+ }
+
+ /**
+ * Computes the determinant of the transformation matrix.
+ * The determinant is computed as:
+ * <blockquote><pre>
+ * | m00 m01 m02 |
+ * | m10 m11 m12 | = m00 * m11 - m01 * m10
+ * | 0 0 1 |
+ * </pre></blockquote>
+ * If the determinant is zero,
+ * the transform is singular (not invertible),
+ * and operations which attempt to compute
+ * an inverse will throw a <tt>NoninvertibleTransformException</tt>.
+
+ * @return the determinant of the transformation
+ * @see #getInverse()
+ */
+ public double getDeterminant()
+ {
+ return m00 * m11 - m01 * m10;
+ }
+
+ /**
+ * Computes the inverse of this transformation, if one
+ * exists.
+ * The inverse is the transformation which when
+ * composed with this one produces the identity
+ * transformation.
+ * A transformation has an inverse if and only if it
+ * is not singular (i.e. its
+ * determinant is non-zero).
+ * Geometrically, an transformation is non-invertible
+ * if it maps the plane to a line or a point.
+ * If no inverse exists this method
+ * will throw a <tt>NoninvertibleTransformationException</tt>.
+ * <p>
+ * The matrix of the inverse is equal to the
+ * inverse of the matrix for the transformation.
+ * It is computed as follows:
+ * <blockquote><pre>
+ * 1
+ * inverse(A) = --- x adjoint(A)
+ * det
+ *
+ *
+ * = 1 | m11 -m01 m01*m12-m02*m11 |
+ * --- x | -m10 m00 -m00*m12+m10*m02 |
+ * det | 0 0 m00*m11-m10*m01 |
+ *
+ *
+ *
+ * = | m11/det -m01/det m01*m12-m02*m11/det |
+ * | -m10/det m00/det -m00*m12+m10*m02/det |
+ * | 0 0 1 |
+ *
+ * </pre></blockquote>
+ *
+ * @return a new inverse transformation
+ * @throws NoninvertibleTransformationException
+ * @see #getDeterminant()
+ */
+ public AffineTransformation getInverse()
+ throws NoninvertibleTransformationException
+ {
+ double det = getDeterminant();
+ if (det == 0)
+ throw new NoninvertibleTransformationException("Transformation is non-invertible");
+
+ double im00 = m11 / det;
+ double im10 = -m10 / det;
+ double im01 = -m01 / det;
+ double im11 = m00 / det;
+ double im02 = (m01 * m12 - m02 * m11) / det;
+ double im12 = (-m00 * m12 + m10 * m02) / det;
+
+ return new AffineTransformation(im00, im01, im02, im10, im11, im12);
+ }
+
+ /**
+ * Explicitly computes the math for a reflection. May not work.
+ * @param x0 the X ordinate of one point on the reflection line
+ * @param y0 the Y ordinate of one point on the reflection line
+ * @param x1 the X ordinate of another point on the reflection line
+ * @param y1 the Y ordinate of another point on the reflection line
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToReflectionBasic(double x0, double y0, double x1, double y1)
+ {
+ if (x0 == x1 && y0 == y1) {
+ throw new IllegalArgumentException("Reflection line points must be distinct");
+ }
+ double dx = x1 - x0;
+ double dy = y1 - y0;
+ double d = Math.sqrt(dx * dx + dy * dy);
+ double sin = dy / d;
+ double cos = dx / d;
+ double cs2 = 2 * sin * cos;
+ double c2s2 = cos * cos - sin * sin;
+ m00 = c2s2; m01 = cs2; m02 = 0.0;
+ m10 = cs2; m11 = -c2s2; m12 = 0.0;
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a reflection
+ * about the line defined by a line <tt>(x0,y0) - (x1,y1)</tt>.
+ *
+ * @param x0 the X ordinate of one point on the reflection line
+ * @param y0 the Y ordinate of one point on the reflection line
+ * @param x1 the X ordinate of another point on the reflection line
+ * @param y1 the Y ordinate of another point on the reflection line
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToReflection(double x0, double y0, double x1, double y1)
+ {
+ if (x0 == x1 && y0 == y1) {
+ throw new IllegalArgumentException("Reflection line points must be distinct");
+ }
+ // translate line vector to origin
+ setToTranslation(-x0, -y0);
+
+ // rotate vector to positive x axis direction
+ double dx = x1 - x0;
+ double dy = y1 - y0;
+ double d = Math.sqrt(dx * dx + dy * dy);
+ double sin = dy / d;
+ double cos = dx / d;
+ rotate(-sin, cos);
+ // reflect about the x axis
+ scale(1, -1);
+ // rotate back
+ rotate(sin, cos);
+ // translate back
+ translate(x0, y0);
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a reflection
+ * about the line defined by vector (x,y).
+ * The transformation for a reflection
+ * is computed by:
+ * <blockquote><pre>
+ * d = sqrt(x<sup>2</sup> + y<sup>2</sup>)
+ * sin = y / d;
+ * cos = x / d;
+ *
+ * T<sub>ref</sub> = T<sub>rot(sin, cos)</sub> x T<sub>scale(1, -1)</sub> x T<sub>rot(-sin, cos)</sub>
+ * </pre></blockquote>
+ *
+ * @param x the x-component of the reflection line vector
+ * @param y the y-component of the reflection line vector
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToReflection(double x, double y)
+ {
+ if (x == 0.0 && y == 0.0) {
+ throw new IllegalArgumentException("Reflection vector must be non-zero");
+ }
+
+ /**
+ * Handle special case - x = y.
+ * This case is specified explicitly to avoid roundoff error.
+ */
+ if (x == y) {
+ m00 = 0.0;
+ m01 = 1.0;
+ m02 = 0.0;
+ m10 = 1.0;
+ m11 = 0.0;
+ m12 = 0.0;
+ return this;
+ }
+
+ // rotate vector to positive x axis direction
+ double d = Math.sqrt(x * x + y * y);
+ double sin = y / d;
+ double cos = x / d;
+ rotate(-sin, cos);
+ // reflect about the x-axis
+ scale(1, -1);
+ // rotate back
+ rotate(sin, cos);
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a rotation around the origin.
+ * A positive rotation angle corresponds
+ * to a counter-clockwise rotation.
+ * The transformation matrix for a rotation
+ * by an angle <tt>theta</tt>
+ * has the value:
+ * <blockquote><pre>
+ * | cos(theta) -sin(theta) 0 |
+ * | sin(theta) cos(theta) 0 |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ *
+ * @param theta the rotation angle, in radians
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToRotation(double theta)
+ {
+ setToRotation(Math.sin(theta), Math.cos(theta));
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a rotation around the origin
+ * by specifying the sin and cos of the rotation angle directly.
+ * The transformation matrix for the rotation
+ * has the value:
+ * <blockquote><pre>
+ * | cosTheta -sinTheta 0 |
+ * | sinTheta cosTheta 0 |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ *
+ * @param sinTheta the sine of the rotation angle
+ * @param cosTheta the cosine of the rotation angle
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToRotation(double sinTheta, double cosTheta)
+ {
+ m00 = cosTheta; m01 = -sinTheta; m02 = 0.0;
+ m10 = sinTheta; m11 = cosTheta; m12 = 0.0;
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a rotation
+ * around a given point (x,y).
+ * A positive rotation angle corresponds
+ * to a counter-clockwise rotation.
+ * The transformation matrix for a rotation
+ * by an angle <tt>theta</tt>
+ * has the value:
+ * <blockquote><pre>
+ * | cosTheta -sinTheta x-x*cos+y*sin |
+ * | sinTheta cosTheta y-x*sin-y*cos |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ *
+ * @param theta the rotation angle, in radians
+ * @param x the x-ordinate of the rotation point
+ * @param y the y-ordinate of the rotation point
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToRotation(double theta, double x, double y)
+ {
+ setToRotation(Math.sin(theta), Math.cos(theta), x, y);
+ return this;
+ }
+
+
+ /**
+ * Sets this transformation to be a rotation
+ * around a given point (x,y)
+ * by specifying the sin and cos of the rotation angle directly.
+ * The transformation matrix for the rotation
+ * has the value:
+ * <blockquote><pre>
+ * | cosTheta -sinTheta x-x*cos+y*sin |
+ * | sinTheta cosTheta y-x*sin-y*cos |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ *
+ * @param sinTheta the sine of the rotation angle
+ * @param cosTheta the cosine of the rotation angle
+ * @param x the x-ordinate of the rotation point
+ * @param y the y-ordinate of the rotation point
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToRotation(double sinTheta, double cosTheta, double x, double y)
+ {
+ m00 = cosTheta; m01 = -sinTheta; m02 = x - x * cosTheta + y * sinTheta;
+ m10 = sinTheta; m11 = cosTheta; m12 = y - x * sinTheta - y * cosTheta;
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a scaling.
+ * The transformation matrix for a scale
+ * has the value:
+ * <blockquote><pre>
+ * | xScale 0 dx |
+ * | 1 yScale dy |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ *
+ * @param xScale the amount to scale x-ordinates by
+ * @param yScale the amount to scale y-ordinates by
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToScale(double xScale, double yScale)
+ {
+ m00 = xScale; m01 = 0.0; m02 = 0.0;
+ m10 = 0.0; m11 = yScale; m12 = 0.0;
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a shear.
+ * The transformation matrix for a shear
+ * has the value:
+ * <blockquote><pre>
+ * | 1 xShear 0 |
+ * | yShear 1 0 |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ * Note that a shear of (1, 1) is <i>not</i>
+ * equal to shear(1, 0) composed with shear(0, 1).
+ * Instead, shear(1, 1) corresponds to a mapping onto the
+ * line x = y.
+ *
+ * @param xShear the x component to shear by
+ * @param yShear the y component to shear by
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToShear(double xShear, double yShear)
+ {
+ m00 = 1.0; m01 = xShear; m02 = 0.0;
+ m10 = yShear; m11 = 1.0; m12 = 0.0;
+ return this;
+ }
+
+ /**
+ * Sets this transformation to be a translation.
+ * For a translation by the vector (x, y)
+ * the transformation matrix has the value:
+ * <blockquote><pre>
+ * | 1 0 dx |
+ * | 1 0 dy |
+ * | 0 0 1 |
+ * </pre></blockquote>
+ * @param dx the x component to translate by
+ * @param dy the y component to translate by
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation setToTranslation(double dx, double dy)
+ {
+ m00 = 1.0; m01 = 0.0; m02 = dx;
+ m10 = 0.0; m11 = 1.0; m12 = dy;
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a reflection transformation composed
+ * with the current value.
+ *
+ * @param x0 the x-ordinate of a point on the line to reflect around
+ * @param y0 the y-ordinate of a point on the line to reflect around
+ * @param x1 the x-ordinate of a point on the line to reflect around
+ * @param y1 the y-ordinate of a point on the line to reflect around
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation reflect(double x0, double y0, double x1, double y1)
+ {
+ compose(reflectionInstance(x0, y0, x1, y1));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a reflection transformation composed
+ * with the current value.
+ *
+ * @param x the x-ordinate of the line to reflect around
+ * @param y the y-ordinate of the line to reflect around
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation reflect(double x, double y)
+ {
+ compose(reflectionInstance(x, y));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a rotation transformation composed
+ * with the current value.
+ * Positive angles correspond to a rotation
+ * in the counter-clockwise direction.
+ *
+ * @param theta the angle to rotate by, in radians
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation rotate(double theta)
+ {
+ compose(rotationInstance(theta));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a rotation around the origin composed
+ * with the current value,
+ * with the sin and cos of the rotation angle specified directly.
+ *
+ * @param sinTheta the sine of the angle to rotate by
+ * @param cosTheta the cosine of the angle to rotate by
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation rotate(double sinTheta, double cosTheta)
+ {
+ compose(rotationInstance(sinTheta, cosTheta));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a rotation around a given point composed
+ * with the current value.
+ * Positive angles correspond to a rotation
+ * in the counter-clockwise direction.
+ *
+ * @param theta the angle to rotate by, in radians
+ * @param x the x-ordinate of the rotation point
+ * @param y the y-ordinate of the rotation point
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation rotate(double theta, double x, double y)
+ {
+ compose(rotationInstance(theta, x, y));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a rotation around a given point composed
+ * with the current value,
+ * with the sin and cos of the rotation angle specified directly.
+ *
+ * @param sinTheta the sine of the angle to rotate by
+ * @param cosTheta the cosine of the angle to rotate by
+ * @param x the x-ordinate of the rotation point
+ * @param y the y-ordinate of the rotation point
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation rotate(double sinTheta, double cosTheta, double x, double y)
+ {
+ compose(rotationInstance(sinTheta, cosTheta));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a scale transformation composed
+ * with the current value.
+ *
+ * @param xScale the value to scale by in the x direction
+ * @param yScale the value to scale by in the y direction
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation scale(double xScale, double yScale)
+ {
+ compose(scaleInstance(xScale, yScale));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a shear transformation composed
+ * with the current value.
+ *
+ * @param xShear the value to shear by in the x direction
+ * @param yShear the value to shear by in the y direction
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation shear(double xShear, double yShear)
+ {
+ compose(shearInstance(xShear, yShear));
+ return this;
+ }
+
+ /**
+ * Updates the value of this transformation
+ * to that of a translation transformation composed
+ * with the current value.
+ *
+ * @param x the value to translate by in the x direction
+ * @param y the value to translate by in the y direction
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation translate(double x, double y)
+ {
+ compose(translationInstance(x, y));
+ return this;
+ }
+
+
+ /**
+ * Updates this transformation to be
+ * the composition of this transformation with the given {@link AffineTransformation}.
+ * This produces a transformation whose effect
+ * is equal to applying this transformation
+ * followed by the argument transformation.
+ * Mathematically,
+ * <blockquote><pre>
+ * A.compose(B) = T<sub>B</sub> x T<sub>A</sub>
+ * </pre></blockquote>
+ *
+ * @param trans an affine transformation
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation compose(AffineTransformation trans)
+ {
+ double mp00 = trans.m00 * m00 + trans.m01 * m10;
+ double mp01 = trans.m00 * m01 + trans.m01 * m11;
+ double mp02 = trans.m00 * m02 + trans.m01 * m12 + trans.m02;
+ double mp10 = trans.m10 * m00 + trans.m11 * m10;
+ double mp11 = trans.m10 * m01 + trans.m11 * m11;
+ double mp12 = trans.m10 * m02 + trans.m11 * m12 + trans.m12;
+ m00 = mp00;
+ m01 = mp01;
+ m02 = mp02;
+ m10 = mp10;
+ m11 = mp11;
+ m12 = mp12;
+ return this;
+ }
+
+ /**
+ * Updates this transformation to be the composition
+ * of a given {@link AffineTransformation} with this transformation.
+ * This produces a transformation whose effect
+ * is equal to applying the argument transformation
+ * followed by this transformation.
+ * Mathematically,
+ * <blockquote><pre>
+ * A.composeBefore(B) = T<sub>A</sub> x T<sub>B</sub>
+ * </pre></blockquote>
+ *
+ * @param trans an affine transformation
+ * @return this transformation, with an updated matrix
+ */
+ public AffineTransformation composeBefore(AffineTransformation trans)
+ {
+ double mp00 = m00 * trans.m00 + m01 * trans.m10;
+ double mp01 = m00 * trans.m01 + m01 * trans.m11;
+ double mp02 = m00 * trans.m02 + m01 * trans.m12 + m02;
+ double mp10 = m10 * trans.m00 + m11 * trans.m10;
+ double mp11 = m10 * trans.m01 + m11 * trans.m11;
+ double mp12 = m10 * trans.m02 + m11 * trans.m12 + m12;
+ m00 = mp00;
+ m01 = mp01;
+ m02 = mp02;
+ m10 = mp10;
+ m11 = mp11;
+ m12 = mp12;
+ return this;
+ }
+
+ /**
+ * Applies this transformation to the <tt>src</tt> coordinate
+ * and places the results in the <tt>dest</tt> coordinate
+ * (which may be the same as the source).
+ *
+ * @param src the coordinate to transform
+ * @param dest the coordinate to accept the results
+ * @return the <tt>dest</tt> coordinate
+ */
+ public Coordinate transform(Coordinate src, Coordinate dest)
+ {
+ double xp = m00 * src.x + m01 * src.y + m02;
+ double yp = m10 * src.x + m11 * src.y + m12;
+ dest.x = xp;
+ dest.y = yp;
+ return dest;
+ }
+
+ /**
+ * Creates a new {@link Geometry} which is the result
+ * of this transformation applied to the input Geometry.
+ *
+ *@param g a <code>Geometry</code>
+ *@return a transformed Geometry
+ */
+ public Geometry transform(Geometry g)
+ {
+ Geometry g2 = g.copy();
+ g2.apply(this);
+ return g2;
+ }
+
+ /**
+ * Applies this transformation to the i'th coordinate
+ * in the given CoordinateSequence.
+ *
+ *@param seq a <code>CoordinateSequence</code>
+ *@param i the index of the coordinate to transform
+ */
+ public void transform(CoordinateSequence seq, int i)
+ {
+ double xp = m00 * seq.getOrdinate(i, 0) + m01 * seq.getOrdinate(i, 1) + m02;
+ double yp = m10 * seq.getOrdinate(i, 0) + m11 * seq.getOrdinate(i, 1) + m12;
+ seq.setOrdinate(i, 0, xp);
+ seq.setOrdinate(i, 1, yp);
+ }
+
+ /**
+ * Transforms the i'th coordinate in the input sequence
+ *
+ *@param seq a <code>CoordinateSequence</code>
+ *@param i the index of the coordinate to transform
+ */
+ public void filter(CoordinateSequence seq, int i)
+ {
+ transform(seq, i);
+ }
+
+ public boolean isGeometryChanged()
+ {
+ return true;
+ }
+
+ /**
+ * Reports that this filter should continue to be executed until
+ * all coordinates have been transformed.
+ *
+ * @return false
+ */
+ public boolean isDone()
+ {
+ return false;
+ }
+
+ /**
+ * Tests if this transformation is the identity transformation.
+ *
+ * @return true if this is the identity transformation
+ */
+ public boolean isIdentity()
+ {
+ return (m00 == 1 && m01 == 0 && m02 == 0
+ && m10 == 0 && m11 == 1 && m12 == 0);
+ }
+
+ /**
+ * Tests if an object is an
+ * <tt>AffineTransformation</tt>
+ * and has the same matrix as
+ * this transformation.
+ *
+ * @param obj an object to test
+ * @return true if the given object is equal to this object
+ */
+ public boolean equals(Object obj)
+ {
+ if (obj == null) return false;
+ if (! (obj instanceof AffineTransformation))
+ return false;
+
+ AffineTransformation trans = (AffineTransformation) obj;
+ return m00 == trans.m00
+ && m01 == trans.m01
+ && m02 == trans.m02
+ && m10 == trans.m10
+ && m11 == trans.m11
+ && m12 == trans.m12;
+ }
+
+ /**
+ * Gets a text representation of this transformation.
+ * The string is of the form:
+ * <pre>
+ * AffineTransformation[[m00, m01, m02], [m10, m11, m12]]
+ * </pre>
+ *
+ * @return a string representing this transformation
+ *
+ */
+ public String toString()
+ {
+ return "AffineTransformation[[" + m00 + ", " + m01 + ", " + m02
+ + "], ["
+ + m10 + ", " + m11 + ", " + m12 + "]]";
+ }
+
+ /**
+ * Clones this transformation
+ *
+ * @return a copy of this transformation
+ */
+ public Object clone()
+ {
+ try {
+ return super.clone();
+ } catch(Exception ex) {
+ Assert.shouldNeverReachHere();
+ }
+ return null;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformationBuilder.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformationBuilder.java
new file mode 100644
index 0000000..64cf8a0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformationBuilder.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.math.Matrix;
+
+/**
+ * Builds an {@link AffineTransformation} defined by a set of control vectors.
+ * A control vector consists of a source point and a destination point,
+ * which is the image of the source point under the desired transformation.
+ * <p>
+ * A transformation is well-defined
+ * by a set of three control vectors
+ * if and only if the source points are not collinear.
+ * (In particular, the degenerate situation
+ * where two or more source points are identical will not produce a well-defined transformation).
+ * A well-defined transformation exists and is unique.
+ * If the control vectors are not well-defined, the system of equations
+ * defining the transformation matrix entries is not solvable,
+ * and no transformation can be determined.
+ * <p>
+ * No such restriction applies to the destination points.
+ * However, if the destination points are collinear or non-unique,
+ * a non-invertible transformations will be generated.
+ * <p>
+ * This technique of recovering a transformation
+ * from its effect on known points is used in the Bilinear Interpolated Triangulation
+ * algorithm for warping planar surfaces.
+ *
+ * @author Martin Davis
+ */
+public class AffineTransformationBuilder
+{
+ private Coordinate src0;
+ private Coordinate src1;
+ private Coordinate src2;
+ private Coordinate dest0;
+ private Coordinate dest1;
+ private Coordinate dest2;
+
+ // the matrix entries for the transformation
+ private double m00, m01, m02, m10, m11, m12;
+
+
+ /**
+ * Constructs a new builder for
+ * the transformation defined by the given
+ * set of control point mappings.
+ *
+ * @param src0 a control point
+ * @param src1 a control point
+ * @param src2 a control point
+ * @param dest0 the image of control point 0 under the required transformation
+ * @param dest1 the image of control point 1 under the required transformation
+ * @param dest2 the image of control point 2 under the required transformation
+ */
+ public AffineTransformationBuilder(Coordinate src0,
+ Coordinate src1,
+ Coordinate src2,
+ Coordinate dest0,
+ Coordinate dest1,
+ Coordinate dest2)
+ {
+ this.src0 = src0;
+ this.src1 = src1;
+ this.src2 = src2;
+ this.dest0 = dest0;
+ this.dest1 = dest1;
+ this.dest2 = dest2;
+ }
+
+ /**
+ * Computes the {@link AffineTransformation}
+ * determined by the control point mappings,
+ * or <code>null</code> if the control vectors do not determine a well-defined transformation.
+ *
+ * @return an affine transformation
+ * @return null if the control vectors do not determine a well-defined transformation
+ */
+ public AffineTransformation getTransformation()
+ {
+ // compute full 3-point transformation
+ boolean isSolvable = compute();
+ if (isSolvable)
+ return new AffineTransformation(m00, m01, m02, m10, m11, m12);
+ return null;
+ }
+
+ /**
+ * Computes the transformation matrix by
+ * solving the two systems of linear equations
+ * defined by the control point mappings,
+ * if this is possible.
+ *
+ * @return true if the transformation matrix is solvable
+ */
+ private boolean compute()
+ {
+ double[] bx = new double[] { dest0.x, dest1.x, dest2.x };
+ double[] row0 = solve(bx);
+ if (row0 == null) return false;
+ m00 = row0[0];
+ m01 = row0[1];
+ m02 = row0[2];
+
+ double[] by = new double[] { dest0.y, dest1.y, dest2.y };
+ double[] row1 = solve(by);
+ if (row1 == null) return false;
+ m10 = row1[0];
+ m11 = row1[1];
+ m12 = row1[2];
+ return true;
+ }
+
+ /**
+ * Solves the transformation matrix system of linear equations
+ * for the given right-hand side vector.
+ *
+ * @param b the vector for the right-hand side of the system
+ * @return the solution vector
+ * @return null if no solution could be determined
+ */
+ private double[] solve(double[] b)
+ {
+ double[][] a = new double[][] {
+ { src0.x, src0.y, 1 },
+ { src1.x, src1.y, 1},
+ { src2.x, src2.y, 1}
+ };
+ return Matrix.solve(a, b);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformationFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformationFactory.java
new file mode 100644
index 0000000..8f7148b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformationFactory.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import org.locationtech.jts.algorithm.Angle;
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Supports creating {@link AffineTransformation}s defined by various kinds of
+ * inputs and transformation mapping rules.
+ *
+ * @author Martin Davis
+ *
+ */
+public class AffineTransformationFactory {
+ /**
+ * Creates a transformation from a set of three control vectors. A control
+ * vector consists of a source point and a destination point, which is the
+ * image of the source point under the desired transformation. Three control
+ * vectors allows defining a fully general affine transformation.
+ *
+ * @param src0
+ * @param src1
+ * @param src2
+ * @param dest0
+ * @param dest1
+ * @param dest2
+ * @return the computed transformation
+ */
+ public static AffineTransformation createFromControlVectors(Coordinate src0,
+ Coordinate src1, Coordinate src2, Coordinate dest0, Coordinate dest1,
+ Coordinate dest2) {
+ AffineTransformationBuilder builder = new AffineTransformationBuilder(src0,
+ src1, src2, dest0, dest1, dest2);
+ return builder.getTransformation();
+ }
+
+ /**
+ * Creates an AffineTransformation defined by a pair of control vectors. A
+ * control vector consists of a source point and a destination point, which is
+ * the image of the source point under the desired transformation. The
+ * computed transformation is a combination of one or more of a uniform scale,
+ * a rotation, and a translation (i.e. there is no shear component and no
+ * reflection)
+ *
+ * @param src0
+ * @param src1
+ * @param dest0
+ * @param dest1
+ * @return the computed transformation
+ * @return null if the control vectors do not determine a well-defined transformation
+ */
+ public static AffineTransformation createFromControlVectors(Coordinate src0,
+ Coordinate src1, Coordinate dest0, Coordinate dest1) {
+ Coordinate rotPt = new Coordinate(dest1.x - dest0.x, dest1.y - dest0.y);
+
+ double ang = Angle.angleBetweenOriented(src1, src0, rotPt);
+
+ double srcDist = src1.distance(src0);
+ double destDist = dest1.distance(dest0);
+
+ if (srcDist == 0.0)
+ return null;
+
+ double scale = destDist / srcDist;
+
+ AffineTransformation trans = AffineTransformation.translationInstance(
+ -src0.x, -src0.y);
+ trans.rotate(ang);
+ trans.scale(scale, scale);
+ trans.translate(dest0.x, dest0.y);
+ return trans;
+ }
+
+ /**
+ * Creates an AffineTransformation defined by a single control vector. A
+ * control vector consists of a source point and a destination point, which is
+ * the image of the source point under the desired transformation. This
+ * produces a translation.
+ *
+ * @param src0
+ * the start point of the control vector
+ * @param dest0
+ * the end point of the control vector
+ * @return the computed transformation
+ */
+ public static AffineTransformation createFromControlVectors(Coordinate src0,
+ Coordinate dest0) {
+ double dx = dest0.x - src0.x;
+ double dy = dest0.y - src0.y;
+ return AffineTransformation.translationInstance(dx, dy);
+ }
+
+ /**
+ * Creates an AffineTransformation defined by a set of control vectors.
+ * Between one and three vectors must be supplied.
+ *
+ * @param src
+ * the source points of the vectors
+ * @param dest
+ * the destination points of the vectors
+ * @return the computed transformation
+ * @throws IllegalArgumentException
+ * if the control vector arrays are too short, long or of different
+ * lengths
+ */
+ public static AffineTransformation createFromControlVectors(Coordinate[] src,
+ Coordinate[] dest) {
+ if (src.length != dest.length)
+ throw new IllegalArgumentException(
+ "Src and Dest arrays are not the same length");
+ if (src.length <= 0)
+ throw new IllegalArgumentException("Too few control points");
+ if (src.length > 3)
+ throw new IllegalArgumentException("Too many control points");
+
+ if (src.length == 1)
+ return createFromControlVectors(src[0], dest[0]);
+ if (src.length == 2)
+ return createFromControlVectors(src[0], src[1], dest[0], dest[1]);
+
+ return createFromControlVectors(src[0], src[1], src[2], dest[0], dest[1],
+ dest[2]);
+ }
+
+ /**
+ * Creates an AffineTransformation defined by a mapping between two baselines.
+ * The computed transformation consists of:
+ * <ul>
+ * <li>a translation
+ * from the start point of the source baseline to the start point of the destination baseline,
+ * <li>a rotation through the angle between the baselines about the destination start point,
+ * <li>and a scaling equal to the ratio of the baseline lengths.
+ * </ul>
+ * If the source baseline has zero length, an identity transformation is returned.
+ *
+ * @param src0 the start point of the source baseline
+ * @param src1 the end point of the source baseline
+ * @param dest0 the start point of the destination baseline
+ * @param dest1 the end point of the destination baseline
+ * @return the computed transformation
+ */
+ public static AffineTransformation createFromBaseLines(
+ Coordinate src0, Coordinate src1,
+ Coordinate dest0, Coordinate dest1)
+ {
+ Coordinate rotPt = new Coordinate(src0.x + dest1.x - dest0.x, src0.y + dest1.y - dest0.y);
+
+ double ang = Angle.angleBetweenOriented(src1, src0, rotPt);
+
+ double srcDist = src1.distance(src0);
+ double destDist = dest1.distance(dest0);
+
+ // return identity if transformation would be degenerate
+ if (srcDist == 0.0)
+ return new AffineTransformation();
+
+ double scale = destDist / srcDist;
+
+ AffineTransformation trans = AffineTransformation.translationInstance(
+ -src0.x, -src0.y);
+ trans.rotate(ang);
+ trans.scale(scale, scale);
+ trans.translate(dest0.x, dest0.y);
+ return trans;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/ComponentCoordinateExtracter.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/ComponentCoordinateExtracter.java
new file mode 100644
index 0000000..43030d0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/ComponentCoordinateExtracter.java
@@ -0,0 +1,68 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * Extracts a single representative {@link Coordinate}
+ * from each connected component of a {@link Geometry}.
+ *
+ * @version 1.9
+ */
+public class ComponentCoordinateExtracter
+ implements GeometryComponentFilter
+{
+
+ /**
+ * Extracts the linear components from a single geometry.
+ * If more than one geometry is to be processed, it is more
+ * efficient to create a single {@link ComponentCoordinateExtracter} instance
+ * and pass it to multiple geometries.
+ *
+ * @param geom the Geometry from which to extract
+ * @return a list of Coordinates
+ */
+ public static List getCoordinates(Geometry geom)
+ {
+ List coords = new ArrayList();
+ geom.apply(new ComponentCoordinateExtracter(coords));
+ return coords;
+ }
+
+ private List coords;
+
+ /**
+ * Constructs a LineExtracterFilter with a list in which to store LineStrings found.
+ */
+ public ComponentCoordinateExtracter(List coords)
+ {
+ this.coords = coords;
+ }
+
+ public void filter(Geometry geom)
+ {
+ // add coordinates from connected components
+ if (geom instanceof LineString
+ || geom instanceof Point)
+ coords.add(geom.getCoordinate());
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryCollectionMapper.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryCollectionMapper.java
new file mode 100644
index 0000000..6ed6cf1
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryCollectionMapper.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.util.GeometryMapper.MapOp;
+
+/**
+ * Maps the members of a {@link GeometryCollection}
+ * into another <tt>GeometryCollection</tt> via a defined
+ * mapping function.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryCollectionMapper
+{
+ public static GeometryCollection map(GeometryCollection gc, MapOp op)
+ {
+ GeometryCollectionMapper mapper = new GeometryCollectionMapper(op);
+ return mapper.map(gc);
+ }
+
+ private MapOp mapOp = null;
+
+ public GeometryCollectionMapper(MapOp mapOp) {
+ this.mapOp = mapOp;
+ }
+
+ public GeometryCollection map(GeometryCollection gc)
+ {
+ List mapped = new ArrayList();
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = mapOp.map(gc.getGeometryN(i));
+ if (!g.isEmpty())
+ mapped.add(g);
+ }
+ return gc.getFactory().createGeometryCollection(
+ GeometryFactory.toGeometryArray(mapped));
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryCombiner.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryCombiner.java
new file mode 100644
index 0000000..e1704ac
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryCombiner.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygonal;
+
+
+/**
+ * Combines {@link Geometry}s
+ * to produce a {@link GeometryCollection} of the most appropriate type.
+ * Input geometries which are already collections
+ * will have their elements extracted first.
+ * No validation of the result geometry is performed.
+ * (The only case where invalidity is possible is where {@link Polygonal} geometries
+ * are combined and result in a self-intersection).
+ *
+ * @author mbdavis
+ * @see GeometryFactory#buildGeometry
+ */
+public class GeometryCombiner
+{
+ /**
+ * Combines a collection of geometries.
+ *
+ * @param geoms the geometries to combine
+ * @return the combined geometry
+ */
+ public static Geometry combine(Collection geoms)
+ {
+ GeometryCombiner combiner = new GeometryCombiner(geoms);
+ return combiner.combine();
+ }
+
+ /**
+ * Combines two geometries.
+ *
+ * @param g0 a geometry to combine
+ * @param g1 a geometry to combine
+ * @return the combined geometry
+ */
+ public static Geometry combine(Geometry g0, Geometry g1)
+ {
+ GeometryCombiner combiner = new GeometryCombiner(createList(g0, g1));
+ return combiner.combine();
+ }
+
+ /**
+ * Combines three geometries.
+ *
+ * @param g0 a geometry to combine
+ * @param g1 a geometry to combine
+ * @param g2 a geometry to combine
+ * @return the combined geometry
+ */
+ public static Geometry combine(Geometry g0, Geometry g1, Geometry g2)
+ {
+ GeometryCombiner combiner = new GeometryCombiner(createList(g0, g1, g2));
+ return combiner.combine();
+ }
+
+ /**
+ * Creates a list from two items
+ *
+ * @param obj0
+ * @param obj1
+ * @return a List containing the two items
+ */
+ private static List createList(Object obj0, Object obj1)
+ {
+ List list = new ArrayList();
+ list.add(obj0);
+ list.add(obj1);
+ return list;
+ }
+
+ /**
+ * Creates a list from two items
+ *
+ * @param obj0
+ * @param obj1
+ * @return a List containing the two items
+ */
+ private static List createList(Object obj0, Object obj1, Object obj2)
+ {
+ List list = new ArrayList();
+ list.add(obj0);
+ list.add(obj1);
+ list.add(obj2);
+ return list;
+ }
+
+ private GeometryFactory geomFactory;
+ private boolean skipEmpty = false;
+ private Collection inputGeoms;
+
+ /**
+ * Creates a new combiner for a collection of geometries
+ *
+ * @param geoms the geometries to combine
+ */
+ public GeometryCombiner(Collection geoms)
+ {
+ geomFactory = extractFactory(geoms);
+ this.inputGeoms = geoms;
+ }
+
+ /**
+ * Extracts the GeometryFactory used by the geometries in a collection
+ *
+ * @param geoms
+ * @return a GeometryFactory
+ */
+ public static GeometryFactory extractFactory(Collection geoms) {
+ if (geoms.isEmpty())
+ return null;
+ return ((Geometry) geoms.iterator().next()).getFactory();
+ }
+
+ /**
+ * Computes the combination of the input geometries
+ * to produce the most appropriate {@link Geometry} or {@link GeometryCollection}
+ *
+ * @return a Geometry which is the combination of the inputs
+ */
+ public Geometry combine()
+ {
+ List elems = new ArrayList();
+ for (Iterator i = inputGeoms.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ extractElements(g, elems);
+ }
+
+ if (elems.size() == 0) {
+ if (geomFactory != null) {
+ // return an empty GC
+ return geomFactory.createGeometryCollection();
+ }
+ return null;
+ }
+ // return the "simplest possible" geometry
+ return geomFactory.buildGeometry(elems);
+ }
+
+ private void extractElements(Geometry geom, List elems)
+ {
+ if (geom == null)
+ return;
+
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry elemGeom = geom.getGeometryN(i);
+ if (skipEmpty && elemGeom.isEmpty())
+ continue;
+ elems.add(elemGeom);
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryEditor.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryEditor.java
new file mode 100644
index 0000000..29d562e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryEditor.java
@@ -0,0 +1,357 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+
+import java.util.ArrayList;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * A class which supports creating new {@link Geometry}s
+ * which are modifications of existing ones,
+ * maintaining the same type structure.
+ * Geometry objects are intended to be treated as immutable.
+ * This class "modifies" Geometrys
+ * by traversing them, applying a user-defined
+ * {@link GeometryEditorOperation}, {@link CoordinateSequenceOperation} or {@link CoordinateOperation}
+ * and creating new Geometrys with the same structure but
+ * (possibly) modified components.
+ * <p>
+ * Examples of the kinds of modifications which can be made are:
+ * <ul>
+ * <li>the values of the coordinates may be changed.
+ * The editor does not check whether changing coordinate values makes the result Geometry invalid
+ * <li>the coordinate lists may be changed
+ * (e.g. by adding, deleting or modifying coordinates).
+ * The modified coordinate lists must be consistent with their original parent component
+ * (e.g. a <tt>LinearRing</tt> must always have at least 4 coordinates, and the first and last
+ * coordinate must be equal)
+ * <li>components of the original geometry may be deleted
+ * (e.g. holes may be removed from a Polygon, or LineStrings removed from a MultiLineString).
+ * Deletions will be propagated up the component tree appropriately.
+ * </ul>
+ * All changes must be consistent with the original Geometry's structure
+ * (e.g. a <tt>Polygon</tt> cannot be collapsed into a <tt>LineString</tt>).
+ * If changing the structure is required, use a {@link GeometryTransformer}.
+ * <p>
+ * This class supports creating an edited Geometry
+ * using a different <code>GeometryFactory</code> via the {@link #GeometryEditor(GeometryFactory)}
+ * constructor.
+ * Examples of situations where this is required is if the geometry is
+ * transformed to a new SRID and/or a new PrecisionModel.
+ * <p>
+ * <b>Usage Notes</b>
+ * <ul>
+ * <li>The resulting Geometry is not checked for validity.
+ * If validity needs to be enforced, the new Geometry's
+ * {@link Geometry#isValid} method should be called.
+ * <li>By default the UserData of the input geometry is not copied to the result.
+ * </ul>
+ *
+ * @see GeometryTransformer
+ * @see Geometry#isValid
+ *
+ * @version 1.7
+ */
+public class GeometryEditor
+{
+ /**
+ * The factory used to create the modified Geometry.
+ * If <tt>null</tt> the GeometryFactory of the input is used.
+ */
+ private GeometryFactory factory = null;
+ private boolean isUserDataCopied = false;
+
+ /**
+ * Creates a new GeometryEditor object which will create
+ * edited {@link Geometry}s with the same {@link GeometryFactory} as the input Geometry.
+ */
+ public GeometryEditor()
+ {
+ }
+
+ /**
+ * Creates a new GeometryEditor object which will create
+ * edited {@link Geometry}s with the given {@link GeometryFactory}.
+ *
+ * @param factory the GeometryFactory to create edited Geometrys with
+ */
+ public GeometryEditor(GeometryFactory factory)
+ {
+ this.factory = factory;
+ }
+
+ /**
+ * Sets whether the User Data is copied to the edit result.
+ * Only the object reference is copied.
+ *
+ * @param isUserDataCopied true if the input user data should be copied.
+ */
+ public void setCopyUserData(boolean isUserDataCopied)
+ {
+ this.isUserDataCopied = isUserDataCopied;
+ }
+
+ /**
+ * Edit the input {@link Geometry} with the given edit operation.
+ * Clients can create subclasses of {@link GeometryEditorOperation} or
+ * {@link CoordinateOperation} to perform required modifications.
+ *
+ * @param geometry the Geometry to edit
+ * @param operation the edit operation to carry out
+ * @return a new {@link Geometry} which is the result of the editing (which may be empty)
+ */
+ public Geometry edit(Geometry geometry, GeometryEditorOperation operation)
+ {
+ // nothing to do
+ if (geometry == null) return null;
+
+ Geometry result = editInternal(geometry, operation);
+ if (isUserDataCopied) {
+ result.setUserData(geometry.getUserData());
+ }
+ return result;
+ }
+
+ private Geometry editInternal(Geometry geometry, GeometryEditorOperation operation)
+ {
+ // if client did not supply a GeometryFactory, use the one from the input Geometry
+ if (factory == null)
+ factory = geometry.getFactory();
+
+ if (geometry instanceof GeometryCollection) {
+ return editGeometryCollection((GeometryCollection) geometry,
+ operation);
+ }
+
+ if (geometry instanceof Polygon) {
+ return editPolygon((Polygon) geometry, operation);
+ }
+
+ if (geometry instanceof Point) {
+ return operation.edit(geometry, factory);
+ }
+
+ if (geometry instanceof LineString) {
+ return operation.edit(geometry, factory);
+ }
+
+ Assert.shouldNeverReachHere("Unsupported Geometry class: " + geometry.getClass().getName());
+ return null;
+ }
+
+ private Polygon editPolygon(Polygon polygon,
+ GeometryEditorOperation operation) {
+ Polygon newPolygon = (Polygon) operation.edit(polygon, factory);
+ // create one if needed
+ if (newPolygon == null)
+ newPolygon = factory.createPolygon();
+ if (newPolygon.isEmpty()) {
+ //RemoveSelectedPlugIn relies on this behaviour. [Jon Aquino]
+ return newPolygon;
+ }
+
+ LinearRing shell = (LinearRing) edit(newPolygon.getExteriorRing(), operation);
+ if (shell == null || shell.isEmpty()) {
+ //RemoveSelectedPlugIn relies on this behaviour. [Jon Aquino]
+ return factory.createPolygon();
+ }
+
+ ArrayList holes = new ArrayList();
+ for (int i = 0; i < newPolygon.getNumInteriorRing(); i++) {
+ LinearRing hole = (LinearRing) edit(newPolygon.getInteriorRingN(i), operation);
+ if (hole == null || hole.isEmpty()) {
+ continue;
+ }
+ holes.add(hole);
+ }
+
+ return factory.createPolygon(shell,
+ (LinearRing[]) holes.toArray(new LinearRing[] { }));
+ }
+
+ private GeometryCollection editGeometryCollection(
+ GeometryCollection collection, GeometryEditorOperation operation) {
+ // first edit the entire collection
+ // MD - not sure why this is done - could just check original collection?
+ GeometryCollection collectionForType = (GeometryCollection) operation.edit(collection,
+ factory);
+
+ // edit the component geometries
+ ArrayList geometries = new ArrayList();
+ for (int i = 0; i < collectionForType.getNumGeometries(); i++) {
+ Geometry geometry = edit(collectionForType.getGeometryN(i), operation);
+ if (geometry == null || geometry.isEmpty()) {
+ continue;
+ }
+ geometries.add(geometry);
+ }
+
+ if (collectionForType.getClass() == MultiPoint.class) {
+ return factory.createMultiPoint((Point[]) geometries.toArray(
+ new Point[] { }));
+ }
+ if (collectionForType.getClass() == MultiLineString.class) {
+ return factory.createMultiLineString((LineString[]) geometries.toArray(
+ new LineString[] { }));
+ }
+ if (collectionForType.getClass() == MultiPolygon.class) {
+ return factory.createMultiPolygon((Polygon[]) geometries.toArray(
+ new Polygon[] { }));
+ }
+ return factory.createGeometryCollection((Geometry[]) geometries.toArray(
+ new Geometry[] { }));
+ }
+
+ /**
+ * A interface which specifies an edit operation for Geometries.
+ *
+ * @version 1.7
+ */
+ public interface GeometryEditorOperation
+ {
+ /**
+ * Edits a Geometry by returning a new Geometry with a modification.
+ * The returned geometry may be:
+ * <ul>
+ * <li>the input geometry itself.
+ * The returned Geometry might be the same as the Geometry passed in.
+ * <li><code>null</code> if the geometry is to be deleted.
+ * </ul>
+ *
+ * @param geometry the Geometry to modify
+ * @param factory the factory with which to construct the modified Geometry
+ * (may be different to the factory of the input geometry)
+ * @return a new Geometry which is a modification of the input Geometry
+ * @return null if the Geometry is to be deleted completely
+ */
+ Geometry edit(Geometry geometry, GeometryFactory factory);
+ }
+
+ /**
+ * A GeometryEditorOperation which does not modify
+ * the input geometry.
+ * This can be used for simple changes of
+ * GeometryFactory (including PrecisionModel and SRID).
+ *
+ * @author mbdavis
+ *
+ */
+ public static class NoOpGeometryOperation
+ implements GeometryEditorOperation
+ {
+ public Geometry edit(Geometry geometry, GeometryFactory factory)
+ {
+ return geometry;
+ }
+ }
+
+ /**
+ * A {@link GeometryEditorOperation} which edits the coordinate list of a {@link Geometry}.
+ * Operates on Geometry subclasses which contains a single coordinate list.
+ */
+ public abstract static class CoordinateOperation
+ implements GeometryEditorOperation
+ {
+ public final Geometry edit(Geometry geometry, GeometryFactory factory) {
+ if (geometry instanceof LinearRing) {
+ return factory.createLinearRing(edit(geometry.getCoordinates(),
+ geometry));
+ }
+
+ if (geometry instanceof LineString) {
+ return factory.createLineString(edit(geometry.getCoordinates(),
+ geometry));
+ }
+
+ if (geometry instanceof Point) {
+ Coordinate[] newCoordinates = edit(geometry.getCoordinates(),
+ geometry);
+
+ return factory.createPoint((newCoordinates.length > 0)
+ ? newCoordinates[0] : null);
+ }
+
+ return geometry;
+ }
+
+ /**
+ * Edits the array of {@link Coordinate}s from a {@link Geometry}.
+ * <p>
+ * If it is desired to preserve the immutability of Geometrys,
+ * if the coordinates are changed a new array should be created
+ * and returned.
+ *
+ * @param coordinates the coordinate array to operate on
+ * @param geometry the geometry containing the coordinate list
+ * @return an edited coordinate array (which may be the same as the input)
+ */
+ public abstract Coordinate[] edit(Coordinate[] coordinates,
+ Geometry geometry);
+ }
+
+ /**
+ * A {@link GeometryEditorOperation} which edits the {@link CoordinateSequence}
+ * of a {@link Geometry}.
+ * Operates on Geometry subclasses which contains a single coordinate list.
+ */
+ public abstract static class CoordinateSequenceOperation
+ implements GeometryEditorOperation
+ {
+ public final Geometry edit(Geometry geometry, GeometryFactory factory) {
+ if (geometry instanceof LinearRing) {
+ return factory.createLinearRing(edit(
+ ((LinearRing)geometry).getCoordinateSequence(),
+ geometry));
+ }
+
+ if (geometry instanceof LineString) {
+ return factory.createLineString(edit(
+ ((LineString)geometry).getCoordinateSequence(),
+ geometry));
+ }
+
+ if (geometry instanceof Point) {
+ return factory.createPoint(edit(
+ ((Point)geometry).getCoordinateSequence(),
+ geometry));
+ }
+
+ return geometry;
+ }
+
+ /**
+ * Edits a {@link CoordinateSequence} from a {@link Geometry}.
+ *
+ * @param coordSeq the coordinate array to operate on
+ * @param geometry the geometry containing the coordinate list
+ * @return an edited coordinate sequence (which may be the same as the input)
+ */
+ public abstract CoordinateSequence edit(CoordinateSequence coordSeq,
+ Geometry geometry);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryExtracter.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryExtracter.java
new file mode 100644
index 0000000..a1d1e80
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryExtracter.java
@@ -0,0 +1,88 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFilter;
+
+/**
+ * Extracts the components of a given type from a {@link Geometry}.
+ *
+ * @version 1.7
+ */
+public class GeometryExtracter
+ implements GeometryFilter
+{
+
+ protected static boolean isOfClass(Object o, Class clz)
+ {
+ return clz.isAssignableFrom(o.getClass());
+// return o.getClass() == clz;
+ }
+
+ /**
+ * Extracts the components of type <tt>clz</tt> from a {@link Geometry}
+ * and adds them to the provided {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ * @param list the list to add the extracted elements to
+ */
+ public static List extract(Geometry geom, Class clz, List list)
+ {
+ if (isOfClass(geom, clz)) {
+ list.add(geom);
+ }
+ else if (geom instanceof GeometryCollection) {
+ geom.apply(new GeometryExtracter(clz, list));
+ }
+ // skip non-LineString elemental geometries
+
+ return list;
+ }
+
+ /**
+ * Extracts the components of type <tt>clz</tt> from a {@link Geometry}
+ * and returns them in a {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ */
+ public static List extract(Geometry geom, Class clz)
+ {
+ return extract(geom, clz, new ArrayList());
+ }
+
+ private Class clz;
+ private List comps;
+
+ /**
+ * Constructs a filter with a list in which to store the elements found.
+ *
+ * @param clz the class of the components to extract (null means all types)
+ * @param comps the list to extract into
+ */
+ public GeometryExtracter(Class clz, List comps)
+ {
+ this.clz = clz;
+ this.comps = comps;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (clz == null || isOfClass(geom, clz)) comps.add(geom);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryMapper.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryMapper.java
new file mode 100644
index 0000000..bb741e4
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryMapper.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+
+/**
+ * Methods to map various collections
+ * of {@link Geometry}s
+ * via defined mapping functions.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryMapper
+{
+ /**
+ * Maps the members of a {@link Geometry}
+ * (which may be atomic or composite)
+ * into another <tt>Geometry</tt> of most specific type.
+ * <tt>null</tt> results are skipped.
+ * In the case of hierarchical {@link GeometryCollection}s,
+ * only the first level of members are mapped.
+ *
+ * @param geom the input atomic or composite geometry
+ * @param op the mapping operation
+ * @return a result collection or geometry of most specific type
+ */
+ public static Geometry map(Geometry geom, MapOp op)
+ {
+ List mapped = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry g = op.map(geom.getGeometryN(i));
+ if (g != null)
+ mapped.add(g);
+ }
+ return geom.getFactory().buildGeometry(mapped);
+ }
+
+ public static Collection map(Collection geoms, MapOp op)
+ {
+ List mapped = new ArrayList();
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ Geometry gr = op.map(g);
+ if (gr != null)
+ mapped.add(gr);
+ }
+ return mapped;
+ }
+
+ /**
+ * An interface for geometry functions used for mapping.
+ *
+ * @author Martin Davis
+ *
+ */
+ public interface MapOp
+ {
+ /**
+ * Computes a new geometry value.
+ *
+ * @param g the input geometry
+ * @return a result geometry
+ */
+ Geometry map(Geometry g);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryTransformer.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryTransformer.java
new file mode 100644
index 0000000..23cfe85
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryTransformer.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * A framework for processes which transform an input {@link Geometry} into
+ * an output {@link Geometry}, possibly changing its structure and type(s).
+ * This class is a framework for implementing subclasses
+ * which perform transformations on
+ * various different Geometry subclasses.
+ * It provides an easy way of applying specific transformations
+ * to given geometry types, while allowing unhandled types to be simply copied.
+ * Also, the framework ensures that if subcomponents change type
+ * the parent geometries types change appropriately to maintain valid structure.
+ * Subclasses will override whichever <code>transformX</code> methods
+ * they need to to handle particular Geometry types.
+ * <p>
+ * A typically usage would be a transformation class that transforms <tt>Polygons</tt> into
+ * <tt>Polygons</tt>, <tt>LineStrings</tt> or <tt>Points</tt>, depending on the geometry of the input
+ * (For instance, a simplification operation).
+ * This class would likely need to override the {@link #transformMultiPolygon(MultiPolygon, Geometry)}
+ * method to ensure that if input Polygons change type the result is a <tt>GeometryCollection</tt>,
+ * not a <tt>MultiPolygon</tt>.
+ * <p>
+ * The default behaviour of this class is simply to recursively transform
+ * each Geometry component into an identical object by deep copying down
+ * to the level of, but not including, coordinates.
+ * <p>
+ * All <code>transformX</code> methods may return <code>null</code>,
+ * to avoid creating empty or invalid geometry objects. This will be handled correctly
+ * by the transformer. <code>transform<i>XXX</i></code> methods should always return valid
+ * geometry - if they cannot do this they should return <code>null</code>
+ * (for instance, it may not be possible for a transformLineString implementation
+ * to return at least two points - in this case, it should return <code>null</code>).
+ * The {@link #transform(Geometry)} method itself will always
+ * return a non-null Geometry object (but this may be empty).
+ *
+ * @version 1.7
+ *
+ * @see GeometryEditor
+ */
+public class GeometryTransformer
+{
+
+ /**
+ * Possible extensions:
+ * getParent() method to return immediate parent e.g. of LinearRings in Polygons
+ */
+
+ private Geometry inputGeom;
+
+ protected GeometryFactory factory = null;
+
+ // these could eventually be exposed to clients
+ /**
+ * <code>true</code> if empty geometries should not be included in the result
+ */
+ private boolean pruneEmptyGeometry = true;
+
+ /**
+ * <code>true</code> if a homogenous collection result
+ * from a {@link GeometryCollection} should still
+ * be a general GeometryCollection
+ */
+ private boolean preserveGeometryCollectionType = true;
+
+ /**
+ * <code>true</code> if the output from a collection argument should still be a collection
+ */
+ private boolean preserveCollections = false;
+
+ /**
+ * <code>true</code> if the type of the input should be preserved
+ */
+ private boolean preserveType = false;
+
+ public GeometryTransformer() {
+ }
+
+ /**
+ * Utility function to make input geometry available
+ *
+ * @return the input geometry
+ */
+ public Geometry getInputGeometry() { return inputGeom; }
+
+ public final Geometry transform(Geometry inputGeom)
+ {
+ this.inputGeom = inputGeom;
+ this.factory = inputGeom.getFactory();
+
+ if (inputGeom instanceof Point)
+ return transformPoint((Point) inputGeom, null);
+ if (inputGeom instanceof MultiPoint)
+ return transformMultiPoint((MultiPoint) inputGeom, null);
+ if (inputGeom instanceof LinearRing)
+ return transformLinearRing((LinearRing) inputGeom, null);
+ if (inputGeom instanceof LineString)
+ return transformLineString((LineString) inputGeom, null);
+ if (inputGeom instanceof MultiLineString)
+ return transformMultiLineString((MultiLineString) inputGeom, null);
+ if (inputGeom instanceof Polygon)
+ return transformPolygon((Polygon) inputGeom, null);
+ if (inputGeom instanceof MultiPolygon)
+ return transformMultiPolygon((MultiPolygon) inputGeom, null);
+ if (inputGeom instanceof GeometryCollection)
+ return transformGeometryCollection((GeometryCollection) inputGeom, null);
+
+ throw new IllegalArgumentException("Unknown Geometry subtype: " + inputGeom.getClass().getName());
+ }
+
+ /**
+ * Convenience method which provides standard way of
+ * creating a {@link CoordinateSequence}
+ *
+ * @param coords the coordinate array to copy
+ * @return a coordinate sequence for the array
+ */
+ protected final CoordinateSequence createCoordinateSequence(Coordinate[] coords)
+ {
+ return factory.getCoordinateSequenceFactory().create(coords);
+ }
+
+ /**
+ * Convenience method which provides a standard way of copying {@link CoordinateSequence}s
+ * @param seq the sequence to copy
+ * @return a deep copy of the sequence
+ */
+ protected final CoordinateSequence copy(CoordinateSequence seq)
+ {
+ return seq.copy();
+ }
+
+ /**
+ * Transforms a {@link CoordinateSequence}.
+ * This method should always return a valid coordinate list for
+ * the desired result type. (E.g. a coordinate list for a LineString
+ * must have 0 or at least 2 points).
+ * If this is not possible, return an empty sequence -
+ * this will be pruned out.
+ *
+ * @param coords the coordinates to transform
+ * @param parent the parent geometry
+ * @return the transformed coordinates
+ */
+ protected CoordinateSequence transformCoordinates(CoordinateSequence coords, Geometry parent)
+ {
+ return copy(coords);
+ }
+
+ protected Geometry transformPoint(Point geom, Geometry parent) {
+ return factory.createPoint(
+ transformCoordinates(geom.getCoordinateSequence(), geom));
+ }
+
+ protected Geometry transformMultiPoint(MultiPoint geom, Geometry parent) {
+ List transGeomList = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry transformGeom = transformPoint((Point) geom.getGeometryN(i), geom);
+ if (transformGeom == null) continue;
+ if (transformGeom.isEmpty()) continue;
+ transGeomList.add(transformGeom);
+ }
+ return factory.buildGeometry(transGeomList);
+ }
+
+ /**
+ * Transforms a LinearRing.
+ * The transformation of a LinearRing may result in a coordinate sequence
+ * which does not form a structurally valid ring (i.e. a degenerate ring of 3 or fewer points).
+ * In this case a LineString is returned.
+ * Subclasses may wish to override this method and check for this situation
+ * (e.g. a subclass may choose to eliminate degenerate linear rings)
+ *
+ * @param geom the ring to simplify
+ * @param parent the parent geometry
+ * @return a LinearRing if the transformation resulted in a structurally valid ring
+ * @return a LineString if the transformation caused the LinearRing to collapse to 3 or fewer points
+ */
+ protected Geometry transformLinearRing(LinearRing geom, Geometry parent) {
+ CoordinateSequence seq = transformCoordinates(geom.getCoordinateSequence(), geom);
+ if (seq == null)
+ return factory.createLinearRing((CoordinateSequence) null);
+ int seqSize = seq.size();
+ // ensure a valid LinearRing
+ if (seqSize > 0 && seqSize < 4 && ! preserveType)
+ return factory.createLineString(seq);
+ return factory.createLinearRing(seq);
+ }
+
+ /**
+ * Transforms a {@link LineString} geometry.
+ *
+ * @param geom
+ * @param parent
+ * @return
+ */
+ protected Geometry transformLineString(LineString geom, Geometry parent) {
+ // should check for 1-point sequences and downgrade them to points
+ return factory.createLineString(
+ transformCoordinates(geom.getCoordinateSequence(), geom));
+ }
+
+ protected Geometry transformMultiLineString(MultiLineString geom, Geometry parent) {
+ List transGeomList = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry transformGeom = transformLineString((LineString) geom.getGeometryN(i), geom);
+ if (transformGeom == null) continue;
+ if (transformGeom.isEmpty()) continue;
+ transGeomList.add(transformGeom);
+ }
+ return factory.buildGeometry(transGeomList);
+ }
+
+ protected Geometry transformPolygon(Polygon geom, Geometry parent) {
+ boolean isAllValidLinearRings = true;
+ Geometry shell = transformLinearRing((LinearRing) geom.getExteriorRing(), geom);
+
+ if (shell == null
+ || ! (shell instanceof LinearRing)
+ || shell.isEmpty() )
+ isAllValidLinearRings = false;
+
+ ArrayList holes = new ArrayList();
+ for (int i = 0; i < geom.getNumInteriorRing(); i++) {
+ Geometry hole = transformLinearRing((LinearRing) geom.getInteriorRingN(i), geom);
+ if (hole == null || hole.isEmpty()) {
+ continue;
+ }
+ if (! (hole instanceof LinearRing))
+ isAllValidLinearRings = false;
+
+ holes.add(hole);
+ }
+
+ if (isAllValidLinearRings)
+ return factory.createPolygon((LinearRing) shell,
+ (LinearRing[]) holes.toArray(new LinearRing[] { }));
+ else {
+ List components = new ArrayList();
+ if (shell != null) components.add(shell);
+ components.addAll(holes);
+ return factory.buildGeometry(components);
+ }
+ }
+
+ protected Geometry transformMultiPolygon(MultiPolygon geom, Geometry parent) {
+ List transGeomList = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry transformGeom = transformPolygon((Polygon) geom.getGeometryN(i), geom);
+ if (transformGeom == null) continue;
+ if (transformGeom.isEmpty()) continue;
+ transGeomList.add(transformGeom);
+ }
+ return factory.buildGeometry(transGeomList);
+ }
+
+ protected Geometry transformGeometryCollection(GeometryCollection geom, Geometry parent) {
+ List transGeomList = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry transformGeom = transform(geom.getGeometryN(i));
+ if (transformGeom == null) continue;
+ if (pruneEmptyGeometry && transformGeom.isEmpty()) continue;
+ transGeomList.add(transformGeom);
+ }
+ if (preserveGeometryCollectionType)
+ return factory.createGeometryCollection(GeometryFactory.toGeometryArray(transGeomList));
+ return factory.buildGeometry(transGeomList);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/LineStringExtracter.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/LineStringExtracter.java
new file mode 100644
index 0000000..090f415
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/LineStringExtracter.java
@@ -0,0 +1,93 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+
+/**
+ * Extracts all the {@link LineString} elements from a {@link Geometry}.
+ *
+ * @version 1.7
+ * @see GeometryExtracter
+ */
+public class LineStringExtracter
+ implements GeometryFilter
+{
+ /**
+ * Extracts the {@link LineString} elements from a single {@link Geometry}
+ * and adds them to the provided {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ * @param lines the list to add the extracted LineStrings to
+ * @return the list argument
+ */
+ public static List getLines(Geometry geom, List lines)
+ {
+ if (geom instanceof LineString) {
+ lines.add(geom);
+ }
+ else if (geom instanceof GeometryCollection) {
+ geom.apply(new LineStringExtracter(lines));
+ }
+ // skip non-LineString elemental geometries
+
+ return lines;
+ }
+
+ /**
+ * Extracts the {@link LineString} elements from a single {@link Geometry}
+ * and returns them in a {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ * @return a list containing the linear elements
+ */
+ public static List getLines(Geometry geom)
+ {
+ return getLines(geom, new ArrayList());
+ }
+
+ /**
+ * Extracts the {@link LineString} elements from a single {@link Geometry}
+ * and returns them as either a {@link LineString} or {@link MultiLineString}.
+ *
+ * @param geom the geometry from which to extract
+ * @return a linear geometry
+ */
+ public static Geometry getGeometry(Geometry geom)
+ {
+ return geom.getFactory().buildGeometry(getLines(geom));
+ }
+
+ private List comps;
+
+ /**
+ * Constructs a filter with a list in which to store the elements found.
+ */
+ public LineStringExtracter(List comps)
+ {
+ this.comps = comps;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (geom instanceof LineString) comps.add(geom);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/LinearComponentExtracter.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/LinearComponentExtracter.java
new file mode 100644
index 0000000..66eb2fb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/LinearComponentExtracter.java
@@ -0,0 +1,209 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+
+
+/**
+ * Extracts all the 1-dimensional ({@link LineString}) components from a {@link Geometry}.
+ * For polygonal geometries, this will extract all the component {@link LinearRing}s.
+ * If desired, <code>LinearRing</code>s can be forced to be returned as <code>LineString</code>s.
+ *
+ * @version 1.7
+ */
+public class LinearComponentExtracter
+ implements GeometryComponentFilter
+{
+ /**
+ * Extracts the linear components from a single {@link Geometry}
+ * and adds them to the provided {@link Collection}.
+ *
+ * @param geoms the collection of geometries from which to extract linear components
+ * @param lines the collection to add the extracted linear components to
+ * @return the collection of linear components (LineStrings or LinearRings)
+ */
+ public static Collection getLines(Collection geoms, Collection lines)
+ {
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ getLines(g, lines);
+ }
+ return lines;
+ }
+
+ /**
+ * Extracts the linear components from a single {@link Geometry}
+ * and adds them to the provided {@link Collection}.
+ *
+ * @param geoms the Collection of geometries from which to extract linear components
+ * @param lines the collection to add the extracted linear components to
+ * @param forceToLineString true if LinearRings should be converted to LineStrings
+ * @return the collection of linear components (LineStrings or LinearRings)
+ */
+ public static Collection getLines(Collection geoms, Collection lines, boolean forceToLineString)
+ {
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ getLines(g, lines, forceToLineString);
+ }
+ return lines;
+ }
+
+ /**
+ * Extracts the linear components from a single {@link Geometry}
+ * and adds them to the provided {@link Collection}.
+ *
+ * @param geom the geometry from which to extract linear components
+ * @param lines the Collection to add the extracted linear components to
+ * @return the Collection of linear components (LineStrings or LinearRings)
+ */
+ public static Collection getLines(Geometry geom, Collection lines)
+ {
+ if (geom instanceof LineString) {
+ lines.add(geom);
+ }
+ else {
+ geom.apply(new LinearComponentExtracter(lines));
+ }
+ return lines;
+ }
+
+ /**
+ * Extracts the linear components from a single {@link Geometry}
+ * and adds them to the provided {@link Collection}.
+ *
+ * @param geom the geometry from which to extract linear components
+ * @param lines the Collection to add the extracted linear components to
+ * @param forceToLineString true if LinearRings should be converted to LineStrings
+ * @return the Collection of linear components (LineStrings or LinearRings)
+ */
+ public static Collection getLines(Geometry geom, Collection lines, boolean forceToLineString)
+ {
+ geom.apply(new LinearComponentExtracter(lines, forceToLineString));
+ return lines;
+ }
+
+ /**
+ * Extracts the linear components from a single geometry.
+ * If more than one geometry is to be processed, it is more
+ * efficient to create a single {@link LinearComponentExtracter} instance
+ * and pass it to multiple geometries.
+ *
+ * @param geom the geometry from which to extract linear components
+ * @return the list of linear components
+ */
+ public static List getLines(Geometry geom)
+ {
+ return getLines(geom, false);
+ }
+
+ /**
+ * Extracts the linear components from a single geometry.
+ * If more than one geometry is to be processed, it is more
+ * efficient to create a single {@link LinearComponentExtracter} instance
+ * and pass it to multiple geometries.
+ *
+ * @param geom the geometry from which to extract linear components
+ * @param forceToLineString true if LinearRings should be converted to LineStrings
+ * @return the list of linear components
+ */
+ public static List getLines(Geometry geom, boolean forceToLineString)
+ {
+ List lines = new ArrayList();
+ geom.apply(new LinearComponentExtracter(lines, forceToLineString));
+ return lines;
+ }
+
+ /**
+ * Extracts the linear components from a single {@link Geometry}
+ * and returns them as either a {@link LineString} or {@link MultiLineString}.
+ *
+ * @param geom the geometry from which to extract
+ * @return a linear geometry
+ */
+ public static Geometry getGeometry(Geometry geom)
+ {
+ return geom.getFactory().buildGeometry(getLines(geom));
+ }
+
+
+ /**
+ * Extracts the linear components from a single {@link Geometry}
+ * and returns them as either a {@link LineString} or {@link MultiLineString}.
+ *
+ * @param geom the geometry from which to extract
+ * @param forceToLineString true if LinearRings should be converted to LineStrings
+ * @return a linear geometry
+ */
+ public static Geometry getGeometry(Geometry geom, boolean forceToLineString)
+ {
+ return geom.getFactory().buildGeometry(getLines(geom, forceToLineString));
+ }
+
+
+ private Collection lines;
+ private boolean isForcedToLineString = false;
+
+ /**
+ * Constructs a LineExtracterFilter with a list in which to store LineStrings found.
+ */
+ public LinearComponentExtracter(Collection lines)
+ {
+ this.lines = lines;
+ }
+
+ /**
+ * Constructs a LineExtracterFilter with a list in which to store LineStrings found.
+ */
+ public LinearComponentExtracter(Collection lines, boolean isForcedToLineString)
+ {
+ this.lines = lines;
+ this.isForcedToLineString = isForcedToLineString;
+ }
+
+ /**
+ * Indicates that LinearRing components should be
+ * converted to pure LineStrings.
+ *
+ * @param isForcedToLineString true if LinearRings should be converted to LineStrings
+ */
+ public void setForceToLineString(boolean isForcedToLineString)
+ {
+ this.isForcedToLineString = isForcedToLineString;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (isForcedToLineString && geom instanceof LinearRing) {
+ LineString line = geom.getFactory().createLineString( ((LinearRing) geom).getCoordinateSequence());
+ lines.add(line);
+ return;
+ }
+ // if not being forced, and this is a linear component
+ if (geom instanceof LineString)
+ lines.add(geom);
+
+ // else this is not a linear component, so skip it
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/NoninvertibleTransformationException.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/NoninvertibleTransformationException.java
new file mode 100644
index 0000000..f00f734
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/NoninvertibleTransformationException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+/**
+ * Indicates that an {@link AffineTransformation}
+ * is non-invertible.
+ *
+ * @author Martin Davis
+ */
+public class NoninvertibleTransformationException
+ extends Exception
+{
+ public NoninvertibleTransformationException()
+ {
+ super();
+ }
+ public NoninvertibleTransformationException(String msg)
+ {
+ super(msg);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/PointExtracter.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/PointExtracter.java
new file mode 100644
index 0000000..0bc6157
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/PointExtracter.java
@@ -0,0 +1,81 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.geom.Point;
+
+
+/**
+ * Extracts all the 0-dimensional ({@link Point}) components from a {@link Geometry}.
+ *
+ * @version 1.7
+ * @see GeometryExtracter
+ */
+public class PointExtracter
+ implements GeometryFilter
+{
+ /**
+ * Extracts the {@link Point} elements from a single {@link Geometry}
+ * and adds them to the provided {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ * @param list the list to add the extracted elements to
+ */
+ public static List getPoints(Geometry geom, List list)
+ {
+ if (geom instanceof Point) {
+ list.add(geom);
+ }
+ else if (geom instanceof GeometryCollection) {
+ geom.apply(new PointExtracter(list));
+ }
+ // skip non-Polygonal elemental geometries
+
+ return list;
+ }
+
+ /**
+ * Extracts the {@link Point} elements from a single {@link Geometry}
+ * and returns them in a {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ */
+ public static List getPoints(Geometry geom) {
+ if (geom instanceof Point) {
+ return Collections.singletonList(geom);
+ }
+ return getPoints(geom, new ArrayList());
+ }
+
+ private List pts;
+ /**
+ * Constructs a PointExtracterFilter with a list in which to store Points found.
+ */
+ public PointExtracter(List pts)
+ {
+ this.pts = pts;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (geom instanceof Point) pts.add(geom);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/PolygonExtracter.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/PolygonExtracter.java
new file mode 100644
index 0000000..7e1830d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/PolygonExtracter.java
@@ -0,0 +1,77 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Extracts all the {@link Polygon} elements from a {@link Geometry}.
+ *
+ * @version 1.7
+ * @see GeometryExtracter
+ */
+public class PolygonExtracter
+ implements GeometryFilter
+{
+ /**
+ * Extracts the {@link Polygon} elements from a single {@link Geometry}
+ * and adds them to the provided {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ * @param list the list to add the extracted elements to
+ */
+ public static List getPolygons(Geometry geom, List list)
+ {
+ if (geom instanceof Polygon) {
+ list.add(geom);
+ }
+ else if (geom instanceof GeometryCollection) {
+ geom.apply(new PolygonExtracter(list));
+ }
+ // skip non-Polygonal elemental geometries
+
+ return list;
+ }
+
+ /**
+ * Extracts the {@link Polygon} elements from a single {@link Geometry}
+ * and returns them in a {@link List}.
+ *
+ * @param geom the geometry from which to extract
+ */
+ public static List getPolygons(Geometry geom)
+ {
+ return getPolygons(geom, new ArrayList());
+ }
+
+ private List comps;
+ /**
+ * Constructs a PolygonExtracterFilter with a list in which to store Polygons found.
+ */
+ public PolygonExtracter(List comps)
+ {
+ this.comps = comps;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (geom instanceof Polygon) comps.add(geom);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/ShortCircuitedGeometryVisitor.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/ShortCircuitedGeometryVisitor.java
new file mode 100644
index 0000000..2b8ad54
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/ShortCircuitedGeometryVisitor.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+
+/**
+ * A visitor to {@link Geometry} components, which
+ * allows short-circuiting when a defined condition holds.
+ *
+ * @version 1.7
+ */
+public abstract class ShortCircuitedGeometryVisitor
+{
+ private boolean isDone = false;
+
+ public ShortCircuitedGeometryVisitor() {
+ }
+
+ public void applyTo(Geometry geom) {
+ for (int i = 0; i < geom.getNumGeometries() && ! isDone; i++) {
+ Geometry element = geom.getGeometryN(i);
+ if (! (element instanceof GeometryCollection)) {
+ visit(element);
+ if (isDone()) {
+ isDone = true;
+ return;
+ }
+ }
+ else
+ applyTo(element);
+ }
+ }
+
+ protected abstract void visit(Geometry element);
+
+ protected abstract boolean isDone();
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/SineStarFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/SineStarFactory.java
new file mode 100644
index 0000000..b514ee6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/SineStarFactory.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+/**
+ * Creates geometries which are shaped like multi-armed stars
+ * with each arm shaped like a sine wave.
+ * These kinds of geometries are useful as a more complex
+ * geometry for testing algorithms.
+ *
+ * @author Martin Davis
+ *
+ */
+public class SineStarFactory
+ extends GeometricShapeFactory
+{
+ protected int numArms = 8;
+ protected double armLengthRatio = 0.5;
+
+ /**
+ * Creates a factory which will create sine stars using the default
+ * {@link GeometryFactory}.
+ */
+ public SineStarFactory()
+ {
+ super();
+ }
+
+ /**
+ * Creates a factory which will create sine stars using the given
+ * {@link GeometryFactory}.
+ *
+ * @param geomFact the factory to use
+ */
+ public SineStarFactory(GeometryFactory geomFact)
+ {
+ super(geomFact);
+ }
+
+ /**
+ * Sets the number of arms in the star
+ *
+ * @param numArms the number of arms to generate
+ */
+ public void setNumArms(int numArms)
+ {
+ this.numArms = numArms;
+ }
+
+ /**
+ * Sets the ration of the length of each arm to the distance from the tip
+ * of the arm to the centre of the star.
+ * Value should be between 0.0 and 1.0
+ *
+ * @param armLengthRatio
+ */
+ public void setArmLengthRatio(double armLengthRatio)
+ {
+ this.armLengthRatio = armLengthRatio;
+ }
+
+ /**
+ * Generates the geometry for the sine star
+ *
+ * @return the geometry representing the sine star
+ */
+ public Geometry createSineStar()
+ {
+ Envelope env = dim.getEnvelope();
+ double radius = env.getWidth() / 2.0;
+
+ double armRatio = armLengthRatio;
+ if (armRatio < 0.0)
+ armRatio = 0.0;
+ if (armRatio > 1.0)
+ armRatio = 1.0;
+
+ double armMaxLen = armRatio * radius;
+ double insideRadius = (1 - armRatio) * radius;
+
+ double centreX = env.getMinX() + radius;
+ double centreY = env.getMinY() + radius;
+
+ Coordinate[] pts = new Coordinate[nPts + 1];
+ int iPt = 0;
+ for (int i = 0; i < nPts; i++) {
+ // the fraction of the way thru the current arm - in [0,1]
+ double ptArcFrac = (i / (double) nPts) * numArms;
+ double armAngFrac = ptArcFrac - Math.floor(ptArcFrac);
+
+ // the angle for the current arm - in [0,2Pi]
+ // (each arm is a complete sine wave cycle)
+ double armAng = 2 * Math.PI * armAngFrac;
+ // the current length of the arm
+ double armLenFrac = (Math.cos(armAng) + 1.0) / 2.0;
+
+ // the current radius of the curve (core + arm)
+ double curveRadius = insideRadius + armMaxLen * armLenFrac;
+
+ // the current angle of the curve
+ double ang = i * (2 * Math.PI / nPts);
+ double x = curveRadius * Math.cos(ang) + centreX;
+ double y = curveRadius * Math.sin(ang) + centreY;
+ pts[iPt++] = coord(x, y);
+ }
+ pts[iPt] = new Coordinate(pts[0]);
+
+ LinearRing ring = geomFact.createLinearRing(pts);
+ Polygon poly = geomFact.createPolygon(ring);
+ return poly;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/package.html b/modules/core/src/main/java/org/locationtech/jts/geom/util/package.html
new file mode 100644
index 0000000..ce18f25
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Provides classes that parse and modify Geometry objects.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/Depth.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Depth.java
new file mode 100644
index 0000000..fd39a91
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Depth.java
@@ -0,0 +1,137 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import org.locationtech.jts.geom.Location;
+
+/**
+ * A Depth object records the topological depth of the sides
+ * of an Edge for up to two Geometries.
+ * @version 1.7
+ */
+public class Depth {
+
+ private final static int NULL_VALUE = -1;
+
+ public static int depthAtLocation(int location)
+ {
+ if (location == Location.EXTERIOR) return 0;
+ if (location == Location.INTERIOR) return 1;
+ return NULL_VALUE;
+ }
+
+ private int[][] depth = new int[2][3];
+
+ public Depth() {
+ // initialize depth array to a sentinel value
+ for (int i = 0; i < 2; i++) {
+ for (int j = 0; j < 3; j++) {
+ depth[i][j] = NULL_VALUE;
+ }
+ }
+ }
+
+ public int getDepth(int geomIndex, int posIndex)
+ {
+ return depth[geomIndex][posIndex];
+ }
+ public void setDepth(int geomIndex, int posIndex, int depthValue)
+ {
+ depth[geomIndex][posIndex] = depthValue;
+ }
+ public int getLocation(int geomIndex, int posIndex)
+ {
+ if (depth[geomIndex][posIndex] <= 0) return Location.EXTERIOR;
+ return Location.INTERIOR;
+ }
+ public void add(int geomIndex, int posIndex, int location)
+ {
+ if (location == Location.INTERIOR)
+ depth[geomIndex][posIndex]++;
+ }
+ /**
+ * A Depth object is null (has never been initialized) if all depths are null.
+ */
+ public boolean isNull()
+ {
+ for (int i = 0; i < 2; i++) {
+ for (int j = 0; j < 3; j++) {
+ if (depth[i][j] != NULL_VALUE)
+ return false;
+ }
+ }
+ return true;
+ }
+ public boolean isNull(int geomIndex)
+ {
+ return depth[geomIndex][1] == NULL_VALUE;
+ }
+ public boolean isNull(int geomIndex, int posIndex)
+ {
+ return depth[geomIndex][posIndex] == NULL_VALUE;
+ }
+ public void add(Label lbl)
+ {
+ for (int i = 0; i < 2; i++) {
+ for (int j = 1; j < 3; j++) {
+ int loc = lbl.getLocation(i, j);
+ if (loc == Location.EXTERIOR || loc == Location.INTERIOR) {
+ // initialize depth if it is null, otherwise add this location value
+ if (isNull(i, j)) {
+ depth[i][j] = depthAtLocation(loc);
+ }
+ else
+ depth[i][j] += depthAtLocation(loc);
+ }
+ }
+ }
+ }
+ public int getDelta(int geomIndex)
+ {
+ return depth[geomIndex][Position.RIGHT] - depth[geomIndex][Position.LEFT];
+ }
+ /**
+ * Normalize the depths for each geometry, if they are non-null.
+ * A normalized depth
+ * has depth values in the set { 0, 1 }.
+ * Normalizing the depths
+ * involves reducing the depths by the same amount so that at least
+ * one of them is 0. If the remaining value is > 0, it is set to 1.
+ */
+ public void normalize()
+ {
+ for (int i = 0; i < 2; i++) {
+ if (! isNull(i)) {
+ int minDepth = depth[i][1];
+ if (depth[i][2] < minDepth)
+ minDepth = depth[i][2];
+
+ if (minDepth < 0) minDepth = 0;
+ for (int j = 1; j < 3; j++) {
+ int newValue = 0;
+ if (depth[i][j] > minDepth)
+ newValue = 1;
+ depth[i][j] = newValue;
+ }
+ }
+ }
+ }
+
+ public String toString()
+ {
+ return
+ "A: " + depth[0][1] + "," + depth[0][2]
+ + " B: " + depth[1][1] + "," + depth[1][2];
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/DirectedEdge.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/DirectedEdge.java
new file mode 100644
index 0000000..3be7f21
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/DirectedEdge.java
@@ -0,0 +1,219 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.TopologyException;
+
+
+/**
+ * @version 1.7
+ */
+public class DirectedEdge
+ extends EdgeEnd
+{
+
+ /**
+ * Computes the factor for the change in depth when moving from one location to another.
+ * E.g. if crossing from the INTERIOR to the EXTERIOR the depth decreases, so the factor is -1
+ */
+ public static int depthFactor(int currLocation, int nextLocation)
+ {
+ if (currLocation == Location.EXTERIOR && nextLocation == Location.INTERIOR)
+ return 1;
+ else if (currLocation == Location.INTERIOR && nextLocation == Location.EXTERIOR)
+ return -1;
+ return 0;
+ }
+
+ protected boolean isForward;
+ private boolean isInResult = false;
+ private boolean isVisited = false;
+
+ private DirectedEdge sym; // the symmetric edge
+ private DirectedEdge next; // the next edge in the edge ring for the polygon containing this edge
+ private DirectedEdge nextMin; // the next edge in the MinimalEdgeRing that contains this edge
+ private EdgeRing edgeRing; // the EdgeRing that this edge is part of
+ private EdgeRing minEdgeRing; // the MinimalEdgeRing that this edge is part of
+ /**
+ * The depth of each side (position) of this edge.
+ * The 0 element of the array is never used.
+ */
+ private int[] depth = { 0, -999, -999 };
+
+ public DirectedEdge(Edge edge, boolean isForward)
+ {
+ super(edge);
+ this.isForward = isForward;
+ if (isForward) {
+ init(edge.getCoordinate(0), edge.getCoordinate(1));
+ }
+ else {
+ int n = edge.getNumPoints() - 1;
+ init(edge.getCoordinate(n), edge.getCoordinate(n-1));
+ }
+ computeDirectedLabel();
+ }
+ public Edge getEdge() { return edge; }
+ public void setInResult(boolean isInResult) { this.isInResult = isInResult; }
+ public boolean isInResult() { return isInResult; }
+ public boolean isVisited() { return isVisited; }
+ public void setVisited(boolean isVisited) { this.isVisited = isVisited; }
+ public void setEdgeRing(EdgeRing edgeRing) { this.edgeRing = edgeRing; }
+ public EdgeRing getEdgeRing() { return edgeRing; }
+ public void setMinEdgeRing(EdgeRing minEdgeRing) { this.minEdgeRing = minEdgeRing; }
+ public EdgeRing getMinEdgeRing() { return minEdgeRing; }
+ public int getDepth(int position) { return depth[position]; }
+
+ public void setDepth(int position, int depthVal)
+ {
+ if (depth[position] != -999) {
+// if (depth[position] != depthVal) {
+// Debug.print(this);
+// }
+ if (depth[position] != depthVal)
+ throw new TopologyException("assigned depths do not match", getCoordinate());
+ //Assert.isTrue(depth[position] == depthVal, "assigned depths do not match at " + getCoordinate());
+ }
+ depth[position] = depthVal;
+ }
+
+ public int getDepthDelta()
+ {
+ int depthDelta = edge.getDepthDelta();
+ if (! isForward) depthDelta = -depthDelta;
+ return depthDelta;
+ }
+
+ /**
+ * setVisitedEdge marks both DirectedEdges attached to a given Edge.
+ * This is used for edges corresponding to lines, which will only
+ * appear oriented in a single direction in the result.
+ */
+ public void setVisitedEdge(boolean isVisited)
+ {
+ setVisited(isVisited);
+ sym.setVisited(isVisited);
+ }
+ /**
+ * Each Edge gives rise to a pair of symmetric DirectedEdges, in opposite
+ * directions.
+ * @return the DirectedEdge for the same Edge but in the opposite direction
+ */
+ public DirectedEdge getSym() { return sym; }
+ public boolean isForward() { return isForward; }
+ public void setSym(DirectedEdge de)
+ {
+ sym = de;
+ }
+ public DirectedEdge getNext() { return next; }
+ public void setNext(DirectedEdge next) { this.next = next; }
+ public DirectedEdge getNextMin() { return nextMin; }
+ public void setNextMin(DirectedEdge nextMin) { this.nextMin = nextMin; }
+
+ /**
+ * This edge is a line edge if
+ * <ul>
+ * <li> at least one of the labels is a line label
+ * <li> any labels which are not line labels have all Locations = EXTERIOR
+ * </ul>
+ */
+ public boolean isLineEdge()
+ {
+ boolean isLine = label.isLine(0) || label.isLine(1);
+ boolean isExteriorIfArea0 =
+ ! label.isArea(0) || label.allPositionsEqual(0, Location.EXTERIOR);
+ boolean isExteriorIfArea1 =
+ ! label.isArea(1) || label.allPositionsEqual(1, Location.EXTERIOR);
+
+ return isLine && isExteriorIfArea0 && isExteriorIfArea1;
+ }
+ /**
+ * This is an interior Area edge if
+ * <ul>
+ * <li> its label is an Area label for both Geometries
+ * <li> and for each Geometry both sides are in the interior.
+ * </ul>
+ *
+ * @return true if this is an interior Area edge
+ */
+ public boolean isInteriorAreaEdge()
+ {
+ boolean isInteriorAreaEdge = true;
+ for (int i = 0; i < 2; i++) {
+ if (! ( label.isArea(i)
+ && label.getLocation(i, Position.LEFT ) == Location.INTERIOR
+ && label.getLocation(i, Position.RIGHT) == Location.INTERIOR) ) {
+ isInteriorAreaEdge = false;
+ }
+ }
+ return isInteriorAreaEdge;
+ }
+
+ /**
+ * Compute the label in the appropriate orientation for this DirEdge
+ */
+ private void computeDirectedLabel()
+ {
+ label = new Label(edge.getLabel());
+ if (! isForward)
+ label.flip();
+ }
+
+ /**
+ * Set both edge depths. One depth for a given side is provided. The other is
+ * computed depending on the Location transition and the depthDelta of the edge.
+ */
+ public void setEdgeDepths(int position, int depth)
+ {
+ // get the depth transition delta from R to L for this directed Edge
+ int depthDelta = getEdge().getDepthDelta();
+ if (! isForward) depthDelta = -depthDelta;
+
+ // if moving from L to R instead of R to L must change sign of delta
+ int directionFactor = 1;
+ if (position == Position.LEFT)
+ directionFactor = -1;
+
+ int oppositePos = Position.opposite(position);
+ int delta = depthDelta * directionFactor;
+ //TESTINGint delta = depthDelta * DirectedEdge.depthFactor(loc, oppositeLoc);
+ int oppositeDepth = depth + delta;
+ setDepth(position, depth);
+ setDepth(oppositePos, oppositeDepth);
+ }
+
+ public void print(PrintStream out)
+ {
+ super.print(out);
+ out.print(" " + depth[Position.LEFT] + "/" + depth[Position.RIGHT]);
+ out.print(" (" + getDepthDelta() + ")");
+ //out.print(" " + this.hashCode());
+ //if (next != null) out.print(" next:" + next.hashCode());
+ if (isInResult) out.print(" inResult");
+ }
+ public void printEdge(PrintStream out)
+ {
+ print(out);
+ out.print(" ");
+ if (isForward)
+ edge.print(out);
+ else
+ edge.printReverse(out);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/DirectedEdgeStar.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/DirectedEdgeStar.java
new file mode 100644
index 0000000..6154115
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/DirectedEdgeStar.java
@@ -0,0 +1,389 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A DirectedEdgeStar is an ordered list of <b>outgoing</b> DirectedEdges around a node.
+ * It supports labelling the edges as well as linking the edges to form both
+ * MaximalEdgeRings and MinimalEdgeRings.
+ *
+ * @version 1.7
+ */
+public class DirectedEdgeStar
+ extends EdgeEndStar
+{
+
+ /**
+ * A list of all outgoing edges in the result, in CCW order
+ */
+ private List resultAreaEdgeList;
+ private Label label;
+
+ public DirectedEdgeStar() {
+ }
+ /**
+ * Insert a directed edge in the list
+ */
+ public void insert(EdgeEnd ee)
+ {
+ DirectedEdge de = (DirectedEdge) ee;
+ insertEdgeEnd(de, de);
+ }
+
+ public Label getLabel() { return label; }
+
+ public int getOutgoingDegree()
+ {
+ int degree = 0;
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ if (de.isInResult()) degree++;
+ }
+ return degree;
+ }
+ public int getOutgoingDegree(EdgeRing er)
+ {
+ int degree = 0;
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ if (de.getEdgeRing() == er) degree++;
+ }
+ return degree;
+ }
+
+ public DirectedEdge getRightmostEdge()
+ {
+ List edges = getEdges();
+ int size = edges.size();
+ if (size < 1) return null;
+ DirectedEdge de0 = (DirectedEdge) edges.get(0);
+ if (size == 1) return de0;
+ DirectedEdge deLast = (DirectedEdge) edges.get(size - 1);
+
+ int quad0 = de0.getQuadrant();
+ int quad1 = deLast.getQuadrant();
+ if (Quadrant.isNorthern(quad0) && Quadrant.isNorthern(quad1))
+ return de0;
+ else if (! Quadrant.isNorthern(quad0) && ! Quadrant.isNorthern(quad1))
+ return deLast;
+ else {
+ // edges are in different hemispheres - make sure we return one that is non-horizontal
+ //Assert.isTrue(de0.getDy() != 0, "should never return horizontal edge!");
+ DirectedEdge nonHorizontalEdge = null;
+ if (de0.getDy() != 0)
+ return de0;
+ else if (deLast.getDy() != 0)
+ return deLast;
+ }
+ Assert.shouldNeverReachHere("found two horizontal edges incident on node");
+ return null;
+
+ }
+ /**
+ * Compute the labelling for all dirEdges in this star, as well
+ * as the overall labelling
+ */
+ public void computeLabelling(GeometryGraph[] geom)
+ {
+//Debug.print(this);
+ super.computeLabelling(geom);
+
+ // determine the overall labelling for this DirectedEdgeStar
+ // (i.e. for the node it is based at)
+ label = new Label(Location.NONE);
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd ee = (EdgeEnd) it.next();
+ Edge e = ee.getEdge();
+ Label eLabel = e.getLabel();
+ for (int i = 0; i < 2; i++) {
+ int eLoc = eLabel.getLocation(i);
+ if (eLoc == Location.INTERIOR || eLoc == Location.BOUNDARY)
+ label.setLocation(i, Location.INTERIOR);
+ }
+ }
+//Debug.print(this);
+ }
+
+ /**
+ * For each dirEdge in the star,
+ * merge the label from the sym dirEdge into the label
+ */
+ public void mergeSymLabels()
+ {
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ Label label = de.getLabel();
+ label.merge(de.getSym().getLabel());
+ }
+ }
+
+ /**
+ * Update incomplete dirEdge labels from the labelling for the node
+ */
+ public void updateLabelling(Label nodeLabel)
+ {
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ Label label = de.getLabel();
+ label.setAllLocationsIfNull(0, nodeLabel.getLocation(0));
+ label.setAllLocationsIfNull(1, nodeLabel.getLocation(1));
+ }
+ }
+
+ private List getResultAreaEdges()
+ {
+//print(System.out);
+ if (resultAreaEdgeList != null) return resultAreaEdgeList;
+ resultAreaEdgeList = new ArrayList();
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ if (de.isInResult() || de.getSym().isInResult() )
+ resultAreaEdgeList.add(de);
+ }
+ return resultAreaEdgeList;
+ }
+
+ private final int SCANNING_FOR_INCOMING = 1;
+ private final int LINKING_TO_OUTGOING = 2;
+ /**
+ * Traverse the star of DirectedEdges, linking the included edges together.
+ * To link two dirEdges, the <code>next</code> pointer for an incoming dirEdge
+ * is set to the next outgoing edge.
+ * <p>
+ * DirEdges are only linked if:
+ * <ul>
+ * <li>they belong to an area (i.e. they have sides)
+ * <li>they are marked as being in the result
+ * </ul>
+ * <p>
+ * Edges are linked in CCW order (the order they are stored).
+ * This means that rings have their face on the Right
+ * (in other words,
+ * the topological location of the face is given by the RHS label of the DirectedEdge)
+ * <p>
+ * PRECONDITION: No pair of dirEdges are both marked as being in the result
+ */
+ public void linkResultDirectedEdges()
+ {
+ // make sure edges are copied to resultAreaEdges list
+ getResultAreaEdges();
+ // find first area edge (if any) to start linking at
+ DirectedEdge firstOut = null;
+ DirectedEdge incoming = null;
+ int state = SCANNING_FOR_INCOMING;
+ // link edges in CCW order
+ for (int i = 0; i < resultAreaEdgeList.size(); i++) {
+ DirectedEdge nextOut = (DirectedEdge) resultAreaEdgeList.get(i);
+ DirectedEdge nextIn = nextOut.getSym();
+
+ // skip de's that we're not interested in
+ if (! nextOut.getLabel().isArea()) continue;
+
+ // record first outgoing edge, in order to link the last incoming edge
+ if (firstOut == null && nextOut.isInResult()) firstOut = nextOut;
+ // assert: sym.isInResult() == false, since pairs of dirEdges should have been removed already
+
+ switch (state) {
+ case SCANNING_FOR_INCOMING:
+ if (! nextIn.isInResult()) continue;
+ incoming = nextIn;
+ state = LINKING_TO_OUTGOING;
+ break;
+ case LINKING_TO_OUTGOING:
+ if (! nextOut.isInResult()) continue;
+ incoming.setNext(nextOut);
+ state = SCANNING_FOR_INCOMING;
+ break;
+ }
+ }
+//Debug.print(this);
+ if (state == LINKING_TO_OUTGOING) {
+//Debug.print(firstOut == null, this);
+ if (firstOut == null)
+ throw new TopologyException("no outgoing dirEdge found", getCoordinate());
+ //Assert.isTrue(firstOut != null, "no outgoing dirEdge found (at " + getCoordinate() );
+ Assert.isTrue(firstOut.isInResult(), "unable to link last incoming dirEdge");
+ incoming.setNext(firstOut);
+ }
+ }
+ public void linkMinimalDirectedEdges(EdgeRing er)
+ {
+ // find first area edge (if any) to start linking at
+ DirectedEdge firstOut = null;
+ DirectedEdge incoming = null;
+ int state = SCANNING_FOR_INCOMING;
+ // link edges in CW order
+ for (int i = resultAreaEdgeList.size() - 1; i >= 0; i--) {
+ DirectedEdge nextOut = (DirectedEdge) resultAreaEdgeList.get(i);
+ DirectedEdge nextIn = nextOut.getSym();
+
+ // record first outgoing edge, in order to link the last incoming edge
+ if (firstOut == null && nextOut.getEdgeRing() == er) firstOut = nextOut;
+
+ switch (state) {
+ case SCANNING_FOR_INCOMING:
+ if (nextIn.getEdgeRing() != er) continue;
+ incoming = nextIn;
+ state = LINKING_TO_OUTGOING;
+ break;
+ case LINKING_TO_OUTGOING:
+ if (nextOut.getEdgeRing() != er) continue;
+ incoming.setNextMin(nextOut);
+ state = SCANNING_FOR_INCOMING;
+ break;
+ }
+ }
+//print(System.out);
+ if (state == LINKING_TO_OUTGOING) {
+ Assert.isTrue(firstOut != null, "found null for first outgoing dirEdge");
+ Assert.isTrue(firstOut.getEdgeRing() == er, "unable to link last incoming dirEdge");
+ incoming.setNextMin(firstOut);
+ }
+ }
+ public void linkAllDirectedEdges()
+ {
+ getEdges();
+ // find first area edge (if any) to start linking at
+ DirectedEdge prevOut = null;
+ DirectedEdge firstIn = null;
+ // link edges in CW order
+ for (int i = edgeList.size() - 1; i >= 0; i--) {
+ DirectedEdge nextOut = (DirectedEdge) edgeList.get(i);
+ DirectedEdge nextIn = nextOut.getSym();
+ if (firstIn == null) firstIn = nextIn;
+ if (prevOut != null) nextIn.setNext(prevOut);
+ // record outgoing edge, in order to link the last incoming edge
+ prevOut = nextOut;
+ }
+ firstIn.setNext(prevOut);
+//Debug.print(this);
+ }
+
+ /**
+ * Traverse the star of edges, maintaining the current location in the result
+ * area at this node (if any).
+ * If any L edges are found in the interior of the result, mark them as covered.
+ */
+ public void findCoveredLineEdges()
+ {
+//Debug.print("findCoveredLineEdges");
+//Debug.print(this);
+ // Since edges are stored in CCW order around the node,
+ // as we move around the ring we move from the right to the left side of the edge
+
+ /**
+ * Find first DirectedEdge of result area (if any).
+ * The interior of the result is on the RHS of the edge,
+ * so the start location will be:
+ * - INTERIOR if the edge is outgoing
+ * - EXTERIOR if the edge is incoming
+ */
+ int startLoc = Location.NONE ;
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge nextOut = (DirectedEdge) it.next();
+ DirectedEdge nextIn = nextOut.getSym();
+ if (! nextOut.isLineEdge()) {
+ if (nextOut.isInResult()) {
+ startLoc = Location.INTERIOR;
+ break;
+ }
+ if (nextIn.isInResult()) {
+ startLoc = Location.EXTERIOR;
+ break;
+ }
+ }
+ }
+ // no A edges found, so can't determine if L edges are covered or not
+ if (startLoc == Location.NONE) return;
+
+ /**
+ * move around ring, keeping track of the current location
+ * (Interior or Exterior) for the result area.
+ * If L edges are found, mark them as covered if they are in the interior
+ */
+ int currLoc = startLoc;
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge nextOut = (DirectedEdge) it.next();
+ DirectedEdge nextIn = nextOut.getSym();
+ if (nextOut.isLineEdge()) {
+ nextOut.getEdge().setCovered(currLoc == Location.INTERIOR);
+//Debug.println(nextOut);
+ }
+ else { // edge is an Area edge
+ if (nextOut.isInResult())
+ currLoc = Location.EXTERIOR;
+ if (nextIn.isInResult())
+ currLoc = Location.INTERIOR;
+ }
+ }
+ }
+
+ public void computeDepths(DirectedEdge de)
+ {
+ int edgeIndex = findIndex(de);
+ Label label = de.getLabel();
+ int startDepth = de.getDepth(Position.LEFT);
+ int targetLastDepth = de.getDepth(Position.RIGHT);
+ // compute the depths from this edge up to the end of the edge array
+ int nextDepth = computeDepths(edgeIndex + 1, edgeList.size(), startDepth);
+ // compute the depths for the initial part of the array
+ int lastDepth = computeDepths(0, edgeIndex, nextDepth);
+//Debug.print(lastDepth != targetLastDepth, this);
+//Debug.print(lastDepth != targetLastDepth, "mismatch: " + lastDepth + " / " + targetLastDepth);
+ if (lastDepth != targetLastDepth)
+ throw new TopologyException("depth mismatch at " + de.getCoordinate());
+ //Assert.isTrue(lastDepth == targetLastDepth, "depth mismatch at " + de.getCoordinate());
+ }
+
+ /**
+ * Compute the DirectedEdge depths for a subsequence of the edge array.
+ *
+ * @return the last depth assigned (from the R side of the last edge visited)
+ */
+ private int computeDepths(int startIndex, int endIndex, int startDepth)
+ {
+ int currDepth = startDepth;
+ for (int i = startIndex; i < endIndex ; i++) {
+ DirectedEdge nextDe = (DirectedEdge) edgeList.get(i);
+ Label label = nextDe.getLabel();
+ nextDe.setEdgeDepths(Position.RIGHT, currDepth);
+ currDepth = nextDe.getDepth(Position.LEFT);
+ }
+ return currDepth;
+ }
+
+ public void print(PrintStream out)
+ {
+ System.out.println("DirectedEdgeStar: " + getCoordinate());
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ out.print("out ");
+ de.print(out);
+ out.println();
+ out.print("in ");
+ de.getSym().print(out);
+ out.println();
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/Edge.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Edge.java
new file mode 100644
index 0000000..7dc0b8b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Edge.java
@@ -0,0 +1,270 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.geomgraph.index.MonotoneChainEdge;
+
+
+/**
+ * @version 1.7
+ */
+public class Edge
+ extends GraphComponent
+{
+
+ /**
+ * Updates an IM from the label for an edge.
+ * Handles edges from both L and A geometries.
+ */
+ public static void updateIM(Label label, IntersectionMatrix im)
+ {
+ im.setAtLeastIfValid(label.getLocation(0, Position.ON), label.getLocation(1, Position.ON), 1);
+ if (label.isArea()) {
+ im.setAtLeastIfValid(label.getLocation(0, Position.LEFT), label.getLocation(1, Position.LEFT), 2);
+ im.setAtLeastIfValid(label.getLocation(0, Position.RIGHT), label.getLocation(1, Position.RIGHT), 2);
+ }
+ }
+
+ Coordinate[] pts;
+ private Envelope env;
+ EdgeIntersectionList eiList = new EdgeIntersectionList(this);
+ private String name;
+ private MonotoneChainEdge mce;
+ private boolean isIsolated = true;
+ private Depth depth = new Depth();
+ private int depthDelta = 0; // the change in area depth from the R to L side of this edge
+
+ public Edge(Coordinate[] pts, Label label)
+ {
+ this.pts = pts;
+ this.label = label;
+ }
+ public Edge(Coordinate[] pts)
+ {
+ this(pts, null);
+ }
+
+ public int getNumPoints() { return pts.length; }
+ public void setName(String name) { this.name = name; }
+ public Coordinate[] getCoordinates() { return pts; }
+ public Coordinate getCoordinate(int i)
+ {
+ return pts[i];
+ }
+ public Coordinate getCoordinate()
+ {
+ if (pts.length > 0) return pts[0];
+ return null;
+ }
+ public Envelope getEnvelope()
+ {
+ // compute envelope lazily
+ if (env == null) {
+ env = new Envelope();
+ for (int i = 0; i < pts.length; i++) {
+ env.expandToInclude(pts[i]);
+ }
+ }
+ return env;
+ }
+
+ public Depth getDepth() { return depth; }
+
+ /**
+ * The depthDelta is the change in depth as an edge is crossed from R to L
+ * @return the change in depth as the edge is crossed from R to L
+ */
+ public int getDepthDelta() { return depthDelta; }
+ public void setDepthDelta(int depthDelta) { this.depthDelta = depthDelta; }
+
+ public int getMaximumSegmentIndex()
+ {
+ return pts.length - 1;
+ }
+ public EdgeIntersectionList getEdgeIntersectionList() { return eiList; }
+
+ public MonotoneChainEdge getMonotoneChainEdge()
+ {
+ if (mce == null) mce = new MonotoneChainEdge(this);
+ return mce;
+ }
+
+ public boolean isClosed()
+ {
+ return pts[0].equals(pts[pts.length - 1]);
+ }
+ /**
+ * An Edge is collapsed if it is an Area edge and it consists of
+ * two segments which are equal and opposite (eg a zero-width V).
+ */
+ public boolean isCollapsed()
+ {
+ if (! label.isArea()) return false;
+ if (pts.length != 3) return false;
+ if (pts[0].equals(pts[2]) ) return true;
+ return false;
+ }
+ public Edge getCollapsedEdge()
+ {
+ Coordinate newPts[] = new Coordinate[2];
+ newPts[0] = pts[0];
+ newPts[1] = pts[1];
+ Edge newe = new Edge(newPts, Label.toLineLabel(label));
+ return newe;
+ }
+
+ public void setIsolated(boolean isIsolated)
+ {
+ this.isIsolated = isIsolated;
+ }
+ public boolean isIsolated()
+ {
+ return isIsolated;
+ }
+
+ /**
+ * Adds EdgeIntersections for one or both
+ * intersections found for a segment of an edge to the edge intersection list.
+ */
+ public void addIntersections(LineIntersector li, int segmentIndex, int geomIndex)
+ {
+ for (int i = 0; i < li.getIntersectionNum(); i++) {
+ addIntersection(li, segmentIndex, geomIndex, i);
+ }
+ }
+ /**
+ * Add an EdgeIntersection for intersection intIndex.
+ * An intersection that falls exactly on a vertex of the edge is normalized
+ * to use the higher of the two possible segmentIndexes
+ */
+ public void addIntersection(LineIntersector li, int segmentIndex, int geomIndex, int intIndex)
+ {
+ Coordinate intPt = new Coordinate(li.getIntersection(intIndex));
+ int normalizedSegmentIndex = segmentIndex;
+ double dist = li.getEdgeDistance(geomIndex, intIndex);
+//Debug.println("edge intpt: " + intPt + " dist: " + dist);
+ // normalize the intersection point location
+ int nextSegIndex = normalizedSegmentIndex + 1;
+ if (nextSegIndex < pts.length) {
+ Coordinate nextPt = pts[nextSegIndex];
+//Debug.println("next pt: " + nextPt);
+
+ // Normalize segment index if intPt falls on vertex
+ // The check for point equality is 2D only - Z values are ignored
+ if (intPt.equals2D(nextPt)) {
+//Debug.println("normalized distance");
+ normalizedSegmentIndex = nextSegIndex;
+ dist = 0.0;
+ }
+ }
+ /**
+ * Add the intersection point to edge intersection list.
+ */
+ EdgeIntersection ei = eiList.add(intPt, normalizedSegmentIndex, dist);
+//ei.print(System.out);
+
+ }
+
+ /**
+ * Update the IM with the contribution for this component.
+ * A component only contributes if it has a labelling for both parent geometries
+ */
+ public void computeIM(IntersectionMatrix im)
+ {
+ updateIM(label, im);
+ }
+
+ /**
+ * equals is defined to be:
+ * <p>
+ * e1 equals e2
+ * <b>iff</b>
+ * the coordinates of e1 are the same or the reverse of the coordinates in e2
+ */
+ public boolean equals(Object o)
+ {
+ if (! (o instanceof Edge)) return false;
+ Edge e = (Edge) o;
+
+ if (pts.length != e.pts.length) return false;
+
+ boolean isEqualForward = true;
+ boolean isEqualReverse = true;
+ int iRev = pts.length;
+ for (int i = 0; i < pts.length; i++) {
+ if (! pts[i].equals2D(e.pts[i])) {
+ isEqualForward = false;
+ }
+ if (! pts[i].equals2D(e.pts[--iRev])) {
+ isEqualReverse = false;
+ }
+ if (! isEqualForward && ! isEqualReverse) return false;
+ }
+ return true;
+ }
+
+ /**
+ * @return true if the coordinate sequences of the Edges are identical
+ */
+ public boolean isPointwiseEqual(Edge e)
+ {
+ if (pts.length != e.pts.length) return false;
+
+ for (int i = 0; i < pts.length; i++) {
+ if (! pts[i].equals2D(e.pts[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append("edge " + name + ": ");
+ builder.append("LINESTRING (");
+ for (int i = 0; i < pts.length; i++) {
+ if (i > 0) builder.append(",");
+ builder.append(pts[i].x + " " + pts[i].y);
+ }
+ builder.append(") " + label + " " + depthDelta);
+ return builder.toString();
+ }
+ public void print(PrintStream out)
+ {
+ out.print("edge " + name + ": ");
+ out.print("LINESTRING (");
+ for (int i = 0; i < pts.length; i++) {
+ if (i > 0) out.print(",");
+ out.print(pts[i].x + " " + pts[i].y);
+ }
+ out.print(") " + label + " " + depthDelta);
+ }
+ public void printReverse(PrintStream out)
+ {
+ out.print("edge " + name + ": ");
+ for (int i = pts.length - 1; i >= 0; i--) {
+ out.print(pts[i] + " ");
+ }
+ out.println("");
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeEnd.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeEnd.java
new file mode 100644
index 0000000..b669755
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeEnd.java
@@ -0,0 +1,129 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Models the end of an edge incident on a node.
+ * EdgeEnds have a direction
+ * determined by the direction of the ray from the initial
+ * point to the next point.
+ * EdgeEnds are comparable under the ordering
+ * "a has a greater angle with the x-axis than b".
+ * This ordering is used to sort EdgeEnds around a node.
+ * @version 1.7
+ */
+public class EdgeEnd
+ implements Comparable
+{
+ protected Edge edge; // the parent edge of this edge end
+ protected Label label;
+
+ private Node node; // the node this edge end originates at
+ private Coordinate p0, p1; // points of initial line segment
+ private double dx, dy; // the direction vector for this edge from its starting point
+ private int quadrant;
+
+ protected EdgeEnd(Edge edge)
+ {
+ this.edge = edge;
+ }
+ public EdgeEnd(Edge edge, Coordinate p0, Coordinate p1) {
+ this(edge, p0, p1, null);
+ }
+ public EdgeEnd(Edge edge, Coordinate p0, Coordinate p1, Label label) {
+ this(edge);
+ init(p0, p1);
+ this.label = label;
+ }
+
+ protected void init(Coordinate p0, Coordinate p1)
+ {
+ this.p0 = p0;
+ this.p1 = p1;
+ dx = p1.x - p0.x;
+ dy = p1.y - p0.y;
+ quadrant = Quadrant.quadrant(dx, dy);
+ Assert.isTrue(! (dx == 0 && dy == 0), "EdgeEnd with identical endpoints found");
+ }
+
+ public Edge getEdge() { return edge; }
+ public Label getLabel() { return label; }
+ public Coordinate getCoordinate() { return p0; }
+ public Coordinate getDirectedCoordinate() { return p1; }
+ public int getQuadrant() { return quadrant; }
+ public double getDx() { return dx; }
+ public double getDy() { return dy; }
+
+ public void setNode(Node node) { this.node = node; }
+ public Node getNode() { return node; }
+
+ public int compareTo(Object obj)
+ {
+ EdgeEnd e = (EdgeEnd) obj;
+ return compareDirection(e);
+ }
+ /**
+ * Implements the total order relation:
+ * <p>
+ * a has a greater angle with the positive x-axis than b
+ * <p>
+ * Using the obvious algorithm of simply computing the angle is not robust,
+ * since the angle calculation is obviously susceptible to roundoff.
+ * A robust algorithm is:
+ * - first compare the quadrant. If the quadrants
+ * are different, it it trivial to determine which vector is "greater".
+ * - if the vectors lie in the same quadrant, the computeOrientation function
+ * can be used to decide the relative orientation of the vectors.
+ */
+ public int compareDirection(EdgeEnd e)
+ {
+ if (dx == e.dx && dy == e.dy)
+ return 0;
+ // if the rays are in different quadrants, determining the ordering is trivial
+ if (quadrant > e.quadrant) return 1;
+ if (quadrant < e.quadrant) return -1;
+ // vectors are in the same quadrant - check relative orientation of direction vectors
+ // this is > e if it is CCW of e
+ return Orientation.index(e.p0, e.p1, p1);
+ }
+
+ public void computeLabel(BoundaryNodeRule boundaryNodeRule)
+ {
+ // subclasses should override this if they are using labels
+ }
+ public void print(PrintStream out)
+ {
+ double angle = Math.atan2(dy, dx);
+ String className = getClass().getName();
+ int lastDotPos = className.lastIndexOf('.');
+ String name = className.substring(lastDotPos + 1);
+ out.print(" " + name + ": " + p0 + " - " + p1 + " " + quadrant + ":" + angle + " " + label);
+ }
+ public String toString()
+ {
+ double angle = Math.atan2(dy, dx);
+ String className = getClass().getName();
+ int lastDotPos = className.lastIndexOf('.');
+ String name = className.substring(lastDotPos + 1);
+ return " " + name + ": " + p0 + " - " + p1 + " " + quadrant + ":" + angle + " " + label;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeEndStar.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeEndStar.java
new file mode 100644
index 0000000..445dead
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeEndStar.java
@@ -0,0 +1,338 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.algorithm.locate.SimplePointInAreaLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A EdgeEndStar is an ordered list of EdgeEnds around a node.
+ * They are maintained in CCW order (starting with the positive x-axis) around the node
+ * for efficient lookup and topology building.
+ *
+ * @version 1.7
+ */
+abstract public class EdgeEndStar
+{
+
+ /**
+ * A map which maintains the edges in sorted order around the node
+ */
+ protected Map edgeMap = new TreeMap();
+ /**
+ * A list of all outgoing edges in the result, in CCW order
+ */
+ protected List edgeList;
+ /**
+ * The location of the point for this star in Geometry i Areas
+ */
+ private int[] ptInAreaLocation = { Location.NONE, Location.NONE };
+
+ public EdgeEndStar()
+ {
+
+ }
+
+ /**
+ * Insert a EdgeEnd into this EdgeEndStar
+ */
+ abstract public void insert(EdgeEnd e);
+
+ /**
+ * Insert an EdgeEnd into the map, and clear the edgeList cache,
+ * since the list of edges has now changed
+ */
+ protected void insertEdgeEnd(EdgeEnd e, Object obj)
+ {
+ edgeMap.put(e, obj);
+ edgeList = null; // edge list has changed - clear the cache
+ }
+
+ /**
+ * @return the coordinate for the node this star is based at
+ */
+ public Coordinate getCoordinate()
+ {
+ Iterator it = iterator();
+ if (! it.hasNext()) return null;
+ EdgeEnd e = (EdgeEnd) it.next();
+ return e.getCoordinate();
+ }
+ public int getDegree()
+ {
+ return edgeMap.size();
+ }
+
+ /**
+ * Iterator access to the ordered list of edges is optimized by
+ * copying the map collection to a list. (This assumes that
+ * once an iterator is requested, it is likely that insertion into
+ * the map is complete).
+ */
+ public Iterator iterator()
+ {
+ return getEdges().iterator();
+ }
+ public List getEdges()
+ {
+ if (edgeList == null) {
+ edgeList = new ArrayList(edgeMap.values());
+ }
+ return edgeList;
+ }
+ public EdgeEnd getNextCW(EdgeEnd ee)
+ {
+ getEdges();
+ int i = edgeList.indexOf(ee);
+ int iNextCW = i - 1;
+ if (i == 0)
+ iNextCW = edgeList.size() - 1;
+ return (EdgeEnd) edgeList.get(iNextCW);
+ }
+
+ public void computeLabelling(GeometryGraph[] geomGraph)
+ {
+ computeEdgeEndLabels(geomGraph[0].getBoundaryNodeRule());
+ // Propagate side labels around the edges in the star
+ // for each parent Geometry
+//Debug.print(this);
+ propagateSideLabels(0);
+//Debug.print(this);
+//Debug.printIfWatch(this);
+ propagateSideLabels(1);
+//Debug.print(this);
+//Debug.printIfWatch(this);
+
+ /**
+ * If there are edges that still have null labels for a geometry
+ * this must be because there are no area edges for that geometry incident on this node.
+ * In this case, to label the edge for that geometry we must test whether the
+ * edge is in the interior of the geometry.
+ * To do this it suffices to determine whether the node for the edge is in the interior of an area.
+ * If so, the edge has location INTERIOR for the geometry.
+ * In all other cases (e.g. the node is on a line, on a point, or not on the geometry at all) the edge
+ * has the location EXTERIOR for the geometry.
+ * <p>
+ * Note that the edge cannot be on the BOUNDARY of the geometry, since then
+ * there would have been a parallel edge from the Geometry at this node also labelled BOUNDARY
+ * and this edge would have been labelled in the previous step.
+ * <p>
+ * This code causes a problem when dimensional collapses are present, since it may try and
+ * determine the location of a node where a dimensional collapse has occurred.
+ * The point should be considered to be on the EXTERIOR
+ * of the polygon, but locate() will return INTERIOR, since it is passed
+ * the original Geometry, not the collapsed version.
+ *
+ * If there are incident edges which are Line edges labelled BOUNDARY,
+ * then they must be edges resulting from dimensional collapses.
+ * In this case the other edges can be labelled EXTERIOR for this Geometry.
+ *
+ * MD 8/11/01 - NOT TRUE! The collapsed edges may in fact be in the interior of the Geometry,
+ * which means the other edges should be labelled INTERIOR for this Geometry.
+ * Not sure how solve this... Possibly labelling needs to be split into several phases:
+ * area label propagation, symLabel merging, then finally null label resolution.
+ */
+ boolean[] hasDimensionalCollapseEdge = { false, false };
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ Label label = e.getLabel();
+ for (int geomi = 0; geomi < 2; geomi++) {
+ if (label.isLine(geomi) && label.getLocation(geomi) == Location.BOUNDARY)
+ hasDimensionalCollapseEdge[geomi] = true;
+ }
+ }
+//Debug.print(this);
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ Label label = e.getLabel();
+//Debug.println(e);
+ for (int geomi = 0; geomi < 2; geomi++) {
+ if (label.isAnyNull(geomi)) {
+ int loc = Location.NONE;
+ if (hasDimensionalCollapseEdge[geomi]) {
+ loc = Location.EXTERIOR;
+ }
+ else {
+ Coordinate p = e.getCoordinate();
+ loc = getLocation(geomi, p, geomGraph);
+ }
+ label.setAllLocationsIfNull(geomi, loc);
+ }
+ }
+//Debug.println(e);
+ }
+//Debug.print(this);
+//Debug.printIfWatch(this);
+ }
+
+ private void computeEdgeEndLabels(BoundaryNodeRule boundaryNodeRule)
+ {
+ // Compute edge label for each EdgeEnd
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd ee = (EdgeEnd) it.next();
+ ee.computeLabel(boundaryNodeRule);
+ }
+ }
+
+ private int getLocation(int geomIndex, Coordinate p, GeometryGraph[] geom)
+ {
+ // compute location only on demand
+ if (ptInAreaLocation[geomIndex] == Location.NONE) {
+ ptInAreaLocation[geomIndex] = SimplePointInAreaLocator.locate(p, geom[geomIndex].getGeometry());
+ }
+ return ptInAreaLocation[geomIndex];
+ }
+
+ public boolean isAreaLabelsConsistent(GeometryGraph geomGraph)
+ {
+ computeEdgeEndLabels(geomGraph.getBoundaryNodeRule());
+ return checkAreaLabelsConsistent(0);
+ }
+
+ private boolean checkAreaLabelsConsistent(int geomIndex)
+ {
+ // Since edges are stored in CCW order around the node,
+ // As we move around the ring we move from the right to the left side of the edge
+ List edges = getEdges();
+ // if no edges, trivially consistent
+ if (edges.size() <= 0)
+ return true;
+ // initialize startLoc to location of last L side (if any)
+ int lastEdgeIndex = edges.size() - 1;
+ Label startLabel = ((EdgeEnd) edges.get(lastEdgeIndex)).getLabel();
+ int startLoc = startLabel.getLocation(geomIndex, Position.LEFT);
+ Assert.isTrue(startLoc != Location.NONE, "Found unlabelled area edge");
+
+ int currLoc = startLoc;
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ Label label = e.getLabel();
+ // we assume that we are only checking a area
+ Assert.isTrue(label.isArea(geomIndex), "Found non-area edge");
+ int leftLoc = label.getLocation(geomIndex, Position.LEFT);
+ int rightLoc = label.getLocation(geomIndex, Position.RIGHT);
+//System.out.println(leftLoc + " " + rightLoc);
+//Debug.print(this);
+ // check that edge is really a boundary between inside and outside!
+ if (leftLoc == rightLoc) {
+ return false;
+ }
+ // check side location conflict
+ //Assert.isTrue(rightLoc == currLoc, "side location conflict " + locStr);
+ if (rightLoc != currLoc) {
+//Debug.print(this);
+ return false;
+ }
+ currLoc = leftLoc;
+ }
+ return true;
+ }
+ void propagateSideLabels(int geomIndex)
+ {
+ // Since edges are stored in CCW order around the node,
+ // As we move around the ring we move from the right to the left side of the edge
+ int startLoc = Location.NONE ;
+
+ // initialize loc to location of last L side (if any)
+//System.out.println("finding start location");
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ Label label = e.getLabel();
+ if (label.isArea(geomIndex) && label.getLocation(geomIndex, Position.LEFT) != Location.NONE)
+ startLoc = label.getLocation(geomIndex, Position.LEFT);
+ }
+
+ // no labelled sides found, so no labels to propagate
+ if (startLoc == Location.NONE) return;
+
+ int currLoc = startLoc;
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ Label label = e.getLabel();
+ // set null ON values to be in current location
+ if (label.getLocation(geomIndex, Position.ON) == Location.NONE)
+ label.setLocation(geomIndex, Position.ON, currLoc);
+ // set side labels (if any)
+ if (label.isArea(geomIndex)) {
+ int leftLoc = label.getLocation(geomIndex, Position.LEFT);
+ int rightLoc = label.getLocation(geomIndex, Position.RIGHT);
+ // if there is a right location, that is the next location to propagate
+ if (rightLoc != Location.NONE) {
+//Debug.print(rightLoc != currLoc, this);
+ if (rightLoc != currLoc)
+ throw new TopologyException("side location conflict", e.getCoordinate());
+ if (leftLoc == Location.NONE) {
+ Assert.shouldNeverReachHere("found single null side (at " + e.getCoordinate() + ")");
+ }
+ currLoc = leftLoc;
+ }
+ else {
+ /** RHS is null - LHS must be null too.
+ * This must be an edge from the other geometry, which has no location
+ * labelling for this geometry. This edge must lie wholly inside or outside
+ * the other geometry (which is determined by the current location).
+ * Assign both sides to be the current location.
+ */
+ Assert.isTrue(label.getLocation(geomIndex, Position.LEFT) == Location.NONE, "found single null side");
+ label.setLocation(geomIndex, Position.RIGHT, currLoc);
+ label.setLocation(geomIndex, Position.LEFT, currLoc);
+ }
+ }
+ }
+ }
+
+ public int findIndex(EdgeEnd eSearch)
+ {
+ iterator(); // force edgelist to be computed
+ for (int i = 0; i < edgeList.size(); i++ ) {
+ EdgeEnd e = (EdgeEnd) edgeList.get(i);
+ if (e == eSearch) return i;
+ }
+ return -1;
+ }
+
+ public void print(PrintStream out)
+ {
+ System.out.println("EdgeEndStar: " + getCoordinate());
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ e.print(out);
+ }
+ }
+
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("EdgeEndStar: " + getCoordinate());
+ buf.append("\n");
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ buf.append(e);
+ buf.append("\n");
+ }
+ return buf.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeIntersection.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeIntersection.java
new file mode 100644
index 0000000..e47af9b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeIntersection.java
@@ -0,0 +1,87 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Represents a point on an
+ * edge which intersects with another edge.
+ * <p>
+ * The intersection may either be a single point, or a line segment
+ * (in which case this point is the start of the line segment)
+ * The intersection point must be precise.
+ *
+ * @version 1.7
+ */
+public class EdgeIntersection
+ implements Comparable
+{
+
+ public Coordinate coord; // the point of intersection
+ public int segmentIndex; // the index of the containing line segment in the parent edge
+ public double dist; // the edge distance of this point along the containing line segment
+
+ public EdgeIntersection(Coordinate coord, int segmentIndex, double dist) {
+ this.coord = new Coordinate(coord);
+ this.segmentIndex = segmentIndex;
+ this.dist = dist;
+ }
+
+ public Coordinate getCoordinate() { return coord; }
+
+ public int getSegmentIndex() { return segmentIndex; }
+
+ public double getDistance() { return dist; }
+
+ public int compareTo(Object obj)
+ {
+ EdgeIntersection other = (EdgeIntersection) obj;
+ return compare(other.segmentIndex, other.dist);
+ }
+ /**
+ * @return -1 this EdgeIntersection is located before the argument location
+ * @return 0 this EdgeIntersection is at the argument location
+ * @return 1 this EdgeIntersection is located after the argument location
+ */
+ public int compare(int segmentIndex, double dist)
+ {
+ if (this.segmentIndex < segmentIndex) return -1;
+ if (this.segmentIndex > segmentIndex) return 1;
+ if (this.dist < dist) return -1;
+ if (this.dist > dist) return 1;
+ return 0;
+ }
+
+ public boolean isEndPoint(int maxSegmentIndex)
+ {
+ if (segmentIndex == 0 && dist == 0.0) return true;
+ if (segmentIndex == maxSegmentIndex) return true;
+ return false;
+ }
+
+ public void print(PrintStream out)
+ {
+ out.print(coord);
+ out.print(" seg # = " + segmentIndex);
+ out.println(" dist = " + dist);
+ }
+ public String toString()
+ {
+ return coord + " seg # = " + segmentIndex + " dist = " + dist;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeIntersectionList.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeIntersectionList.java
new file mode 100644
index 0000000..8cd0870
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeIntersectionList.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * A list of edge intersections along an {@link Edge}.
+ * Implements splitting an edge with intersections
+ * into multiple resultant edges.
+ *
+ * @version 1.7
+ */
+public class EdgeIntersectionList
+{
+ // a Map <EdgeIntersection, EdgeIntersection>
+ private Map nodeMap = new TreeMap();
+ Edge edge; // the parent edge
+
+ public EdgeIntersectionList(Edge edge)
+ {
+ this.edge = edge;
+ }
+
+ /**
+ * Adds an intersection into the list, if it isn't already there.
+ * The input segmentIndex and dist are expected to be normalized.
+ * @return the EdgeIntersection found or added
+ */
+ public EdgeIntersection add(Coordinate intPt, int segmentIndex, double dist)
+ {
+ EdgeIntersection eiNew = new EdgeIntersection(intPt, segmentIndex, dist);
+ EdgeIntersection ei = (EdgeIntersection) nodeMap.get(eiNew);
+ if (ei != null) {
+ return ei;
+ }
+ nodeMap.put(eiNew, eiNew);
+ return eiNew;
+ }
+
+ /**
+ * Returns an iterator of {@link EdgeIntersection}s
+ *
+ * @return an Iterator of EdgeIntersections
+ */
+ public Iterator iterator() { return nodeMap.values().iterator(); }
+
+ /**
+ * Tests if the given point is an edge intersection
+ *
+ * @param pt the point to test
+ * @return true if the point is an intersection
+ */
+ public boolean isIntersection(Coordinate pt)
+ {
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) it.next();
+ if (ei.coord.equals(pt))
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Adds entries for the first and last points of the edge to the list
+ */
+ public void addEndpoints()
+ {
+ int maxSegIndex = edge.pts.length - 1;
+ add(edge.pts[0], 0, 0.0);
+ add(edge.pts[maxSegIndex], maxSegIndex, 0.0);
+ }
+
+ /**
+ * Creates new edges for all the edges that the intersections in this
+ * list split the parent edge into.
+ * Adds the edges to the input list (this is so a single list
+ * can be used to accumulate all split edges for a Geometry).
+ *
+ * @param edgeList a list of EdgeIntersections
+ */
+ public void addSplitEdges(List edgeList)
+ {
+ // ensure that the list has entries for the first and last point of the edge
+ addEndpoints();
+
+ Iterator it = iterator();
+ // there should always be at least two entries in the list
+ EdgeIntersection eiPrev = (EdgeIntersection) it.next();
+ while (it.hasNext()) {
+ EdgeIntersection ei = (EdgeIntersection) it.next();
+ Edge newEdge = createSplitEdge(eiPrev, ei);
+ edgeList.add(newEdge);
+
+ eiPrev = ei;
+ }
+ }
+ /**
+ * Create a new "split edge" with the section of points between
+ * (and including) the two intersections.
+ * The label for the new edge is the same as the label for the parent edge.
+ */
+ Edge createSplitEdge(EdgeIntersection ei0, EdgeIntersection ei1)
+ {
+//Debug.print("\ncreateSplitEdge"); Debug.print(ei0); Debug.print(ei1);
+ int npts = ei1.segmentIndex - ei0.segmentIndex + 2;
+
+ Coordinate lastSegStartPt = edge.pts[ei1.segmentIndex];
+ // if the last intersection point is not equal to the its segment start pt,
+ // add it to the points list as well.
+ // (This check is needed because the distance metric is not totally reliable!)
+ // The check for point equality is 2D only - Z values are ignored
+ boolean useIntPt1 = ei1.dist > 0.0 || ! ei1.coord.equals2D(lastSegStartPt);
+ if (! useIntPt1) {
+ npts--;
+ }
+
+ Coordinate[] pts = new Coordinate[npts];
+ int ipt = 0;
+ pts[ipt++] = new Coordinate(ei0.coord);
+ for (int i = ei0.segmentIndex + 1; i <= ei1.segmentIndex; i++) {
+ pts[ipt++] = edge.pts[i];
+ }
+ if (useIntPt1) pts[ipt] = ei1.coord;
+ return new Edge(pts, new Label(edge.label));
+ }
+
+ public void print(PrintStream out)
+ {
+ out.println("Intersections:");
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) it.next();
+ ei.print(out);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeList.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeList.java
new file mode 100644
index 0000000..eb0299a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeList.java
@@ -0,0 +1,114 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.noding.OrientedCoordinateArray;
+
+
+/**
+ * A EdgeList is a list of Edges. It supports locating edges
+ * that are pointwise equals to a target edge.
+ * @version 1.7
+ */
+public class EdgeList
+{
+ private List edges = new ArrayList();
+ /**
+ * An index of the edges, for fast lookup.
+ *
+ */
+ private Map ocaMap = new TreeMap();
+
+ public EdgeList() {
+ }
+
+ /**
+ * Insert an edge unless it is already in the list
+ */
+ public void add(Edge e)
+ {
+ edges.add(e);
+ OrientedCoordinateArray oca = new OrientedCoordinateArray(e.getCoordinates());
+ ocaMap.put(oca, e);
+ }
+
+ public void addAll(Collection edgeColl)
+ {
+ for (Iterator i = edgeColl.iterator(); i.hasNext(); ) {
+ add((Edge) i.next());
+ }
+ }
+
+ public List getEdges() { return edges; }
+
+ /**
+ * If there is an edge equal to e already in the list, return it.
+ * Otherwise return null.
+ * @return equal edge, if there is one already in the list
+ * null otherwise
+ */
+ public Edge findEqualEdge(Edge e)
+ {
+ OrientedCoordinateArray oca = new OrientedCoordinateArray(e.getCoordinates());
+ // will return null if no edge matches
+ Edge matchEdge = (Edge) ocaMap.get(oca);
+ return matchEdge;
+ }
+
+ public Iterator iterator() { return edges.iterator(); }
+
+ public Edge get(int i) { return (Edge) edges.get(i); }
+
+ /**
+ * If the edge e is already in the list, return its index.
+ * @return index, if e is already in the list
+ * -1 otherwise
+ */
+ public int findEdgeIndex(Edge e)
+ {
+ for (int i = 0; i < edges.size(); i++) {
+ if ( ((Edge) edges.get(i)).equals(e) ) return i;
+ }
+ return -1;
+ }
+
+ public void print(PrintStream out)
+ {
+ out.print("MULTILINESTRING ( ");
+ for (int j = 0; j < edges.size(); j++) {
+ Edge e = (Edge) edges.get(j);
+ if (j > 0) out.print(",");
+ out.print("(");
+ Coordinate[] pts = e.getCoordinates();
+ for (int i = 0; i < pts.length; i++) {
+ if (i > 0) out.print(",");
+ out.print(pts[i].x + " " + pts[i].y);
+ }
+ out.println(")");
+ }
+ out.print(") ");
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeNodingValidator.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeNodingValidator.java
new file mode 100644
index 0000000..719325e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeNodingValidator.java
@@ -0,0 +1,81 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.noding.BasicSegmentString;
+import org.locationtech.jts.noding.FastNodingValidator;
+
+/**
+ * Validates that a collection of {@link Edge}s is correctly noded.
+ * Throws an appropriate exception if an noding error is found.
+ *
+ * @version 1.7
+ */
+public class EdgeNodingValidator
+{
+ /**
+ * Checks whether the supplied {@link Edge}s
+ * are correctly noded.
+ * Throws a {@link TopologyException} if they are not.
+ *
+ * @param edges a collection of Edges.
+ * @throws TopologyException if the SegmentStrings are not correctly noded
+ *
+ */
+ public static void checkValid(Collection edges)
+ {
+ EdgeNodingValidator validator = new EdgeNodingValidator(edges);
+ validator.checkValid();
+ }
+
+ public static Collection toSegmentStrings(Collection edges)
+ {
+ // convert Edges to SegmentStrings
+ Collection segStrings = new ArrayList();
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ segStrings.add(new BasicSegmentString(e.getCoordinates(), e));
+ }
+ return segStrings;
+ }
+
+ private FastNodingValidator nv;
+
+ /**
+ * Creates a new validator for the given collection of {@link Edge}s.
+ *
+ * @param edges a collection of Edges.
+ */
+ public EdgeNodingValidator(Collection edges)
+ {
+ nv = new FastNodingValidator(toSegmentStrings(edges));
+ }
+
+ /**
+ * Checks whether the supplied edges
+ * are correctly noded. Throws an exception if they are not.
+ *
+ * @throws TopologyException if the SegmentStrings are not correctly noded
+ *
+ */
+ public void checkValid()
+ {
+ nv.checkValid();
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeRing.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeRing.java
new file mode 100644
index 0000000..2cc73b0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/EdgeRing.java
@@ -0,0 +1,231 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.util.Assert;
+
+
+
+/**
+ * @version 1.7
+ */
+public abstract class EdgeRing {
+
+ protected DirectedEdge startDe; // the directed edge which starts the list of edges for this EdgeRing
+ private int maxNodeDegree = -1;
+ private List edges = new ArrayList(); // the DirectedEdges making up this EdgeRing
+ private List pts = new ArrayList();
+ private Label label = new Label(Location.NONE); // label stores the locations of each geometry on the face surrounded by this ring
+ private LinearRing ring; // the ring created for this EdgeRing
+ private boolean isHole;
+ private EdgeRing shell; // if non-null, the ring is a hole and this EdgeRing is its containing shell
+ private ArrayList holes = new ArrayList(); // a list of EdgeRings which are holes in this EdgeRing
+
+ protected GeometryFactory geometryFactory;
+
+ public EdgeRing(DirectedEdge start, GeometryFactory geometryFactory) {
+ this.geometryFactory = geometryFactory;
+ computePoints(start);
+ computeRing();
+ }
+
+ public boolean isIsolated()
+ {
+ return (label.getGeometryCount() == 1);
+ }
+ public boolean isHole()
+ {
+ //computePoints();
+ return isHole;
+ }
+
+ public Coordinate getCoordinate(int i) { return (Coordinate) pts.get(i); }
+ public LinearRing getLinearRing() { return ring; }
+ public Label getLabel() { return label; }
+ public boolean isShell() { return shell == null; }
+ public EdgeRing getShell() { return shell; }
+ public void setShell(EdgeRing shell)
+ {
+ this.shell = shell;
+ if (shell != null) shell.addHole(this);
+ }
+ public void addHole(EdgeRing ring) { holes.add(ring); }
+
+ public Polygon toPolygon(GeometryFactory geometryFactory)
+ {
+ LinearRing[] holeLR = new LinearRing[holes.size()];
+ for (int i = 0; i < holes.size(); i++) {
+ holeLR[i] = ((EdgeRing) holes.get(i)).getLinearRing();
+ }
+ Polygon poly = geometryFactory.createPolygon(getLinearRing(), holeLR);
+ return poly;
+ }
+ /**
+ * Compute a LinearRing from the point list previously collected.
+ * Test if the ring is a hole (i.e. if it is CCW) and set the hole flag
+ * accordingly.
+ */
+ public void computeRing()
+ {
+ if (ring != null) return; // don't compute more than once
+ Coordinate[] coord = new Coordinate[pts.size()];
+ for (int i = 0; i < pts.size(); i++) {
+ coord[i] = (Coordinate) pts.get(i);
+ }
+ ring = geometryFactory.createLinearRing(coord);
+ isHole = Orientation.isCCW(ring.getCoordinates());
+//Debug.println( (isHole ? "hole - " : "shell - ") + WKTWriter.toLineString(new CoordinateArraySequence(ring.getCoordinates())));
+ }
+ abstract public DirectedEdge getNext(DirectedEdge de);
+ abstract public void setEdgeRing(DirectedEdge de, EdgeRing er);
+
+ /**
+ * Returns the list of DirectedEdges that make up this EdgeRing
+ */
+ public List getEdges() { return edges; }
+
+ /**
+ * Collect all the points from the DirectedEdges of this ring into a contiguous list
+ */
+ protected void computePoints(DirectedEdge start)
+ {
+//System.out.println("buildRing");
+ startDe = start;
+ DirectedEdge de = start;
+ boolean isFirstEdge = true;
+ do {
+// Assert.isTrue(de != null, "found null Directed Edge");
+ if (de == null)
+ throw new TopologyException("Found null DirectedEdge");
+ if (de.getEdgeRing() == this)
+ throw new TopologyException("Directed Edge visited twice during ring-building at " + de.getCoordinate());
+
+ edges.add(de);
+//Debug.println(de);
+//Debug.println(de.getEdge());
+ Label label = de.getLabel();
+ Assert.isTrue(label.isArea());
+ mergeLabel(label);
+ addPoints(de.getEdge(), de.isForward(), isFirstEdge);
+ isFirstEdge = false;
+ setEdgeRing(de, this);
+ de = getNext(de);
+ } while (de != startDe);
+ }
+
+ public int getMaxNodeDegree()
+ {
+ if (maxNodeDegree < 0) computeMaxNodeDegree();
+ return maxNodeDegree;
+ }
+
+ private void computeMaxNodeDegree()
+ {
+ maxNodeDegree = 0;
+ DirectedEdge de = startDe;
+ do {
+ Node node = de.getNode();
+ int degree = ((DirectedEdgeStar) node.getEdges()).getOutgoingDegree(this);
+ if (degree > maxNodeDegree) maxNodeDegree = degree;
+ de = getNext(de);
+ } while (de != startDe);
+ maxNodeDegree *= 2;
+ }
+
+
+ public void setInResult()
+ {
+ DirectedEdge de = startDe;
+ do {
+ de.getEdge().setInResult(true);
+ de = de.getNext();
+ } while (de != startDe);
+ }
+
+ protected void mergeLabel(Label deLabel)
+ {
+ mergeLabel(deLabel, 0);
+ mergeLabel(deLabel, 1);
+ }
+ /**
+ * Merge the RHS label from a DirectedEdge into the label for this EdgeRing.
+ * The DirectedEdge label may be null. This is acceptable - it results
+ * from a node which is NOT an intersection node between the Geometries
+ * (e.g. the end node of a LinearRing). In this case the DirectedEdge label
+ * does not contribute any information to the overall labelling, and is simply skipped.
+ */
+ protected void mergeLabel(Label deLabel, int geomIndex)
+ {
+ int loc = deLabel.getLocation(geomIndex, Position.RIGHT);
+ // no information to be had from this label
+ if (loc == Location.NONE) return;
+ // if there is no current RHS value, set it
+ if (label.getLocation(geomIndex) == Location.NONE) {
+ label.setLocation(geomIndex, loc);
+ return;
+ }
+ }
+ protected void addPoints(Edge edge, boolean isForward, boolean isFirstEdge)
+ {
+ Coordinate[] edgePts = edge.getCoordinates();
+ if (isForward) {
+ int startIndex = 1;
+ if (isFirstEdge) startIndex = 0;
+ for (int i = startIndex; i < edgePts.length; i++) {
+ pts.add(edgePts[i]);
+ }
+ }
+ else { // is backward
+ int startIndex = edgePts.length - 2;
+ if (isFirstEdge) startIndex = edgePts.length - 1;
+ for (int i = startIndex; i >= 0; i--) {
+ pts.add(edgePts[i]);
+ }
+ }
+ }
+
+ /**
+ * This method will cause the ring to be computed.
+ * It will also check any holes, if they have been assigned.
+ */
+ public boolean containsPoint(Coordinate p)
+ {
+ LinearRing shell = getLinearRing();
+ Envelope env = shell.getEnvelopeInternal();
+ if (! env.contains(p)) return false;
+ if (! PointLocation.isInRing(p, shell.getCoordinates()) ) return false;
+
+ for (Iterator i = holes.iterator(); i.hasNext(); ) {
+ EdgeRing hole = (EdgeRing) i.next();
+ if (hole.containsPoint(p) )
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/GeometryGraph.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/GeometryGraph.java
new file mode 100644
index 0000000..caa8e83
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/GeometryGraph.java
@@ -0,0 +1,475 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.algorithm.locate.IndexedPointInAreaLocator;
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geomgraph.index.EdgeSetIntersector;
+import org.locationtech.jts.geomgraph.index.SegmentIntersector;
+import org.locationtech.jts.geomgraph.index.SimpleMCSweepLineIntersector;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A GeometryGraph is a graph that models a given Geometry
+ * @version 1.7
+ */
+public class GeometryGraph
+ extends PlanarGraph
+{
+/**
+ * This method implements the Boundary Determination Rule
+ * for determining whether
+ * a component (node or edge) that appears multiple times in elements
+ * of a MultiGeometry is in the boundary or the interior of the Geometry
+ * <br>
+ * The SFS uses the "Mod-2 Rule", which this function implements
+ * <br>
+ * An alternative (and possibly more intuitive) rule would be
+ * the "At Most One Rule":
+ * isInBoundary = (componentCount == 1)
+ */
+/*
+ public static boolean isInBoundary(int boundaryCount)
+ {
+ // the "Mod-2 Rule"
+ return boundaryCount % 2 == 1;
+ }
+ public static int determineBoundary(int boundaryCount)
+ {
+ return isInBoundary(boundaryCount) ? Location.BOUNDARY : Location.INTERIOR;
+ }
+*/
+
+ public static int determineBoundary(BoundaryNodeRule boundaryNodeRule, int boundaryCount)
+ {
+ return boundaryNodeRule.isInBoundary(boundaryCount)
+ ? Location.BOUNDARY : Location.INTERIOR;
+ }
+
+ private Geometry parentGeom;
+
+ /**
+ * The lineEdgeMap is a map of the linestring components of the
+ * parentGeometry to the edges which are derived from them.
+ * This is used to efficiently perform findEdge queries
+ */
+ private Map lineEdgeMap = new HashMap();
+
+ private BoundaryNodeRule boundaryNodeRule = null;
+
+ /**
+ * If this flag is true, the Boundary Determination Rule will used when deciding
+ * whether nodes are in the boundary or not
+ */
+ private boolean useBoundaryDeterminationRule = true;
+ private int argIndex; // the index of this geometry as an argument to a spatial function (used for labelling)
+ private Collection boundaryNodes;
+ private boolean hasTooFewPoints = false;
+ private Coordinate invalidPoint = null;
+
+ private PointOnGeometryLocator areaPtLocator = null;
+ // for use if geometry is not Polygonal
+ private final PointLocator ptLocator = new PointLocator();
+
+ private EdgeSetIntersector createEdgeSetIntersector()
+ {
+ // various options for computing intersections, from slowest to fastest
+
+ //private EdgeSetIntersector esi = new SimpleEdgeSetIntersector();
+ //private EdgeSetIntersector esi = new MonotoneChainIntersector();
+ //private EdgeSetIntersector esi = new NonReversingChainIntersector();
+ //private EdgeSetIntersector esi = new SimpleSweepLineIntersector();
+ //private EdgeSetIntersector esi = new MCSweepLineIntersector();
+
+ //return new SimpleEdgeSetIntersector();
+ return new SimpleMCSweepLineIntersector();
+ }
+
+ public GeometryGraph(int argIndex, Geometry parentGeom)
+ {
+ this(argIndex, parentGeom,
+ BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE
+ );
+ }
+
+ public GeometryGraph(int argIndex, Geometry parentGeom, BoundaryNodeRule boundaryNodeRule) {
+ this.argIndex = argIndex;
+ this.parentGeom = parentGeom;
+ this.boundaryNodeRule = boundaryNodeRule;
+ if (parentGeom != null) {
+// precisionModel = parentGeom.getPrecisionModel();
+// SRID = parentGeom.getSRID();
+ add(parentGeom);
+ }
+ }
+
+ /**
+ * This constructor is used by clients that wish to add Edges explicitly,
+ * rather than adding a Geometry. (An example is BufferOp).
+ */
+ // no longer used
+// public GeometryGraph(int argIndex, PrecisionModel precisionModel, int SRID) {
+// this(argIndex, null);
+// this.precisionModel = precisionModel;
+// this.SRID = SRID;
+// }
+// public PrecisionModel getPrecisionModel()
+// {
+// return precisionModel;
+// }
+// public int getSRID() { return SRID; }
+
+ public boolean hasTooFewPoints() { return hasTooFewPoints; }
+
+ public Coordinate getInvalidPoint() { return invalidPoint; }
+
+ public Geometry getGeometry() { return parentGeom; }
+
+ public BoundaryNodeRule getBoundaryNodeRule() { return boundaryNodeRule; }
+
+ public Collection getBoundaryNodes()
+ {
+ if (boundaryNodes == null)
+ boundaryNodes = nodes.getBoundaryNodes(argIndex);
+ return boundaryNodes;
+ }
+
+ public Coordinate[] getBoundaryPoints()
+ {
+ Collection coll = getBoundaryNodes();
+ Coordinate[] pts = new Coordinate[coll.size()];
+ int i = 0;
+ for (Iterator it = coll.iterator(); it.hasNext(); ) {
+ Node node = (Node) it.next();
+ pts[i++] = node.getCoordinate().copy();
+ }
+ return pts;
+ }
+
+ public Edge findEdge(LineString line)
+ {
+ return (Edge) lineEdgeMap.get(line);
+ }
+
+ public void computeSplitEdges(List edgelist)
+ {
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ e.eiList.addSplitEdges(edgelist);
+ }
+ }
+ private void add(Geometry g)
+ {
+ if (g.isEmpty()) return;
+
+ // check if this Geometry should obey the Boundary Determination Rule
+ // all collections except MultiPolygons obey the rule
+ if (g instanceof MultiPolygon)
+ useBoundaryDeterminationRule = false;
+
+ if (g instanceof Polygon) addPolygon((Polygon) g);
+ // LineString also handles LinearRings
+ else if (g instanceof LineString) addLineString((LineString) g);
+ else if (g instanceof Point) addPoint((Point) g);
+ else if (g instanceof MultiPoint) addCollection((MultiPoint) g);
+ else if (g instanceof MultiLineString) addCollection((MultiLineString) g);
+ else if (g instanceof MultiPolygon) addCollection((MultiPolygon) g);
+ else if (g instanceof GeometryCollection) addCollection((GeometryCollection) g);
+ else throw new UnsupportedOperationException(g.getClass().getName());
+ }
+
+ private void addCollection(GeometryCollection gc)
+ {
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = gc.getGeometryN(i);
+ add(g);
+ }
+ }
+ /**
+ * Add a Point to the graph.
+ */
+ private void addPoint(Point p)
+ {
+ Coordinate coord = p.getCoordinate();
+ insertPoint(argIndex, coord, Location.INTERIOR);
+ }
+
+ /**
+ * Adds a polygon ring to the graph.
+ * Empty rings are ignored.
+ *
+ * The left and right topological location arguments assume that the ring is oriented CW.
+ * If the ring is in the opposite orientation,
+ * the left and right locations must be interchanged.
+ */
+ private void addPolygonRing(LinearRing lr, int cwLeft, int cwRight)
+ {
+ // don't bother adding empty holes
+ if (lr.isEmpty()) return;
+
+ Coordinate[] coord = CoordinateArrays.removeRepeatedPoints(lr.getCoordinates());
+
+ if (coord.length < 4) {
+ hasTooFewPoints = true;
+ invalidPoint = coord[0];
+ return;
+ }
+
+ int left = cwLeft;
+ int right = cwRight;
+ if (Orientation.isCCW(coord)) {
+ left = cwRight;
+ right = cwLeft;
+ }
+ Edge e = new Edge(coord,
+ new Label(argIndex, Location.BOUNDARY, left, right));
+ lineEdgeMap.put(lr, e);
+
+ insertEdge(e);
+ // insert the endpoint as a node, to mark that it is on the boundary
+ insertPoint(argIndex, coord[0], Location.BOUNDARY);
+ }
+
+ private void addPolygon(Polygon p)
+ {
+ addPolygonRing(
+ (LinearRing) p.getExteriorRing(),
+ Location.EXTERIOR,
+ Location.INTERIOR);
+
+ for (int i = 0; i < p.getNumInteriorRing(); i++) {
+ LinearRing hole = (LinearRing) p.getInteriorRingN(i);
+
+ // Holes are topologically labelled opposite to the shell, since
+ // the interior of the polygon lies on their opposite side
+ // (on the left, if the hole is oriented CW)
+ addPolygonRing(
+ hole,
+ Location.INTERIOR,
+ Location.EXTERIOR);
+ }
+ }
+
+ private void addLineString(LineString line)
+ {
+ Coordinate[] coord = CoordinateArrays.removeRepeatedPoints(line.getCoordinates());
+
+ if (coord.length < 2) {
+ hasTooFewPoints = true;
+ invalidPoint = coord[0];
+ return;
+ }
+
+ // add the edge for the LineString
+ // line edges do not have locations for their left and right sides
+ Edge e = new Edge(coord, new Label(argIndex, Location.INTERIOR));
+ lineEdgeMap.put(line, e);
+ insertEdge(e);
+ /**
+ * Add the boundary points of the LineString, if any.
+ * Even if the LineString is closed, add both points as if they were endpoints.
+ * This allows for the case that the node already exists and is a boundary point.
+ */
+ Assert.isTrue(coord.length >= 2, "found LineString with single point");
+ insertBoundaryPoint(argIndex, coord[0]);
+ insertBoundaryPoint(argIndex, coord[coord.length - 1]);
+
+ }
+
+ /**
+ * Add an Edge computed externally. The label on the Edge is assumed
+ * to be correct.
+ */
+ public void addEdge(Edge e)
+ {
+ insertEdge(e);
+ Coordinate[] coord = e.getCoordinates();
+ // insert the endpoint as a node, to mark that it is on the boundary
+ insertPoint(argIndex, coord[0], Location.BOUNDARY);
+ insertPoint(argIndex, coord[coord.length - 1], Location.BOUNDARY);
+ }
+
+ /**
+ * Add a point computed externally. The point is assumed to be a
+ * Point Geometry part, which has a location of INTERIOR.
+ */
+ public void addPoint(Coordinate pt)
+ {
+ insertPoint(argIndex, pt, Location.INTERIOR);
+ }
+
+ /**
+ * Compute self-nodes, taking advantage of the Geometry type to
+ * minimize the number of intersection tests. (E.g. rings are
+ * not tested for self-intersection, since they are assumed to be valid).
+ *
+ * @param li the LineIntersector to use
+ * @param computeRingSelfNodes if <code>false</code>, intersection checks are optimized to not test rings for self-intersection
+ * @return the computed SegmentIntersector containing information about the intersections found
+ */
+ public SegmentIntersector computeSelfNodes(LineIntersector li, boolean computeRingSelfNodes)
+ {
+ return computeSelfNodes(li, computeRingSelfNodes, false);
+ }
+
+ /**
+ * Compute self-nodes, taking advantage of the Geometry type to
+ * minimize the number of intersection tests. (E.g. rings are
+ * not tested for self-intersection, since they are assumed to be valid).
+ *
+ * @param li the LineIntersector to use
+ * @param computeRingSelfNodes if <code>false</code>, intersection checks are optimized to not test rings for self-intersection
+ * @param isDoneIfProperInt short-circuit the intersection computation if a proper intersection is found
+ * @return the computed SegmentIntersector containing information about the intersections found
+ */
+ public SegmentIntersector computeSelfNodes(LineIntersector li, boolean computeRingSelfNodes, boolean isDoneIfProperInt)
+ {
+ SegmentIntersector si = new SegmentIntersector(li, true, false);
+ si.setIsDoneIfProperInt(isDoneIfProperInt);
+ EdgeSetIntersector esi = createEdgeSetIntersector();
+ // optimize intersection search for valid Polygons and LinearRings
+ boolean isRings = parentGeom instanceof LinearRing
+ || parentGeom instanceof Polygon
+ || parentGeom instanceof MultiPolygon;
+ boolean computeAllSegments = computeRingSelfNodes || ! isRings;
+ esi.computeIntersections(edges, si, computeAllSegments);
+
+ //System.out.println("SegmentIntersector # tests = " + si.numTests);
+ addSelfIntersectionNodes(argIndex);
+ return si;
+ }
+
+ public SegmentIntersector computeEdgeIntersections(
+ GeometryGraph g,
+ LineIntersector li,
+ boolean includeProper)
+ {
+ SegmentIntersector si = new SegmentIntersector(li, includeProper, true);
+ si.setBoundaryNodes(this.getBoundaryNodes(), g.getBoundaryNodes());
+
+ EdgeSetIntersector esi = createEdgeSetIntersector();
+ esi.computeIntersections(edges, g.edges, si);
+/*
+for (Iterator i = g.edges.iterator(); i.hasNext();) {
+Edge e = (Edge) i.next();
+Debug.print(e.getEdgeIntersectionList());
+}
+*/
+ return si;
+ }
+
+ private void insertPoint(int argIndex, Coordinate coord, int onLocation)
+ {
+ Node n = nodes.addNode(coord);
+ Label lbl = n.getLabel();
+ if (lbl == null) {
+ n.label = new Label(argIndex, onLocation);
+ }
+ else
+ lbl.setLocation(argIndex, onLocation);
+ }
+
+ /**
+ * Adds candidate boundary points using the current {@link BoundaryNodeRule}.
+ * This is used to add the boundary
+ * points of dim-1 geometries (Curves/MultiCurves).
+ */
+ private void insertBoundaryPoint(int argIndex, Coordinate coord)
+ {
+ Node n = nodes.addNode(coord);
+ // nodes always have labels
+ Label lbl = n.getLabel();
+ // the new point to insert is on a boundary
+ int boundaryCount = 1;
+ // determine the current location for the point (if any)
+ int loc = Location.NONE;
+ loc = lbl.getLocation(argIndex, Position.ON);
+ if (loc == Location.BOUNDARY) boundaryCount++;
+
+ // determine the boundary status of the point according to the Boundary Determination Rule
+ int newLoc = determineBoundary(boundaryNodeRule, boundaryCount);
+ lbl.setLocation(argIndex, newLoc);
+ }
+
+ private void addSelfIntersectionNodes(int argIndex)
+ {
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ int eLoc = e.getLabel().getLocation(argIndex);
+ for (Iterator eiIt = e.eiList.iterator(); eiIt.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) eiIt.next();
+ addSelfIntersectionNode(argIndex, ei.coord, eLoc);
+ }
+ }
+ }
+ /**
+ * Add a node for a self-intersection.
+ * If the node is a potential boundary node (e.g. came from an edge which
+ * is a boundary) then insert it as a potential boundary node.
+ * Otherwise, just add it as a regular node.
+ */
+ private void addSelfIntersectionNode(int argIndex, Coordinate coord, int loc)
+ {
+ // if this node is already a boundary node, don't change it
+ if (isBoundaryNode(argIndex, coord)) return;
+ if (loc == Location.BOUNDARY && useBoundaryDeterminationRule)
+ insertBoundaryPoint(argIndex, coord);
+ else
+ insertPoint(argIndex, coord, loc);
+ }
+
+ // MD - experimental for now
+ /**
+ * Determines the {@link Location} of the given {@link Coordinate}
+ * in this geometry.
+ *
+ * @param pt the point to test
+ * @return the location of the point in the geometry
+ */
+ public int locate(Coordinate pt)
+ {
+ if (parentGeom instanceof Polygonal && parentGeom.getNumGeometries() > 50) {
+ // lazily init point locator
+ if (areaPtLocator == null) {
+ areaPtLocator = new IndexedPointInAreaLocator(parentGeom);
+ }
+ return areaPtLocator.locate(pt);
+ }
+ return ptLocator.locate(pt, parentGeom);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/GraphComponent.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/GraphComponent.java
new file mode 100644
index 0000000..1bb621a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/GraphComponent.java
@@ -0,0 +1,84 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A GraphComponent is the parent class for the objects'
+ * that form a graph. Each GraphComponent can carry a
+ * Label.
+ * @version 1.7
+ */
+abstract public class GraphComponent {
+
+ protected Label label;
+ /**
+ * isInResult indicates if this component has already been included in the result
+ */
+ private boolean isInResult = false;
+ private boolean isCovered = false;
+ private boolean isCoveredSet = false;
+ private boolean isVisited = false;
+
+ public GraphComponent() {
+ }
+
+ public GraphComponent(Label label) {
+ this.label = label;
+ }
+
+ public Label getLabel() { return label; }
+ public void setLabel(Label label) { this.label = label; }
+ public void setInResult(boolean isInResult) { this.isInResult = isInResult; }
+ public boolean isInResult() { return isInResult; }
+ public void setCovered(boolean isCovered)
+ {
+ this.isCovered = isCovered;
+ this.isCoveredSet = true;
+ }
+ public boolean isCovered() { return isCovered; }
+ public boolean isCoveredSet() { return isCoveredSet; }
+ public boolean isVisited() { return isVisited; }
+ public void setVisited(boolean isVisited) { this.isVisited = isVisited; }
+ /**
+ * @return a coordinate in this component (or null, if there are none)
+ */
+ abstract public Coordinate getCoordinate();
+ /**
+ * compute the contribution to an IM for this component
+ */
+ abstract protected void computeIM(IntersectionMatrix im);
+ /**
+ * An isolated component is one that does not intersect or touch any other
+ * component. This is the case if the label has valid locations for
+ * only a single Geometry.
+ *
+ * @return true if this component is isolated
+ */
+ abstract public boolean isIsolated();
+ /**
+ * Update the IM with the contribution for this component.
+ * A component only contributes if it has a labelling for both parent geometries
+ */
+ public void updateIM(IntersectionMatrix im)
+ {
+ Assert.isTrue(label.getGeometryCount() >= 2, "found partial label");
+ computeIM(im);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/Label.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Label.java
new file mode 100644
index 0000000..058da15
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Label.java
@@ -0,0 +1,201 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import org.locationtech.jts.geom.Location;
+
+ /**
+ * A <code>Label</code> indicates the topological relationship of a component
+ * of a topology graph to a given <code>Geometry</code>.
+ * This class supports labels for relationships to two <code>Geometry</code>s,
+ * which is sufficient for algorithms for binary operations.
+ * <P>
+ * Topology graphs support the concept of labeling nodes and edges in the graph.
+ * The label of a node or edge specifies its topological relationship to one or
+ * more geometries. (In fact, since JTS operations have only two arguments labels
+ * are required for only two geometries). A label for a node or edge has one or
+ * two elements, depending on whether the node or edge occurs in one or both of the
+ * input <code>Geometry</code>s. Elements contain attributes which categorize the
+ * topological location of the node or edge relative to the parent
+ * <code>Geometry</code>; that is, whether the node or edge is in the interior,
+ * boundary or exterior of the <code>Geometry</code>. Attributes have a value
+ * from the set <code>{Interior, Boundary, Exterior}</code>. In a node each
+ * element has a single attribute <code><On></code>. For an edge each element has a
+ * triplet of attributes <code><Left, On, Right></code>.
+ * <P>
+ * It is up to the client code to associate the 0 and 1 <code>TopologyLocation</code>s
+ * with specific geometries.
+ * @version 1.7
+ *
+ */
+public class Label {
+
+ // converts a Label to a Line label (that is, one with no side Locations)
+ public static Label toLineLabel(Label label)
+ {
+ Label lineLabel = new Label(Location.NONE);
+ for (int i = 0; i < 2; i++) {
+ lineLabel.setLocation(i, label.getLocation(i));
+ }
+ return lineLabel;
+ }
+
+ TopologyLocation elt[] = new TopologyLocation[2];
+
+ /**
+ * Construct a Label with a single location for both Geometries.
+ * Initialize the locations to Null
+ */
+ public Label(int onLoc)
+ {
+ elt[0] = new TopologyLocation(onLoc);
+ elt[1] = new TopologyLocation(onLoc);
+ }
+ /**
+ * Construct a Label with a single location for both Geometries.
+ * Initialize the location for the Geometry index.
+ */
+ public Label(int geomIndex, int onLoc)
+ {
+ elt[0] = new TopologyLocation(Location.NONE);
+ elt[1] = new TopologyLocation(Location.NONE);
+ elt[geomIndex].setLocation(onLoc);
+ }
+ /**
+ * Construct a Label with On, Left and Right locations for both Geometries.
+ * Initialize the locations for both Geometries to the given values.
+ */
+ public Label(int onLoc, int leftLoc, int rightLoc)
+ {
+ elt[0] = new TopologyLocation(onLoc, leftLoc, rightLoc);
+ elt[1] = new TopologyLocation(onLoc, leftLoc, rightLoc);
+ }
+ /**
+ * Construct a Label with On, Left and Right locations for both Geometries.
+ * Initialize the locations for the given Geometry index.
+ */
+ public Label(int geomIndex, int onLoc, int leftLoc, int rightLoc)
+ {
+ elt[0] = new TopologyLocation(Location.NONE, Location.NONE, Location.NONE);
+ elt[1] = new TopologyLocation(Location.NONE, Location.NONE, Location.NONE);
+ elt[geomIndex].setLocations(onLoc, leftLoc, rightLoc);
+ }
+ /**
+ * Construct a Label with the same values as the argument Label.
+ */
+ public Label(Label lbl)
+ {
+ elt[0] = new TopologyLocation(lbl.elt[0]);
+ elt[1] = new TopologyLocation(lbl.elt[1]);
+ }
+
+ public void flip()
+ {
+ elt[0].flip();
+ elt[1].flip();
+ }
+
+ public int getLocation(int geomIndex, int posIndex) { return elt[geomIndex].get(posIndex); }
+ public int getLocation(int geomIndex) { return elt[geomIndex].get(Position.ON); }
+ public void setLocation(int geomIndex, int posIndex, int location)
+ {
+ elt[geomIndex].setLocation(posIndex, location);
+ }
+ public void setLocation(int geomIndex, int location)
+ {
+ elt[geomIndex].setLocation(Position.ON, location);
+ }
+ public void setAllLocations(int geomIndex, int location)
+ {
+ elt[geomIndex].setAllLocations(location);
+ }
+ public void setAllLocationsIfNull(int geomIndex, int location)
+ {
+ elt[geomIndex].setAllLocationsIfNull(location);
+ }
+ public void setAllLocationsIfNull(int location)
+ {
+ setAllLocationsIfNull(0, location);
+ setAllLocationsIfNull(1, location);
+ }
+ /**
+ * Merge this label with another one.
+ * Merging updates any null attributes of this label with the attributes from lbl
+ */
+ public void merge(Label lbl)
+ {
+ for (int i = 0; i < 2; i++) {
+ if (elt[i] == null && lbl.elt[i] != null) {
+ elt[i] = new TopologyLocation(lbl.elt[i]);
+ }
+ else {
+ elt[i].merge(lbl.elt[i]);
+ }
+ }
+ }
+ public int getGeometryCount()
+ {
+ int count = 0;
+ if (! elt[0].isNull()) count++;
+ if (! elt[1].isNull()) count++;
+ return count;
+ }
+ public boolean isNull(int geomIndex) { return elt[geomIndex].isNull(); }
+ public boolean isAnyNull(int geomIndex) { return elt[geomIndex].isAnyNull(); }
+
+ public boolean isArea() { return elt[0].isArea() || elt[1].isArea(); }
+ public boolean isArea(int geomIndex)
+ {
+ /* Testing
+ if (elt[0].getLocations().length != elt[1].getLocations().length) {
+ System.out.println(this);
+ }
+ */
+ return elt[geomIndex].isArea();
+ }
+ public boolean isLine(int geomIndex) { return elt[geomIndex].isLine(); }
+
+ public boolean isEqualOnSide(Label lbl, int side)
+ {
+ return
+ this.elt[0].isEqualOnSide(lbl.elt[0], side)
+ && this.elt[1].isEqualOnSide(lbl.elt[1], side);
+ }
+ public boolean allPositionsEqual(int geomIndex, int loc)
+ {
+ return elt[geomIndex].allPositionsEqual(loc);
+ }
+ /**
+ * Converts one GeometryLocation to a Line location
+ */
+ public void toLine(int geomIndex)
+ {
+ if (elt[geomIndex].isArea())
+ elt[geomIndex] = new TopologyLocation(elt[geomIndex].location[0]);
+ }
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer();
+ if (elt[0] != null) {
+ buf.append("A:");
+ buf.append(elt[0].toString());
+ }
+ if (elt[1] != null) {
+ buf.append(" B:");
+ buf.append(elt[1].toString());
+ }
+ return buf.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/Node.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Node.java
new file mode 100644
index 0000000..463b307
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Node.java
@@ -0,0 +1,154 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import java.io.PrintStream;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.geom.Location;
+
+
+/**
+ * @version 1.7
+ */
+public class Node
+ extends GraphComponent
+{
+ protected Coordinate coord; // only non-null if this node is precise
+ protected EdgeEndStar edges;
+
+ public Node(Coordinate coord, EdgeEndStar edges)
+ {
+ this.coord = coord;
+ this.edges = edges;
+ label = new Label(0, Location.NONE);
+ }
+
+ public Coordinate getCoordinate() { return coord; }
+ public EdgeEndStar getEdges() { return edges; }
+
+ /**
+ * Tests whether any incident edge is flagged as
+ * being in the result.
+ * This test can be used to determine if the node is in the result,
+ * since if any incident edge is in the result, the node must be in the result as well.
+ *
+ * @return <code>true</code> if any incident edge in the in the result
+ */
+ public boolean isIncidentEdgeInResult()
+ {
+ for (Iterator it = getEdges().getEdges().iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ if (de.getEdge().isInResult())
+ return true;
+ }
+ return false;
+ }
+
+ public boolean isIsolated()
+ {
+ return (label.getGeometryCount() == 1);
+ }
+ /**
+ * Basic nodes do not compute IMs
+ */
+ protected void computeIM(IntersectionMatrix im) {}
+ /**
+ * Add the edge to the list of edges at this node
+ */
+ public void add(EdgeEnd e)
+ {
+ // Assert: start pt of e is equal to node point
+ edges.insert(e);
+ e.setNode(this);
+ }
+
+ public void mergeLabel(Node n)
+ {
+ mergeLabel(n.label);
+ }
+
+ /**
+ * To merge labels for two nodes,
+ * the merged location for each LabelElement is computed.
+ * The location for the corresponding node LabelElement is set to the result,
+ * as long as the location is non-null.
+ */
+
+ public void mergeLabel(Label label2)
+ {
+ for (int i = 0; i < 2; i++) {
+ int loc = computeMergedLocation(label2, i);
+ int thisLoc = label.getLocation(i);
+ if (thisLoc == Location.NONE) label.setLocation(i, loc);
+ }
+ }
+
+ public void setLabel(int argIndex, int onLocation)
+ {
+ if (label == null) {
+ label = new Label(argIndex, onLocation);
+ }
+ else
+ label.setLocation(argIndex, onLocation);
+ }
+
+ /**
+ * Updates the label of a node to BOUNDARY,
+ * obeying the mod-2 boundaryDetermination rule.
+ */
+ public void setLabelBoundary(int argIndex)
+ {
+ if (label == null) return;
+
+ // determine the current location for the point (if any)
+ int loc = Location.NONE;
+ if (label != null)
+ loc = label.getLocation(argIndex);
+ // flip the loc
+ int newLoc;
+ switch (loc) {
+ case Location.BOUNDARY: newLoc = Location.INTERIOR; break;
+ case Location.INTERIOR: newLoc = Location.BOUNDARY; break;
+ default: newLoc = Location.BOUNDARY; break;
+ }
+ label.setLocation(argIndex, newLoc);
+ }
+
+ /**
+ * The location for a given eltIndex for a node will be one
+ * of { null, INTERIOR, BOUNDARY }.
+ * A node may be on both the boundary and the interior of a geometry;
+ * in this case, the rule is that the node is considered to be in the boundary.
+ * The merged location is the maximum of the two input values.
+ */
+ int computeMergedLocation(Label label2, int eltIndex)
+ {
+ int loc = Location.NONE;
+ loc = label.getLocation(eltIndex);
+ if (! label2.isNull(eltIndex)) {
+ int nLoc = label2.getLocation(eltIndex);
+ if (loc != Location.BOUNDARY) loc = nLoc;
+ }
+ return loc;
+ }
+
+ public void print(PrintStream out)
+ {
+ out.println("node " + coord + " lbl: " + label);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/NodeFactory.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/NodeFactory.java
new file mode 100644
index 0000000..78e2ecf
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/NodeFactory.java
@@ -0,0 +1,29 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+import org.locationtech.jts.geom.Coordinate;
+
+
+/**
+ * @version 1.7
+ */
+public class NodeFactory {
+/**
+ * The basic node constructor does not allow for incident edges
+ */
+ public Node createNode(Coordinate coord)
+ {
+ return new Node(coord, null);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/NodeMap.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/NodeMap.java
new file mode 100644
index 0000000..80ca2ff
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/NodeMap.java
@@ -0,0 +1,120 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Location;
+
+/**
+ * A map of nodes, indexed by the coordinate of the node
+ * @version 1.7
+ */
+public class NodeMap
+
+{
+ //Map nodeMap = new HashMap();
+ Map nodeMap = new TreeMap();
+ NodeFactory nodeFact;
+
+ public NodeMap(NodeFactory nodeFact) {
+ this.nodeFact = nodeFact;
+ }
+
+ /**
+ * Factory function - subclasses can override to create their own types of nodes
+ */
+ /*
+ protected Node createNode(Coordinate coord)
+ {
+ return new Node(coord);
+ }
+ */
+ /**
+ * This method expects that a node has a coordinate value.
+ */
+ public Node addNode(Coordinate coord)
+ {
+ Node node = (Node) nodeMap.get(coord);
+ if (node == null) {
+ node = nodeFact.createNode(coord);
+ nodeMap.put(coord, node);
+ }
+ return node;
+ }
+
+ public Node addNode(Node n)
+ {
+ Node node = (Node) nodeMap.get(n.getCoordinate());
+ if (node == null) {
+ nodeMap.put(n.getCoordinate(), n);
+ return n;
+ }
+ node.mergeLabel(n);
+ return node;
+ }
+
+ /**
+ * Adds a node for the start point of this EdgeEnd
+ * (if one does not already exist in this map).
+ * Adds the EdgeEnd to the (possibly new) node.
+ */
+ public void add(EdgeEnd e)
+ {
+ Coordinate p = e.getCoordinate();
+ Node n = addNode(p);
+ n.add(e);
+ }
+ /**
+ * @return the node if found; null otherwise
+ */
+ public Node find(Coordinate coord) { return (Node) nodeMap.get(coord); }
+
+ public Iterator iterator()
+ {
+ return nodeMap.values().iterator();
+ }
+ public Collection values()
+ {
+ return nodeMap.values();
+ }
+
+ public Collection getBoundaryNodes(int geomIndex)
+ {
+ Collection bdyNodes = new ArrayList();
+ for (Iterator i = iterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ if (node.getLabel().getLocation(geomIndex) == Location.BOUNDARY)
+ bdyNodes.add(node);
+ }
+ return bdyNodes;
+ }
+
+ public void print(PrintStream out)
+ {
+ for (Iterator it = iterator(); it.hasNext(); )
+ {
+ Node n = (Node) it.next();
+ n.print(out);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/PlanarGraph.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/PlanarGraph.java
new file mode 100644
index 0000000..dab2b01
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/PlanarGraph.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+/**
+ * @version 1.7
+ */
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Location;
+
+/**
+ * The computation of the <code>IntersectionMatrix</code> relies on the use of a structure
+ * called a "topology graph". The topology graph contains nodes and edges
+ * corresponding to the nodes and line segments of a <code>Geometry</code>. Each
+ * node and edge in the graph is labeled with its topological location relative to
+ * the source geometry.
+ * <P>
+ * Note that there is no requirement that points of self-intersection be a vertex.
+ * Thus to obtain a correct topology graph, <code>Geometry</code>s must be
+ * self-noded before constructing their graphs.
+ * <P>
+ * Two fundamental operations are supported by topology graphs:
+ * <UL>
+ * <LI>Computing the intersections between all the edges and nodes of a single graph
+ * <LI>Computing the intersections between the edges and nodes of two different graphs
+ * </UL>
+ *
+ * @version 1.7
+ */
+public class PlanarGraph
+{
+ /**
+ * For nodes in the Collection, link the DirectedEdges at the node that are in the result.
+ * This allows clients to link only a subset of nodes in the graph, for
+ * efficiency (because they know that only a subset is of interest).
+ */
+ public static void linkResultDirectedEdges(Collection nodes)
+ {
+ for (Iterator nodeit = nodes.iterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+ ((DirectedEdgeStar) node.getEdges()).linkResultDirectedEdges();
+ }
+ }
+
+ protected List edges = new ArrayList();
+ protected NodeMap nodes;
+ protected List edgeEndList = new ArrayList();
+
+ public PlanarGraph(NodeFactory nodeFact) {
+ nodes = new NodeMap(nodeFact);
+ }
+
+ public PlanarGraph() {
+ nodes = new NodeMap(new NodeFactory());
+ }
+
+ public Iterator getEdgeIterator() { return edges.iterator(); }
+ public Collection getEdgeEnds() { return edgeEndList; }
+
+ public boolean isBoundaryNode(int geomIndex, Coordinate coord)
+ {
+ Node node = nodes.find(coord);
+ if (node == null) return false;
+ Label label = node.getLabel();
+ if (label != null && label.getLocation(geomIndex) == Location.BOUNDARY) return true;
+ return false;
+ }
+ protected void insertEdge(Edge e)
+ {
+ edges.add(e);
+ }
+ public void add(EdgeEnd e)
+ {
+ nodes.add(e);
+ edgeEndList.add(e);
+ }
+
+ public Iterator getNodeIterator() { return nodes.iterator(); }
+ public Collection getNodes() { return nodes.values(); }
+ public Node addNode(Node node) { return nodes.addNode(node); }
+ public Node addNode(Coordinate coord) { return nodes.addNode(coord); }
+ /**
+ * @return the node if found; null otherwise
+ */
+ public Node find(Coordinate coord) { return nodes.find(coord); }
+
+ /**
+ * Add a set of edges to the graph. For each edge two DirectedEdges
+ * will be created. DirectedEdges are NOT linked by this method.
+ */
+ public void addEdges(List edgesToAdd)
+ {
+ // create all the nodes for the edges
+ for (Iterator it = edgesToAdd.iterator(); it.hasNext(); ) {
+ Edge e = (Edge) it.next();
+ edges.add(e);
+
+ DirectedEdge de1 = new DirectedEdge(e, true);
+ DirectedEdge de2 = new DirectedEdge(e, false);
+ de1.setSym(de2);
+ de2.setSym(de1);
+
+ add(de1);
+ add(de2);
+ }
+ }
+
+ /**
+ * Link the DirectedEdges at the nodes of the graph.
+ * This allows clients to link only a subset of nodes in the graph, for
+ * efficiency (because they know that only a subset is of interest).
+ */
+ public void linkResultDirectedEdges()
+ {
+ for (Iterator nodeit = nodes.iterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+ ((DirectedEdgeStar) node.getEdges()).linkResultDirectedEdges();
+ }
+ }
+ /**
+ * Link the DirectedEdges at the nodes of the graph.
+ * This allows clients to link only a subset of nodes in the graph, for
+ * efficiency (because they know that only a subset is of interest).
+ */
+ public void linkAllDirectedEdges()
+ {
+ for (Iterator nodeit = nodes.iterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+ ((DirectedEdgeStar) node.getEdges()).linkAllDirectedEdges();
+ }
+ }
+ /**
+ * Returns the EdgeEnd which has edge e as its base edge
+ * (MD 18 Feb 2002 - this should return a pair of edges)
+ *
+ * @return the edge, if found
+ * <code>null</code> if the edge was not found
+ */
+ public EdgeEnd findEdgeEnd(Edge e)
+ {
+ for (Iterator i = getEdgeEnds().iterator(); i.hasNext(); ) {
+ EdgeEnd ee = (EdgeEnd) i.next();
+ if (ee.getEdge() == e)
+ return ee;
+ }
+ return null;
+ }
+
+ /**
+ * Returns the edge whose first two coordinates are p0 and p1
+ *
+ * @return the edge, if found
+ * <code>null</code> if the edge was not found
+ */
+ public Edge findEdge(Coordinate p0, Coordinate p1)
+ {
+ for (int i = 0; i < edges.size(); i++) {
+ Edge e = (Edge) edges.get(i);
+ Coordinate[] eCoord = e.getCoordinates();
+ if (p0.equals(eCoord[0]) && p1.equals(eCoord[1]) )
+ return e;
+ }
+ return null;
+ }
+ /**
+ * Returns the edge which starts at p0 and whose first segment is
+ * parallel to p1
+ *
+ * @return the edge, if found
+ * <code>null</code> if the edge was not found
+ */
+ public Edge findEdgeInSameDirection(Coordinate p0, Coordinate p1)
+ {
+ for (int i = 0; i < edges.size(); i++) {
+ Edge e = (Edge) edges.get(i);
+
+ Coordinate[] eCoord = e.getCoordinates();
+ if (matchInSameDirection(p0, p1, eCoord[0], eCoord[1]) )
+ return e;
+
+ if (matchInSameDirection(p0, p1, eCoord[eCoord.length - 1], eCoord[eCoord.length - 2]) )
+ return e;
+ }
+ return null;
+ }
+
+ /**
+ * The coordinate pairs match if they define line segments lying in the same direction.
+ * E.g. the segments are parallel and in the same quadrant
+ * (as opposed to parallel and opposite!).
+ */
+ private boolean matchInSameDirection(Coordinate p0, Coordinate p1, Coordinate ep0, Coordinate ep1)
+ {
+ if (! p0.equals(ep0))
+ return false;
+
+ if (Orientation.index(p0, p1, ep1) == Orientation.COLLINEAR
+ && Quadrant.quadrant(p0, p1) == Quadrant.quadrant(ep0, ep1) )
+ return true;
+ return false;
+ }
+
+ public void printEdges(PrintStream out)
+ {
+ out.println("Edges:");
+ for (int i = 0; i < edges.size(); i++) {
+ out.println("edge " + i + ":");
+ Edge e = (Edge) edges.get(i);
+ e.print(out);
+ e.eiList.print(out);
+ }
+ }
+ void debugPrint(Object o)
+ {
+ System.out.print(o);
+ }
+ void debugPrintln(Object o)
+ {
+ System.out.println(o);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/Position.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Position.java
new file mode 100644
index 0000000..5d169e9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Position.java
@@ -0,0 +1,40 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+/**
+ * A Position indicates the position of a Location relative to a graph component
+ * (Node, Edge, or Area).
+ * @version 1.7
+ */
+public class Position {
+
+ /** An indicator that a Location is <i>on</i> a GraphComponent */
+ public static final int ON = 0;
+ /** An indicator that a Location is to the <i>left</i> of a GraphComponent */
+ public static final int LEFT = 1;
+ /** An indicator that a Location is to the <i>right</i> of a GraphComponent */
+ public static final int RIGHT = 2;
+ /**
+ * Returns LEFT if the position is RIGHT, RIGHT if the position is LEFT, or the position
+ * otherwise.
+ */
+ public static final int opposite(int position)
+ {
+ if (position == LEFT) return RIGHT;
+ if (position == RIGHT) return LEFT;
+ return position;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/Quadrant.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Quadrant.java
new file mode 100644
index 0000000..c151a1e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/Quadrant.java
@@ -0,0 +1,139 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+/**
+ * @version 1.7
+ */
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Utility functions for working with quadrants, which are numbered as follows:
+ * <pre>
+ * 1 | 0
+ * --+--
+ * 2 | 3
+ * </pre>
+ *
+ * @version 1.7
+ */
+public class Quadrant
+{
+ public static final int NE = 0;
+ public static final int NW = 1;
+ public static final int SW = 2;
+ public static final int SE = 3;
+
+ /**
+ * Returns the quadrant of a directed line segment (specified as x and y
+ * displacements, which cannot both be 0).
+ *
+ * @throws IllegalArgumentException if the displacements are both 0
+ */
+ public static int quadrant(double dx, double dy)
+ {
+ if (dx == 0.0 && dy == 0.0)
+ throw new IllegalArgumentException("Cannot compute the quadrant for point ( "+ dx + ", " + dy + " )" );
+ if (dx >= 0.0) {
+ if (dy >= 0.0)
+ return NE;
+ else
+ return SE;
+ }
+ else {
+ if (dy >= 0.0)
+ return NW;
+ else
+ return SW;
+ }
+ }
+
+ /**
+ * Returns the quadrant of a directed line segment from p0 to p1.
+ *
+ * @throws IllegalArgumentException if the points are equal
+ */
+ public static int quadrant(Coordinate p0, Coordinate p1)
+ {
+ if (p1.x == p0.x && p1.y == p0.y)
+ throw new IllegalArgumentException("Cannot compute the quadrant for two identical points " + p0);
+
+ if (p1.x >= p0.x) {
+ if (p1.y >= p0.y)
+ return NE;
+ else
+ return SE;
+ }
+ else {
+ if (p1.y >= p0.y)
+ return NW;
+ else
+ return SW;
+ }
+ }
+
+ /**
+ * Returns true if the quadrants are 1 and 3, or 2 and 4
+ */
+ public static boolean isOpposite(int quad1, int quad2)
+ {
+ if (quad1 == quad2) return false;
+ int diff = (quad1 - quad2 + 4) % 4;
+ // if quadrants are not adjacent, they are opposite
+ if (diff == 2) return true;
+ return false;
+ }
+
+ /**
+ * Returns the right-hand quadrant of the halfplane defined by the two quadrants,
+ * or -1 if the quadrants are opposite, or the quadrant if they are identical.
+ */
+ public static int commonHalfPlane(int quad1, int quad2)
+ {
+ // if quadrants are the same they do not determine a unique common halfplane.
+ // Simply return one of the two possibilities
+ if (quad1 == quad2) return quad1;
+ int diff = (quad1 - quad2 + 4) % 4;
+ // if quadrants are not adjacent, they do not share a common halfplane
+ if (diff == 2) return -1;
+ //
+ int min = (quad1 < quad2) ? quad1 : quad2;
+ int max = (quad1 > quad2) ? quad1 : quad2;
+ // for this one case, the righthand plane is NOT the minimum index;
+ if (min == 0 && max == 3) return 3;
+ // in general, the halfplane index is the minimum of the two adjacent quadrants
+ return min;
+ }
+
+ /**
+ * Returns whether the given quadrant lies within the given halfplane (specified
+ * by its right-hand quadrant).
+ */
+ public static boolean isInHalfPlane(int quad, int halfPlane)
+ {
+ if (halfPlane == SE) {
+ return quad == SE || quad == SW;
+ }
+ return quad == halfPlane || quad == halfPlane + 1;
+ }
+
+ /**
+ * Returns true if the given quadrant is 0 or 1.
+ */
+ public static boolean isNorthern(int quad)
+ {
+ return quad == NE || quad == NW;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/TopologyLocation.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/TopologyLocation.java
new file mode 100644
index 0000000..176e003
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/TopologyLocation.java
@@ -0,0 +1,185 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph;
+
+
+
+import org.locationtech.jts.geom.Location;
+
+/**
+ * A TopologyLocation is the labelling of a
+ * GraphComponent's topological relationship to a single Geometry.
+ * <p>
+ * If the parent component is an area edge, each side and the edge itself
+ * have a topological location. These locations are named
+ * <ul>
+ * <li> ON: on the edge
+ * <li> LEFT: left-hand side of the edge
+ * <li> RIGHT: right-hand side
+ * </ul>
+ * If the parent component is a line edge or node, there is a single
+ * topological relationship attribute, ON.
+ * <p>
+ * The possible values of a topological location are
+ * {Location.NONE, Location.EXTERIOR, Location.BOUNDARY, Location.INTERIOR}
+ * <p>
+ * The labelling is stored in an array location[j] where
+ * where j has the values ON, LEFT, RIGHT
+ * @version 1.7
+ */
+public class TopologyLocation {
+
+ int location[];
+
+ public TopologyLocation(int[] location)
+ {
+ init(location.length);
+ }
+ /**
+ * Constructs a TopologyLocation specifying how points on, to the left of, and to the
+ * right of some GraphComponent relate to some Geometry. Possible values for the
+ * parameters are Location.NULL, Location.EXTERIOR, Location.BOUNDARY,
+ * and Location.INTERIOR.
+ * @see Location
+ */
+ public TopologyLocation(int on, int left, int right) {
+ init(3);
+ location[Position.ON] = on;
+ location[Position.LEFT] = left;
+ location[Position.RIGHT] = right;
+ }
+
+ public TopologyLocation(int on) {
+ init(1);
+ location[Position.ON] = on;
+ }
+ public TopologyLocation(TopologyLocation gl) {
+ init(gl.location.length);
+ if (gl != null) {
+ for (int i = 0; i < location.length; i++) {
+ location[i] = gl.location[i];
+ }
+ }
+ }
+ private void init(int size)
+ {
+ location = new int[size];
+ setAllLocations(Location.NONE);
+ }
+ public int get(int posIndex)
+ {
+ if (posIndex < location.length) return location[posIndex];
+ return Location.NONE;
+ }
+ /**
+ * @return true if all locations are NULL
+ */
+ public boolean isNull()
+ {
+ for (int i = 0; i < location.length; i++) {
+ if (location[i] != Location.NONE) return false;
+ }
+ return true;
+ }
+ /**
+ * @return true if any locations are NULL
+ */
+ public boolean isAnyNull()
+ {
+ for (int i = 0; i < location.length; i++) {
+ if (location[i] == Location.NONE) return true;
+ }
+ return false;
+ }
+ public boolean isEqualOnSide(TopologyLocation le, int locIndex)
+ {
+ return location[locIndex] == le.location[locIndex];
+ }
+ public boolean isArea() { return location.length > 1; }
+ public boolean isLine() { return location.length == 1; }
+
+ public void flip()
+ {
+ if (location.length <= 1) return;
+ int temp = location[Position.LEFT];
+ location[Position.LEFT] = location[Position.RIGHT];
+ location[Position.RIGHT] = temp;
+ }
+
+
+ public void setAllLocations(int locValue)
+ {
+ for (int i = 0; i < location.length; i++) {
+ location[i] = locValue;
+ }
+ }
+ public void setAllLocationsIfNull(int locValue)
+ {
+ for (int i = 0; i < location.length; i++) {
+ if (location[i] == Location.NONE) location[i] = locValue;
+ }
+ }
+
+ public void setLocation(int locIndex, int locValue)
+ {
+ location[locIndex] = locValue;
+ }
+ public void setLocation(int locValue)
+ {
+ setLocation(Position.ON, locValue);
+ }
+ public int[] getLocations() { return location; }
+ public void setLocations(int on, int left, int right) {
+ location[Position.ON] = on;
+ location[Position.LEFT] = left;
+ location[Position.RIGHT] = right;
+ }
+ public boolean allPositionsEqual(int loc)
+ {
+ for (int i = 0; i < location.length; i++) {
+ if (location[i] != loc) return false;
+ }
+ return true;
+ }
+
+ /**
+ * merge updates only the NULL attributes of this object
+ * with the attributes of another.
+ */
+ public void merge(TopologyLocation gl)
+ {
+ // if the src is an Area label & and the dest is not, increase the dest to be an Area
+ if (gl.location.length > location.length) {
+ int [] newLoc = new int[3];
+ newLoc[Position.ON] = location[Position.ON];
+ newLoc[Position.LEFT] = Location.NONE;
+ newLoc[Position.RIGHT] = Location.NONE;
+ location = newLoc;
+ }
+ for (int i = 0; i < location.length; i++) {
+ if (location[i] == Location.NONE && i < gl.location.length)
+ location[i] = gl.location[i];
+ }
+ }
+
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer();
+ if (location.length > 1) buf.append(Location.toLocationSymbol(location[Position.LEFT]));
+ buf.append(Location.toLocationSymbol(location[Position.ON]));
+ if (location.length > 1) buf.append(Location.toLocationSymbol(location[Position.RIGHT]));
+ return buf.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/EdgeSetIntersector.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/EdgeSetIntersector.java
new file mode 100644
index 0000000..a3059f1
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/EdgeSetIntersector.java
@@ -0,0 +1,57 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+/**
+ * @version 1.7
+ */
+import java.util.List;
+
+/**
+ * An EdgeSetIntersector computes all the intersections between the
+ * edges in the set. It adds the computed intersections to each edge
+ * they are found on. It may be used in two scenarios:
+ * <ul>
+ * <li>determining the internal intersections between a single set of edges
+ * <li>determining the mutual intersections between two different sets of edges
+ * </ul>
+ * It uses a {@link SegmentIntersector} to compute the intersections between
+ * segments and to record statistics about what kinds of intersections were found.
+ *
+ * @version 1.7
+ */
+public abstract class EdgeSetIntersector
+{
+ public EdgeSetIntersector() {
+ }
+
+ /**
+ * Computes all self-intersections between edges in a set of edges,
+ * allowing client to choose whether self-intersections are computed.
+ *
+ * @param edges a list of edges to test for intersections
+ * @param si the SegmentIntersector to use
+ * @param testAllSegments true if self-intersections are to be tested as well
+ */
+ abstract public void computeIntersections(List edges, SegmentIntersector si, boolean testAllSegments);
+
+ /**
+ * Computes all mutual intersections between two sets of edges.
+ */
+ abstract public void computeIntersections(List edges0, List edges1, SegmentIntersector si);
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChain.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChain.java
new file mode 100644
index 0000000..5671e55
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChain.java
@@ -0,0 +1,34 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+/**
+ * @version 1.7
+ */
+public class MonotoneChain {
+
+ MonotoneChainEdge mce;
+ int chainIndex;
+
+ public MonotoneChain(MonotoneChainEdge mce, int chainIndex) {
+ this.mce = mce;
+ this.chainIndex = chainIndex;
+ }
+
+ public void computeIntersections(MonotoneChain mc, SegmentIntersector si)
+ {
+ this.mce.computeIntersectsForChain(chainIndex, mc.mce, mc.chainIndex, si);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChainEdge.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChainEdge.java
new file mode 100644
index 0000000..583a05b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChainEdge.java
@@ -0,0 +1,142 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geomgraph.Edge;
+
+
+/**
+ * MonotoneChains are a way of partitioning the segments of an edge to
+ * allow for fast searching of intersections.
+ * They have the following properties:
+ * <ol>
+ * <li>the segments within a monotone chain will never intersect each other
+ * <li>the envelope of any contiguous subset of the segments in a monotone chain
+ * is simply the envelope of the endpoints of the subset.
+ * </ol>
+ * Property 1 means that there is no need to test pairs of segments from within
+ * the same monotone chain for intersection.
+ * Property 2 allows
+ * binary search to be used to find the intersection points of two monotone chains.
+ * For many types of real-world data, these properties eliminate a large number of
+ * segment comparisons, producing substantial speed gains.
+ * @version 1.7
+ */
+public class MonotoneChainEdge {
+
+ Edge e;
+ Coordinate[] pts; // cache a reference to the coord array, for efficiency
+ // the lists of start/end indexes of the monotone chains.
+ // Includes the end point of the edge as a sentinel
+ int[] startIndex;
+
+ public MonotoneChainEdge(Edge e) {
+ this.e = e;
+ pts = e.getCoordinates();
+ MonotoneChainIndexer mcb = new MonotoneChainIndexer();
+ startIndex = mcb.getChainStartIndices(pts);
+ }
+
+ public Coordinate[] getCoordinates() { return pts; }
+ public int[] getStartIndexes() { return startIndex; }
+
+ public double getMinX(int chainIndex)
+ {
+ double x1 = pts[startIndex[chainIndex]].x;
+ double x2 = pts[startIndex[chainIndex + 1]].x;
+ return x1 < x2 ? x1 : x2;
+ }
+ public double getMaxX(int chainIndex)
+ {
+ double x1 = pts[startIndex[chainIndex]].x;
+ double x2 = pts[startIndex[chainIndex + 1]].x;
+ return x1 > x2 ? x1 : x2;
+ }
+
+ public void computeIntersects(MonotoneChainEdge mce, SegmentIntersector si)
+ {
+ for (int i = 0; i < startIndex.length - 1; i++) {
+ for (int j = 0; j < mce.startIndex.length - 1; j++) {
+ computeIntersectsForChain( i,
+ mce, j,
+ si );
+ }
+ }
+ }
+ public void computeIntersectsForChain(
+ int chainIndex0,
+ MonotoneChainEdge mce,
+ int chainIndex1,
+ SegmentIntersector si)
+ {
+ computeIntersectsForChain(startIndex[chainIndex0], startIndex[chainIndex0 + 1],
+ mce,
+ mce.startIndex[chainIndex1], mce.startIndex[chainIndex1 + 1],
+ si );
+ }
+
+ private void computeIntersectsForChain(
+ int start0, int end0,
+ MonotoneChainEdge mce,
+ int start1, int end1,
+ SegmentIntersector ei)
+ {
+//Debug.println("computeIntersectsForChain:" + p00 + p01 + p10 + p11);
+
+ // terminating condition for the recursion
+ if (end0 - start0 == 1 && end1 - start1 == 1) {
+ ei.addIntersections(e, start0, mce.e, start1);
+ return;
+ }
+ // nothing to do if the envelopes of these chains don't overlap
+ if (! overlaps(start0, end0, mce, start1, end1)) return;
+
+ // the chains overlap, so split each in half and iterate (binary search)
+ int mid0 = (start0 + end0) / 2;
+ int mid1 = (start1 + end1) / 2;
+
+ // Assert: mid != start or end (since we checked above for end - start <= 1)
+ // check terminating conditions before recursing
+ if (start0 < mid0) {
+ if (start1 < mid1) computeIntersectsForChain(start0, mid0, mce, start1, mid1, ei);
+ if (mid1 < end1) computeIntersectsForChain(start0, mid0, mce, mid1, end1, ei);
+ }
+ if (mid0 < end0) {
+ if (start1 < mid1) computeIntersectsForChain(mid0, end0, mce, start1, mid1, ei);
+ if (mid1 < end1) computeIntersectsForChain(mid0, end0, mce, mid1, end1, ei);
+ }
+ }
+
+ /**
+ * Tests whether the envelopes of two chain sections overlap (intersect).
+ *
+ * @param start0
+ * @param end0
+ * @param mce
+ * @param start1
+ * @param end1
+ * @return true if the section envelopes overlap
+ */
+ private boolean overlaps(
+ int start0, int end0,
+ MonotoneChainEdge mce,
+ int start1, int end1)
+ {
+ return Envelope.intersects(pts[start0], pts[end0], mce.pts[start1], mce.pts[end1]);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChainIndexer.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChainIndexer.java
new file mode 100644
index 0000000..f6a0aea
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/MonotoneChainIndexer.java
@@ -0,0 +1,99 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Quadrant;
+
+
+/**
+ * MonotoneChains are a way of partitioning the segments of an edge to
+ * allow for fast searching of intersections.
+ * Specifically, a sequence of contiguous line segments
+ * is a monotone chain iff all the vectors defined by the oriented segments
+ * lies in the same quadrant.
+ * <p>
+ * Monotone Chains have the following useful properties:
+ * <ol>
+ * <li>the segments within a monotone chain will never intersect each other
+ * <li>the envelope of any contiguous subset of the segments in a monotone chain
+ * is simply the envelope of the endpoints of the subset.
+ * </ol>
+ * Property 1 means that there is no need to test pairs of segments from within
+ * the same monotone chain for intersection.
+ * Property 2 allows
+ * binary search to be used to find the intersection points of two monotone chains.
+ * For many types of real-world data, these properties eliminate a large number of
+ * segment comparisons, producing substantial speed gains.
+ * <p>
+ * Note that due to the efficient intersection test, there is no need to limit the size
+ * of chains to obtain fast performance.
+ *
+ * @version 1.7
+ */
+public class MonotoneChainIndexer {
+
+ public static int[] toIntArray(List list)
+ {
+ int[] array = new int[list.size()];
+ for (int i = 0; i < array.length; i++) {
+ array[i] = ((Integer) list.get(i)).intValue();
+ }
+ return array;
+ }
+
+ public MonotoneChainIndexer() {
+ }
+
+ public int[] getChainStartIndices(Coordinate[] pts)
+ {
+ // find the startpoint (and endpoints) of all monotone chains in this edge
+ int start = 0;
+ List startIndexList = new ArrayList();
+ startIndexList.add(new Integer(start));
+ do {
+ int last = findChainEnd(pts, start);
+ startIndexList.add(new Integer(last));
+ start = last;
+ } while (start < pts.length - 1);
+ // copy list to an array of ints, for efficiency
+ int[] startIndex = toIntArray(startIndexList);
+ return startIndex;
+ }
+
+ /**
+ * @return the index of the last point in the monotone chain
+ */
+ private int findChainEnd(Coordinate[] pts, int start)
+ {
+ // determine quadrant for chain
+ int chainQuad = Quadrant.quadrant(pts[start], pts[start + 1]);
+ int last = start + 1;
+ while (last < pts.length ) {
+ //if (last - start > 100) break;
+ // compute quadrant for next possible segment in chain
+ int quad = Quadrant.quadrant(pts[last - 1], pts[last]);
+ if (quad != chainQuad) break;
+ last++;
+ }
+ return last - 1;
+ }
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SegmentIntersector.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SegmentIntersector.java
new file mode 100644
index 0000000..e2ad5d9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SegmentIntersector.java
@@ -0,0 +1,206 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.Node;
+
+
+/**
+ * Computes the intersection of line segments,
+ * and adds the intersection to the edges containing the segments.
+ *
+ * @version 1.7
+ */
+public class SegmentIntersector
+{
+
+ public static boolean isAdjacentSegments(int i1, int i2)
+ {
+ return Math.abs(i1 - i2) == 1;
+ }
+
+ /**
+ * These variables keep track of what types of intersections were
+ * found during ALL edges that have been intersected.
+ */
+ private boolean hasIntersection = false;
+ private boolean hasProper = false;
+ private boolean hasProperInterior = false;
+ // the proper intersection point found
+ private Coordinate properIntersectionPoint = null;
+
+ private LineIntersector li;
+ private boolean includeProper;
+ private boolean recordIsolated;
+ private boolean isSelfIntersection;
+ //private boolean intersectionFound;
+ private int numIntersections = 0;
+
+ // testing only
+ public int numTests = 0;
+
+ private Collection[] bdyNodes;
+ private boolean isDone = false;
+ private boolean isDoneWhenProperInt = false;
+
+
+ public SegmentIntersector(LineIntersector li, boolean includeProper, boolean recordIsolated)
+ {
+ this.li = li;
+ this.includeProper = includeProper;
+ this.recordIsolated = recordIsolated;
+ }
+
+ public void setBoundaryNodes( Collection bdyNodes0,
+ Collection bdyNodes1)
+ {
+ bdyNodes = new Collection[2];
+ bdyNodes[0] = bdyNodes0;
+ bdyNodes[1] = bdyNodes1;
+ }
+
+ public void setIsDoneIfProperInt(boolean isDoneWhenProperInt) {
+ this.isDoneWhenProperInt = isDoneWhenProperInt;
+ }
+
+ public boolean isDone() {
+ return isDone;
+ }
+ /**
+ * @return the proper intersection point, or <code>null</code> if none was found
+ */
+ public Coordinate getProperIntersectionPoint() { return properIntersectionPoint; }
+
+ public boolean hasIntersection() { return hasIntersection; }
+ /**
+ * A proper intersection is an intersection which is interior to at least two
+ * line segments. Note that a proper intersection is not necessarily
+ * in the interior of the entire Geometry, since another edge may have
+ * an endpoint equal to the intersection, which according to SFS semantics
+ * can result in the point being on the Boundary of the Geometry.
+ */
+ public boolean hasProperIntersection() { return hasProper; }
+ /**
+ * A proper interior intersection is a proper intersection which is <b>not</b>
+ * contained in the set of boundary nodes set for this SegmentIntersector.
+ */
+ public boolean hasProperInteriorIntersection() { return hasProperInterior; }
+
+
+ /**
+ * A trivial intersection is an apparent self-intersection which in fact
+ * is simply the point shared by adjacent line segments.
+ * Note that closed edges require a special check for the point shared by the beginning
+ * and end segments.
+ */
+ private boolean isTrivialIntersection(Edge e0, int segIndex0, Edge e1, int segIndex1)
+ {
+ if (e0 == e1) {
+ if (li.getIntersectionNum() == 1) {
+ if (isAdjacentSegments(segIndex0, segIndex1))
+ return true;
+ if (e0.isClosed()) {
+ int maxSegIndex = e0.getNumPoints() - 1;
+ if ( (segIndex0 == 0 && segIndex1 == maxSegIndex)
+ || (segIndex1 == 0 && segIndex0 == maxSegIndex) ) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * This method is called by clients of the EdgeIntersector class to test for and add
+ * intersections for two segments of the edges being intersected.
+ * Note that clients (such as MonotoneChainEdges) may choose not to intersect
+ * certain pairs of segments for efficiency reasons.
+ */
+ public void addIntersections(
+ Edge e0, int segIndex0,
+ Edge e1, int segIndex1
+ )
+ {
+ if (e0 == e1 && segIndex0 == segIndex1) return;
+numTests++;
+ Coordinate p00 = e0.getCoordinates()[segIndex0];
+ Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
+ Coordinate p10 = e1.getCoordinates()[segIndex1];
+ Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
+
+ li.computeIntersection(p00, p01, p10, p11);
+//if (li.hasIntersection() && li.isProper()) Debug.println(li);
+ /**
+ * Always record any non-proper intersections.
+ * If includeProper is true, record any proper intersections as well.
+ */
+ if (li.hasIntersection()) {
+ if (recordIsolated) {
+ e0.setIsolated(false);
+ e1.setIsolated(false);
+ }
+ //intersectionFound = true;
+ numIntersections++;
+ // if the segments are adjacent they have at least one trivial intersection,
+ // the shared endpoint. Don't bother adding it if it is the
+ // only intersection.
+ if (! isTrivialIntersection(e0, segIndex0, e1, segIndex1)) {
+ hasIntersection = true;
+ if (includeProper || ! li.isProper() ) {
+//Debug.println(li);
+ e0.addIntersections(li, segIndex0, 0);
+ e1.addIntersections(li, segIndex1, 1);
+ }
+ if (li.isProper()) {
+ properIntersectionPoint = li.getIntersection(0).copy();
+ hasProper = true;
+ if (isDoneWhenProperInt) {
+ isDone = true;
+ }
+ if (! isBoundaryPoint(li, bdyNodes))
+ hasProperInterior = true;
+ }
+ //if (li.isCollinear())
+ //hasCollinear = true;
+ }
+ }
+ }
+
+ private boolean isBoundaryPoint(LineIntersector li, Collection[] bdyNodes)
+ {
+ if (bdyNodes == null) return false;
+ if (isBoundaryPointInternal(li, bdyNodes[0])) return true;
+ if (isBoundaryPointInternal(li, bdyNodes[1])) return true;
+ return false;
+ }
+
+ private boolean isBoundaryPointInternal(LineIntersector li, Collection bdyNodes)
+ {
+ for (Iterator i = bdyNodes.iterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ Coordinate pt = node.getCoordinate();
+ if (li.isIntersection(pt)) return true;
+ }
+ return false;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleEdgeSetIntersector.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleEdgeSetIntersector.java
new file mode 100644
index 0000000..281b73e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleEdgeSetIntersector.java
@@ -0,0 +1,82 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Edge;
+
+/**
+ * Finds all intersections in one or two sets of edges,
+ * using the straightforward method of
+ * comparing all segments.
+ * This algorithm is too slow for production use, but is useful for testing purposes.
+ * @version 1.7
+ */
+public class SimpleEdgeSetIntersector
+ extends EdgeSetIntersector
+{
+ // statistics information
+ int nOverlaps;
+
+ public SimpleEdgeSetIntersector() {
+ }
+
+ public void computeIntersections(List edges, SegmentIntersector si, boolean testAllSegments)
+ {
+ nOverlaps = 0;
+
+ for (Iterator i0 = edges.iterator(); i0.hasNext(); ) {
+ Edge edge0 = (Edge) i0.next();
+ for (Iterator i1 = edges.iterator(); i1.hasNext(); ) {
+ Edge edge1 = (Edge) i1.next();
+ if (testAllSegments || edge0 != edge1)
+ computeIntersects(edge0, edge1, si);
+ }
+ }
+ }
+
+
+ public void computeIntersections(List edges0, List edges1, SegmentIntersector si)
+ {
+ nOverlaps = 0;
+
+ for (Iterator i0 = edges0.iterator(); i0.hasNext(); ) {
+ Edge edge0 = (Edge) i0.next();
+ for (Iterator i1 = edges1.iterator(); i1.hasNext(); ) {
+ Edge edge1 = (Edge) i1.next();
+ computeIntersects(edge0, edge1, si);
+ }
+ }
+ }
+
+ /**
+ * Performs a brute-force comparison of every segment in each Edge.
+ * This has n^2 performance, and is about 100 times slower than using
+ * monotone chains.
+ */
+ private void computeIntersects(Edge e0, Edge e1, SegmentIntersector si)
+ {
+ Coordinate[] pts0 = e0.getCoordinates();
+ Coordinate[] pts1 = e1.getCoordinates();
+ for (int i0 = 0; i0 < pts0.length - 1; i0++) {
+ for (int i1 = 0; i1 < pts1.length - 1; i1++) {
+ si.addIntersections(e0, i0, e1, i1);
+ }
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleMCSweepLineIntersector.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleMCSweepLineIntersector.java
new file mode 100644
index 0000000..f7db0a8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleMCSweepLineIntersector.java
@@ -0,0 +1,151 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+/**
+ * @version 1.7
+ */
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geomgraph.Edge;
+
+/**
+ * Finds all intersections in one or two sets of edges,
+ * using an x-axis sweepline algorithm in conjunction with Monotone Chains.
+ * While still O(n^2) in the worst case, this algorithm
+ * drastically improves the average-case time.
+ * The use of MonotoneChains as the items in the index
+ * seems to offer an improvement in performance over a sweep-line alone.
+ *
+ * @version 1.7
+ */
+public class SimpleMCSweepLineIntersector
+ extends EdgeSetIntersector
+{
+
+ List events = new ArrayList();
+ // statistics information
+ int nOverlaps;
+
+ /**
+ * A SimpleMCSweepLineIntersector creates monotone chains from the edges
+ * and compares them using a simple sweep-line along the x-axis.
+ */
+ public SimpleMCSweepLineIntersector() {
+ }
+
+ public void computeIntersections(List edges, SegmentIntersector si, boolean testAllSegments)
+ {
+ if (testAllSegments)
+ addEdges(edges, null);
+ else
+ addEdges(edges);
+ computeIntersections(si);
+ }
+
+ public void computeIntersections(List edges0, List edges1, SegmentIntersector si)
+ {
+ addEdges(edges0, edges0);
+ addEdges(edges1, edges1);
+ computeIntersections(si);
+ }
+
+ private void addEdges(List edges)
+ {
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge edge = (Edge) i.next();
+ // edge is its own group
+ addEdge(edge, edge);
+ }
+ }
+ private void addEdges(List edges, Object edgeSet)
+ {
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge edge = (Edge) i.next();
+ addEdge(edge, edgeSet);
+ }
+ }
+
+ private void addEdge(Edge edge, Object edgeSet)
+ {
+ MonotoneChainEdge mce = edge.getMonotoneChainEdge();
+ int[] startIndex = mce.getStartIndexes();
+ for (int i = 0; i < startIndex.length - 1; i++) {
+ MonotoneChain mc = new MonotoneChain(mce, i);
+ SweepLineEvent insertEvent = new SweepLineEvent(edgeSet, mce.getMinX(i), mc);
+ events.add(insertEvent);
+ events.add(new SweepLineEvent(mce.getMaxX(i), insertEvent));
+ }
+ }
+
+ /**
+ * Because Delete Events have a link to their corresponding Insert event,
+ * it is possible to compute exactly the range of events which must be
+ * compared to a given Insert event object.
+ */
+ private void prepareEvents()
+ {
+ Collections.sort(events);
+ // set DELETE event indexes
+ for (int i = 0; i < events.size(); i++ )
+ {
+ SweepLineEvent ev = (SweepLineEvent) events.get(i);
+ if (ev.isDelete()) {
+ ev.getInsertEvent().setDeleteEventIndex(i);
+ }
+ }
+ }
+
+ private void computeIntersections(SegmentIntersector si)
+ {
+ nOverlaps = 0;
+ prepareEvents();
+
+ for (int i = 0; i < events.size(); i++ )
+ {
+ SweepLineEvent ev = (SweepLineEvent) events.get(i);
+ if (ev.isInsert()) {
+ processOverlaps(i, ev.getDeleteEventIndex(), ev, si);
+ }
+ if (si.isDone()) {
+ break;
+ }
+ }
+ }
+
+ private void processOverlaps(int start, int end, SweepLineEvent ev0, SegmentIntersector si)
+ {
+ MonotoneChain mc0 = (MonotoneChain) ev0.getObject();
+ /**
+ * Since we might need to test for self-intersections,
+ * include current INSERT event object in list of event objects to test.
+ * Last index can be skipped, because it must be a Delete event.
+ */
+ for (int i = start; i < end; i++ ) {
+ SweepLineEvent ev1 = (SweepLineEvent) events.get(i);
+ if (ev1.isInsert()) {
+ MonotoneChain mc1 = (MonotoneChain) ev1.getObject();
+ // don't compare edges in same group, if labels are present
+ if (! ev0.isSameLabel(ev1)) {
+ mc0.computeIntersections(mc1, si);
+ nOverlaps++;
+ }
+ }
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleSweepLineIntersector.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleSweepLineIntersector.java
new file mode 100644
index 0000000..a8d1c71
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SimpleSweepLineIntersector.java
@@ -0,0 +1,144 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+/**
+ * @version 1.7
+ */
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Edge;
+
+/**
+ * Finds all intersections in one or two sets of edges,
+ * using a simple x-axis sweepline algorithm.
+ * While still O(n^2) in the worst case, this algorithm
+ * drastically improves the average-case time.
+ *
+ * @version 1.7
+ */
+public class SimpleSweepLineIntersector
+ extends EdgeSetIntersector
+{
+
+ List events = new ArrayList();
+ // statistics information
+ int nOverlaps;
+
+ public SimpleSweepLineIntersector() {
+ }
+
+ public void computeIntersections(List edges, SegmentIntersector si, boolean testAllSegments)
+ {
+ if (testAllSegments)
+ add(edges, null);
+ else
+ add(edges);
+ computeIntersections(si);
+ }
+
+ public void computeIntersections(List edges0, List edges1, SegmentIntersector si)
+ {
+ add(edges0, edges0);
+ add(edges1, edges1);
+ computeIntersections(si);
+ }
+
+ private void add(List edges)
+ {
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge edge = (Edge) i.next();
+ // edge is its own group
+ add(edge, edge);
+ }
+ }
+ private void add(List edges, Object edgeSet)
+ {
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge edge = (Edge) i.next();
+ add(edge, edgeSet);
+ }
+ }
+
+
+ private void add(Edge edge, Object edgeSet)
+ {
+ Coordinate[] pts = edge.getCoordinates();
+ for (int i = 0; i < pts.length - 1; i++) {
+ SweepLineSegment ss = new SweepLineSegment(edge, i);
+ SweepLineEvent insertEvent = new SweepLineEvent(edgeSet, ss.getMinX(), null);
+ events.add(insertEvent);
+ events.add(new SweepLineEvent(ss.getMaxX(), insertEvent));
+ }
+ }
+
+ /**
+ * Because DELETE events have a link to their corresponding INSERT event,
+ * it is possible to compute exactly the range of events which must be
+ * compared to a given INSERT event object.
+ */
+ private void prepareEvents()
+ {
+ Collections.sort(events);
+ // set DELETE event indexes
+ for (int i = 0; i < events.size(); i++ )
+ {
+ SweepLineEvent ev = (SweepLineEvent) events.get(i);
+ if (ev.isDelete()) {
+ ev.getInsertEvent().setDeleteEventIndex(i);
+ }
+ }
+ }
+
+ private void computeIntersections(SegmentIntersector si)
+ {
+ nOverlaps = 0;
+ prepareEvents();
+
+ for (int i = 0; i < events.size(); i++ )
+ {
+ SweepLineEvent ev = (SweepLineEvent) events.get(i);
+ if (ev.isInsert()) {
+ processOverlaps(i, ev.getDeleteEventIndex(), ev, si);
+ }
+ }
+ }
+
+ private void processOverlaps(int start, int end, SweepLineEvent ev0, SegmentIntersector si)
+ {
+ SweepLineSegment ss0 = (SweepLineSegment) ev0.getObject();
+ /**
+ * Since we might need to test for self-intersections,
+ * include current INSERT event object in list of event objects to test.
+ * Last index can be skipped, because it must be a Delete event.
+ */
+ for (int i = start; i < end; i++ ) {
+ SweepLineEvent ev1 = (SweepLineEvent) events.get(i);
+ if (ev1.isInsert()) {
+ SweepLineSegment ss1 = (SweepLineSegment) ev1.getObject();
+ // don't compare edges in same group, if labels are present
+ if (! ev0.isSameLabel(ev1)) {
+ ss0.computeIntersections(ss1, si);
+ nOverlaps++;
+ }
+ }
+ }
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SweepLineEvent.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SweepLineEvent.java
new file mode 100644
index 0000000..1304475
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SweepLineEvent.java
@@ -0,0 +1,91 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+/**
+ * @version 1.7
+ */
+public class SweepLineEvent
+ implements Comparable
+{
+ private static final int INSERT = 1;
+ private static final int DELETE = 2;
+
+ private Object label; // used for red-blue intersection detection
+ private double xValue;
+ private int eventType;
+ private SweepLineEvent insertEvent = null; // null if this is an INSERT event
+ private int deleteEventIndex;
+ private Object obj;
+
+ /**
+ * Creates an INSERT event.
+ *
+ * @param label the edge set label for this object
+ * @param x the event location
+ * @param obj the object being inserted
+ */
+ public SweepLineEvent(Object label, double x, Object obj)
+ {
+ this.eventType = INSERT;
+ this.label = label;
+ xValue = x;
+ this.obj = obj;
+ }
+
+ /**
+ * Creates a DELETE event.
+ *
+ * @param x the event location
+ * @param insertEvent the corresponding INSERT event
+ */
+ public SweepLineEvent(double x, SweepLineEvent insertEvent)
+ {
+ eventType = DELETE;
+ xValue = x;
+ this.insertEvent = insertEvent;
+ }
+
+ public boolean isInsert() { return eventType == INSERT; }
+ public boolean isDelete() { return eventType == DELETE; }
+ public SweepLineEvent getInsertEvent() { return insertEvent; }
+ public int getDeleteEventIndex() { return deleteEventIndex; }
+ public void setDeleteEventIndex(int deleteEventIndex) { this.deleteEventIndex = deleteEventIndex; }
+
+ public Object getObject() { return obj; }
+
+ public boolean isSameLabel(SweepLineEvent ev)
+ {
+ // no label set indicates single group
+ if (label == null) return false;
+ return label == ev.label;
+ }
+ /**
+ * Events are ordered first by their x-value, and then by their eventType.
+ * Insert events are sorted before Delete events, so that
+ * items whose Insert and Delete events occur at the same x-value will be
+ * correctly handled.
+ */
+ public int compareTo(Object o) {
+ SweepLineEvent pe = (SweepLineEvent) o;
+ if (xValue < pe.xValue) return -1;
+ if (xValue > pe.xValue) return 1;
+ if (eventType < pe.eventType) return -1;
+ if (eventType > pe.eventType) return 1;
+ return 0;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SweepLineSegment.java b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SweepLineSegment.java
new file mode 100644
index 0000000..395ae06
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SweepLineSegment.java
@@ -0,0 +1,53 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geomgraph.index;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Edge;
+
+
+/**
+ * @version 1.7
+ */
+public class SweepLineSegment {
+
+ Edge edge;
+ Coordinate[] pts;
+ int ptIndex;
+
+ public SweepLineSegment(Edge edge, int ptIndex) {
+ this.edge = edge;
+ this.ptIndex = ptIndex;
+ pts = edge.getCoordinates();
+ }
+
+ public double getMinX()
+ {
+ double x1 = pts[ptIndex].x;
+ double x2 = pts[ptIndex + 1].x;
+ return x1 < x2 ? x1 : x2;
+ }
+ public double getMaxX()
+ {
+ double x1 = pts[ptIndex].x;
+ double x2 = pts[ptIndex + 1].x;
+ return x1 > x2 ? x1 : x2;
+ }
+ public void computeIntersections(SweepLineSegment ss, SegmentIntersector si)
+ {
+ si.addIntersections(edge, ptIndex, ss.edge, ss.ptIndex);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/package.html b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/package.html
new file mode 100644
index 0000000..d6c2cbe
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/index/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes that implement indexes for performing noding on geometry graph edges.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/geomgraph/package.html b/modules/core/src/main/java/org/locationtech/jts/geomgraph/package.html
new file mode 100644
index 0000000..1be97f6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/geomgraph/package.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes that implement topology graphs.
+<P>
+The Java Topology Suite (JTS) is a Java API that implements a core set of spatial data operations using an explicit precision model and robust geometric algorithms. JTS is intended to be used in the development of applications that support the validation, cleaning, integration and querying of spatial datasets.
+<P>
+JTS attempts to implement the OpenGIS Simple Features Specification (SFS) as accurately as possible. In some cases the SFS is unclear or omits a specification; in this case JTS attempts to choose a reasonable and consistent alternative. Differences from and elaborations of the SFS are documented in this specification.
+
+<h2>Package Specification</h2>
+
+<ul>
+ <li>Java Topology Suite Technical Specifications
+ <li><A HREF="http://www.opengis.org/techno/specs.htm">
+ OpenGIS Simple Features Specification for SQL</A>
+</ul>
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/ArrayListVisitor.java b/modules/core/src/main/java/org/locationtech/jts/index/ArrayListVisitor.java
new file mode 100644
index 0000000..6e2145c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/ArrayListVisitor.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index;
+
+import java.util.ArrayList;
+
+/**
+ * @version 1.7
+ */
+public class ArrayListVisitor
+ implements ItemVisitor
+{
+
+ private ArrayList items = new ArrayList();
+ public ArrayListVisitor() {
+ }
+
+ public void visitItem(Object item)
+ {
+ items.add(item);
+ }
+
+ public ArrayList getItems() { return items; }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/ItemVisitor.java b/modules/core/src/main/java/org/locationtech/jts/index/ItemVisitor.java
new file mode 100644
index 0000000..e33dd9d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/ItemVisitor.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index;
+
+/**
+ * A visitor for items in an index.
+ *
+ * @version 1.7
+ */
+
+public interface ItemVisitor
+{
+ void visitItem(Object item);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/SpatialIndex.java b/modules/core/src/main/java/org/locationtech/jts/index/SpatialIndex.java
new file mode 100644
index 0000000..d503c58
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/SpatialIndex.java
@@ -0,0 +1,67 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+
+/**
+ * The basic operations supported by classes
+ * implementing spatial index algorithms.
+ * <p>
+ * A spatial index typically provides a primary filter for range rectangle queries.
+ * A secondary filter is required to test for exact intersection.
+ * The secondary filter may consist of other kinds of tests,
+ * such as testing other spatial relationships.
+ *
+ * @version 1.7
+ */
+public interface SpatialIndex
+{
+ /**
+ * Adds a spatial item with an extent specified by the given {@link Envelope} to the index
+ */
+ void insert(Envelope itemEnv, Object item);
+
+ /**
+ * Queries the index for all items whose extents intersect the given search {@link Envelope}
+ * Note that some kinds of indexes may also return objects which do not in fact
+ * intersect the query envelope.
+ *
+ * @param searchEnv the envelope to query for
+ * @return a list of the items found by the query
+ */
+ List query(Envelope searchEnv);
+
+ /**
+ * Queries the index for all items whose extents intersect the given search {@link Envelope},
+ * and applies an {@link ItemVisitor} to them.
+ * Note that some kinds of indexes may also return objects which do not in fact
+ * intersect the query envelope.
+ *
+ * @param searchEnv the envelope to query for
+ * @param visitor a visitor object to apply to the items found
+ */
+ void query(Envelope searchEnv, ItemVisitor visitor);
+
+ /**
+ * Removes a single item from the tree.
+ *
+ * @param itemEnv the Envelope of the item to remove
+ * @param item the item to remove
+ * @return <code>true</code> if the item was found
+ */
+ boolean remove(Envelope itemEnv, Object item);
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/bintree/Bintree.java b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Bintree.java
new file mode 100644
index 0000000..1d82259
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Bintree.java
@@ -0,0 +1,190 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.bintree;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+
+/**
+ * An <code>BinTree</code> (or "Binary Interval Tree")
+ * is a 1-dimensional version of a quadtree.
+ * It indexes 1-dimensional intervals (which may
+ * be the projection of 2-D objects on an axis).
+ * It supports range searching
+ * (where the range may be a single point).
+ * This structure is dynamic -
+ * new items can be added at any time,
+ * and it will support deletion of items
+ * (although this is not currently implemented).
+ * <p>
+ * This implementation does not require specifying the extent of the inserted
+ * items beforehand. It will automatically expand to accommodate any extent
+ * of dataset.
+ * <p>
+ * The bintree structure is used to provide a primary filter
+ * for interval queries. The query() method returns a list of
+ * all objects which <i>may</i> intersect the query interval.
+ * Note that it may return objects which do not in fact intersect.
+ * A secondary filter is required to test for exact intersection.
+ * Of course, this secondary filter may consist of other tests besides
+ * intersection, such as testing other kinds of spatial relationships.
+ * <p>
+ * This index is different to the Interval Tree of Edelsbrunner
+ * or the Segment Tree of Bentley.
+ *
+ * @version 1.7
+ */
+public class Bintree
+{
+ /**
+ * Ensure that the Interval for the inserted item has non-zero extents.
+ * Use the current minExtent to pad it, if necessary
+ */
+ public static Interval ensureExtent(Interval itemInterval, double minExtent)
+ {
+ double min = itemInterval.getMin();
+ double max = itemInterval.getMax();
+ // has a non-zero extent
+ if (min != max) return itemInterval;
+
+ // pad extent
+ if (min == max) {
+ min = min - minExtent / 2.0;
+ max = min + minExtent / 2.0;
+ }
+ return new Interval(min, max);
+ }
+
+ private Root root;
+ /**
+ * Statistics
+ *
+ * minExtent is the minimum extent of all items
+ * inserted into the tree so far. It is used as a heuristic value
+ * to construct non-zero extents for features with zero extent.
+ * Start with a non-zero extent, in case the first feature inserted has
+ * a zero extent in both directions. This value may be non-optimal, but
+ * only one feature will be inserted with this value.
+ **/
+ private double minExtent = 1.0;
+
+ public Bintree()
+ {
+ root = new Root();
+ }
+
+ public int depth()
+ {
+ if (root != null) return root.depth();
+ return 0;
+ }
+ public int size()
+ {
+ if (root != null) return root.size();
+ return 0;
+ }
+ /**
+ * Compute the total number of nodes in the tree
+ *
+ * @return the number of nodes in the tree
+ */
+ public int nodeSize()
+ {
+ if (root != null) return root.nodeSize();
+ return 0;
+ }
+
+ public void insert(Interval itemInterval, Object item)
+ {
+ collectStats(itemInterval);
+ Interval insertInterval = ensureExtent(itemInterval, minExtent);
+//int oldSize = size();
+ root.insert(insertInterval, item);
+ /* DEBUG
+int newSize = size();
+System.out.println("BinTree: size = " + newSize + " node size = " + nodeSize());
+if (newSize <= oldSize) {
+ System.out.println("Lost item!");
+ root.insert(insertInterval, item);
+ System.out.println("reinsertion size = " + size());
+}
+ */
+ }
+
+ /**
+ * Removes a single item from the tree.
+ *
+ * @param itemEnv the Envelope of the item to be removed
+ * @param item the item to remove
+ * @return <code>true</code> if the item was found (and thus removed)
+ */
+ public boolean remove(Interval itemInterval, Object item)
+ {
+ Interval insertInterval = ensureExtent(itemInterval, minExtent);
+ return root.remove(insertInterval, item);
+ }
+
+ public Iterator iterator()
+ {
+ List foundItems = new ArrayList();
+ root.addAllItems(foundItems);
+ return foundItems.iterator();
+ }
+
+ public List query(double x)
+ {
+ return query(new Interval(x, x));
+ }
+
+ /**
+ * Queries the tree to find all candidate items which
+ * may overlap the query interval.
+ * If the query interval is <tt>null</tt>, all items in the tree are found.
+ *
+ * min and max may be the same value
+ */
+ public List query(Interval interval)
+ {
+ /**
+ * the items that are matched are all items in intervals
+ * which overlap the query interval
+ */
+ List foundItems = new ArrayList();
+ query(interval, foundItems);
+ return foundItems;
+ }
+
+ /**
+ * Adds items in the tree which potentially overlap the query interval
+ * to the given collection.
+ * If the query interval is <tt>null</tt>, add all items in the tree.
+ *
+ * @param interval a query interval, or null
+ * @param resultItems the candidate items found
+ */
+ public void query(Interval interval, Collection foundItems)
+ {
+ root.addAllItemsFromOverlapping(interval, foundItems);
+ }
+
+ private void collectStats(Interval interval)
+ {
+ double del = interval.getWidth();
+ if (del < minExtent && del > 0.0)
+ minExtent = del;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/bintree/Interval.java b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Interval.java
new file mode 100644
index 0000000..e67184d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Interval.java
@@ -0,0 +1,84 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.bintree;
+
+/**
+ * Represents an (1-dimensional) closed interval on the Real number line.
+ *
+ * @version 1.7
+ */
+public class Interval {
+
+ public double min, max;
+
+ public Interval()
+ {
+ min = 0.0;
+ max = 0.0;
+ }
+
+ public Interval(double min, double max)
+ {
+ init(min, max);
+ }
+ public Interval(Interval interval)
+ {
+ init(interval.min, interval.max);
+ }
+ public void init(double min, double max)
+ {
+ this.min = min;
+ this.max = max;
+ if (min > max) {
+ this.min = max;
+ this.max = min;
+ }
+ }
+ public double getMin() { return min; }
+ public double getMax() { return max; }
+ public double getWidth() { return max - min; }
+
+ public void expandToInclude(Interval interval)
+ {
+ if (interval.max > max) max = interval.max;
+ if (interval.min < min) min = interval.min;
+ }
+ public boolean overlaps(Interval interval)
+ {
+ return overlaps(interval.min, interval.max);
+ }
+
+ public boolean overlaps(double min, double max)
+ {
+ if (this.min > max || this.max < min) return false;
+ return true;
+ }
+
+ public boolean contains(Interval interval)
+ {
+ return contains(interval.min, interval.max);
+ }
+ public boolean contains(double min, double max)
+ {
+ return (min >= this.min && max <= this.max);
+ }
+ public boolean contains(double p)
+ {
+ return (p >= this.min && p <= this.max);
+ }
+
+ public String toString()
+ {
+ return "[" + min + ", " + max + "]";
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/bintree/Key.java b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Key.java
new file mode 100644
index 0000000..ecf19d9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Key.java
@@ -0,0 +1,75 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.bintree;
+
+
+
+import org.locationtech.jts.index.quadtree.DoubleBits;
+
+/**
+ * A Key is a unique identifier for a node in a tree.
+ * It contains a lower-left point and a level number. The level number
+ * is the power of two for the size of the node envelope
+ *
+ * @version 1.7
+ */
+public class Key {
+
+ public static int computeLevel(Interval interval)
+ {
+ double dx = interval.getWidth();
+ //int level = BinaryPower.exponent(dx) + 1;
+ int level = DoubleBits.exponent(dx) + 1;
+ return level;
+ }
+
+
+ // the fields which make up the key
+ private double pt = 0.0;
+ private int level = 0;
+ // auxiliary data which is derived from the key for use in computation
+ private Interval interval;
+
+ public Key(Interval interval)
+ {
+ computeKey(interval);
+ }
+
+ public double getPoint() { return pt; }
+ public int getLevel() { return level; }
+ public Interval getInterval() { return interval; }
+
+ /**
+ * return a square envelope containing the argument envelope,
+ * whose extent is a power of two and which is based at a power of 2
+ */
+ public void computeKey(Interval itemInterval)
+ {
+ level = computeLevel(itemInterval);
+ interval = new Interval();
+ computeInterval(level, itemInterval);
+ // MD - would be nice to have a non-iterative form of this algorithm
+ while (! interval.contains(itemInterval)) {
+ level += 1;
+ computeInterval(level, itemInterval);
+ }
+ }
+
+ private void computeInterval(int level, Interval itemInterval)
+ {
+ double size = DoubleBits.powerOf2(level);
+ //double size = pow2.power(level);
+ pt = Math.floor(itemInterval.getMin() / size) * size;
+ interval.init(pt, pt + size);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/bintree/Node.java b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Node.java
new file mode 100644
index 0000000..f9cd9c4
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Node.java
@@ -0,0 +1,152 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.bintree;
+
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A node of a {@link Bintree}.
+ *
+ * @version 1.7
+ */
+public class Node
+ extends NodeBase
+{
+ public static Node createNode(Interval itemInterval)
+ {
+ Key key = new Key(itemInterval);
+
+//System.out.println("input: " + env + " binaryEnv: " + key.getEnvelope());
+ Node node = new Node(key.getInterval(), key.getLevel());
+ return node;
+ }
+
+ public static Node createExpanded(Node node, Interval addInterval)
+ {
+ Interval expandInt = new Interval(addInterval);
+ if (node != null) expandInt.expandToInclude(node.interval);
+
+ Node largerNode = createNode(expandInt);
+ if (node != null) largerNode.insert(node);
+ return largerNode;
+ }
+
+ private Interval interval;
+ private double centre;
+ private int level;
+
+ public Node(Interval interval, int level)
+ {
+ this.interval = interval;
+ this.level = level;
+ centre = (interval.getMin() + interval.getMax()) / 2;
+ }
+
+ public Interval getInterval() { return interval; }
+
+ protected boolean isSearchMatch(Interval itemInterval)
+ {
+// System.out.println(itemInterval + " overlaps " + interval + " : "
+// + itemInterval.overlaps(interval));
+ return itemInterval.overlaps(interval);
+ }
+
+ /**
+ * Returns the subnode containing the envelope.
+ * Creates the node if
+ * it does not already exist.
+ */
+ public Node getNode(Interval searchInterval)
+ {
+ int subnodeIndex = getSubnodeIndex(searchInterval, centre);
+ // if index is -1 searchEnv is not contained in a subnode
+ if (subnodeIndex != -1) {
+ // create the node if it does not exist
+ Node node = getSubnode(subnodeIndex);
+ // recursively search the found/created node
+ return node.getNode(searchInterval);
+ }
+ else {
+ return this;
+ }
+ }
+
+ /**
+ * Returns the smallest <i>existing</i>
+ * node containing the envelope.
+ */
+ public NodeBase find(Interval searchInterval)
+ {
+ int subnodeIndex = getSubnodeIndex(searchInterval, centre);
+ if (subnodeIndex == -1)
+ return this;
+ if (subnode[subnodeIndex] != null) {
+ // query lies in subnode, so search it
+ Node node = subnode[subnodeIndex];
+ return node.find(searchInterval);
+ }
+ // no existing subnode, so return this one anyway
+ return this;
+ }
+
+ void insert(Node node)
+ {
+ Assert.isTrue(interval == null || interval.contains(node.interval));
+ int index = getSubnodeIndex(node.interval, centre);
+ if (node.level == level - 1) {
+ subnode[index] = node;
+ }
+ else {
+ // the node is not a direct child, so make a new child node to contain it
+ // and recursively insert the node
+ Node childNode = createSubnode(index);
+ childNode.insert(node);
+ subnode[index] = childNode;
+ }
+ }
+
+ /**
+ * get the subnode for the index.
+ * If it doesn't exist, create it
+ */
+ private Node getSubnode(int index)
+ {
+ if (subnode[index] == null) {
+ subnode[index] = createSubnode(index);
+ }
+ return subnode[index];
+ }
+
+ private Node createSubnode(int index)
+ {
+ // create a new subnode in the appropriate interval
+
+ double min = 0.0;
+ double max = 0.0;
+
+ switch (index) {
+ case 0:
+ min = interval.getMin();
+ max = centre;
+ break;
+ case 1:
+ min = centre;
+ max = interval.getMax();
+ break;
+ }
+ Interval subInt = new Interval(min, max);
+ Node node = new Node(subInt, level - 1);
+ return node;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/bintree/NodeBase.java b/modules/core/src/main/java/org/locationtech/jts/index/bintree/NodeBase.java
new file mode 100644
index 0000000..0618b67
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/bintree/NodeBase.java
@@ -0,0 +1,173 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.bintree;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+
+
+/**
+ * The base class for nodes in a {@link Bintree}.
+ *
+ * @version 1.7
+ */
+public abstract class NodeBase {
+
+ /**
+ * Returns the index of the subnode that wholely contains the given interval.
+ * If none does, returns -1.
+ */
+ public static int getSubnodeIndex(Interval interval, double centre)
+ {
+ int subnodeIndex = -1;
+ if (interval.min >= centre) subnodeIndex = 1;
+ if (interval.max <= centre) subnodeIndex = 0;
+ return subnodeIndex;
+ }
+
+ protected List items = new ArrayList();
+
+ /**
+ * subnodes are numbered as follows:
+ *
+ * 0 | 1
+ */
+ protected Node[] subnode = new Node[2];
+
+ public NodeBase() {
+ }
+
+ public List getItems() { return items; }
+
+ public void add(Object item)
+ {
+ items.add(item);
+ }
+ public List addAllItems(List items)
+ {
+ items.addAll(this.items);
+ for (int i = 0; i < 2; i++) {
+ if (subnode[i] != null) {
+ subnode[i].addAllItems(items);
+ }
+ }
+ return items;
+ }
+ protected abstract boolean isSearchMatch(Interval interval);
+
+ /**
+ * Adds items in the tree which potentially overlap the query interval
+ * to the given collection.
+ * If the query interval is <tt>null</tt>, add all items in the tree.
+ *
+ * @param interval a query interval, or null
+ * @param resultItems the candidate items found
+ */
+ public void addAllItemsFromOverlapping(Interval interval, Collection resultItems)
+ {
+ if (interval != null && ! isSearchMatch(interval))
+ return;
+
+ // some of these may not actually overlap - this is allowed by the bintree contract
+ resultItems.addAll(items);
+
+ if (subnode[0] != null) subnode[0].addAllItemsFromOverlapping(interval, resultItems);
+ if (subnode[1] != null) subnode[1].addAllItemsFromOverlapping(interval, resultItems);
+ }
+
+ /**
+ * Removes a single item from this subtree.
+ *
+ * @param itemInterval the envelope containing the item
+ * @param item the item to remove
+ * @return <code>true</code> if the item was found and removed
+ */
+ public boolean remove(Interval itemInterval, Object item)
+ {
+ // use interval to restrict nodes scanned
+ if (! isSearchMatch(itemInterval))
+ return false;
+
+ boolean found = false;
+ for (int i = 0; i < 2; i++) {
+ if (subnode[i] != null) {
+ found = subnode[i].remove(itemInterval, item);
+ if (found) {
+ // trim subtree if empty
+ if (subnode[i].isPrunable())
+ subnode[i] = null;
+ break;
+ }
+ }
+ }
+ // if item was found lower down, don't need to search for it here
+ if (found) return found;
+ // otherwise, try and remove the item from the list of items in this node
+ found = items.remove(item);
+ return found;
+ }
+
+ public boolean isPrunable()
+ {
+ return ! (hasChildren() || hasItems());
+ }
+
+ public boolean hasChildren()
+ {
+ for (int i = 0; i < 2; i++) {
+ if (subnode[i] != null)
+ return true;
+ }
+ return false;
+ }
+
+ public boolean hasItems() { return ! items.isEmpty(); }
+
+ int depth()
+ {
+ int maxSubDepth = 0;
+ for (int i = 0; i < 2; i++) {
+ if (subnode[i] != null) {
+ int sqd = subnode[i].depth();
+ if (sqd > maxSubDepth)
+ maxSubDepth = sqd;
+ }
+ }
+ return maxSubDepth + 1;
+ }
+
+ int size()
+ {
+ int subSize = 0;
+ for (int i = 0; i < 2; i++) {
+ if (subnode[i] != null) {
+ subSize += subnode[i].size();
+ }
+ }
+ return subSize + items.size();
+ }
+
+ int nodeSize()
+ {
+ int subSize = 0;
+ for (int i = 0; i < 2; i++) {
+ if (subnode[i] != null) {
+ subSize += subnode[i].nodeSize();
+ }
+ }
+ return subSize + 1;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/bintree/Root.java b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Root.java
new file mode 100644
index 0000000..b0be0d8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/bintree/Root.java
@@ -0,0 +1,100 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.bintree;
+
+import org.locationtech.jts.index.quadtree.IntervalSize;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * The root node of a single {@link Bintree}.
+ * It is centred at the origin,
+ * and does not have a defined extent.
+ *
+ * @version 1.7
+ */
+public class Root
+ extends NodeBase
+{
+
+ // the singleton root node is centred at the origin.
+ private static final double origin = 0.0;
+
+ public Root()
+ {
+ }
+
+ /**
+ * Insert an item into the tree this is the root of.
+ */
+ public void insert(Interval itemInterval, Object item)
+ {
+ int index = getSubnodeIndex(itemInterval, origin);
+ // if index is -1, itemEnv must contain the origin.
+ if (index == -1) {
+ add(item);
+ return;
+ }
+ /**
+ * the item must be contained in one interval, so insert it into the
+ * tree for that interval (which may not yet exist)
+ */
+ Node node = subnode[index];
+ /**
+ * If the subnode doesn't exist or this item is not contained in it,
+ * have to expand the tree upward to contain the item.
+ */
+
+ if (node == null || ! node.getInterval().contains(itemInterval)) {
+ Node largerNode = Node.createExpanded(node, itemInterval);
+ subnode[index] = largerNode;
+ }
+ /**
+ * At this point we have a subnode which exists and must contain
+ * contains the env for the item. Insert the item into the tree.
+ */
+ insertContained(subnode[index], itemInterval, item);
+//System.out.println("depth = " + root.depth() + " size = " + root.size());
+ }
+
+ /**
+ * insert an item which is known to be contained in the tree rooted at
+ * the given Node. Lower levels of the tree will be created
+ * if necessary to hold the item.
+ */
+ private void insertContained(Node tree, Interval itemInterval, Object item)
+ {
+ Assert.isTrue(tree.getInterval().contains(itemInterval));
+ /**
+ * Do NOT create a new node for zero-area intervals - this would lead
+ * to infinite recursion. Instead, use a heuristic of simply returning
+ * the smallest existing node containing the query
+ */
+ boolean isZeroArea = IntervalSize.isZeroWidth(itemInterval.getMin(), itemInterval.getMax());
+ NodeBase node;
+ if (isZeroArea)
+ node = tree.find(itemInterval);
+ else
+ node = tree.getNode(itemInterval);
+ node.add(item);
+ }
+
+ /**
+ * The root node matches all searches
+ */
+ protected boolean isSearchMatch(Interval interval)
+ {
+ return true;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/bintree/package.html b/modules/core/src/main/java/org/locationtech/jts/index/bintree/package.html
new file mode 100644
index 0000000..9d4dc5d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/bintree/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes that implement a Binary Interval Tree index
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChain.java b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChain.java
new file mode 100644
index 0000000..5a3594a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChain.java
@@ -0,0 +1,242 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.chain;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geomgraph.index.MonotoneChainEdge;
+
+
+/**
+ * Monotone Chains are a way of partitioning the segments of a linestring to
+ * allow for fast searching of intersections.
+ * They have the following properties:
+ * <ol>
+ * <li>the segments within a monotone chain never intersect each other
+ * <li>the envelope of any contiguous subset of the segments in a monotone chain
+ * is equal to the envelope of the endpoints of the subset.
+ * </ol>
+ * Property 1 means that there is no need to test pairs of segments from within
+ * the same monotone chain for intersection.
+ * <p>
+ * Property 2 allows
+ * an efficient binary search to be used to find the intersection points of two monotone chains.
+ * For many types of real-world data, these properties eliminate a large number of
+ * segment comparisons, producing substantial speed gains.
+ * <p>
+ * One of the goals of this implementation of MonotoneChains is to be
+ * as space and time efficient as possible. One design choice that aids this
+ * is that a MonotoneChain is based on a subarray of a list of points.
+ * This means that new arrays of points (potentially very large) do not
+ * have to be allocated.
+ * <p>
+ *
+ * MonotoneChains support the following kinds of queries:
+ * <ul>
+ * <li>Envelope select: determine all the segments in the chain which
+ * intersect a given envelope
+ * <li>Overlap: determine all the pairs of segments in two chains whose
+ * envelopes overlap
+ * </ul>
+ *
+ * This implementation of MonotoneChains uses the concept of internal iterators
+ * ({@link MonotoneChainSelectAction} and {@link MonotoneChainOverlapAction})
+ * to return the results for queries.
+ * This has time and space advantages, since it
+ * is not necessary to build lists of instantiated objects to represent the segments
+ * returned by the query.
+ * Queries made in this manner are thread-safe.
+ *
+ * @version 1.7
+ */
+public class MonotoneChain {
+
+ private Coordinate[] pts;
+ private int start, end;
+ private Envelope env = null;
+ private Object context = null;// user-defined information
+ private int id;// useful for optimizing chain comparisons
+
+ public MonotoneChain(Coordinate[] pts, int start, int end, Object context)
+ {
+ this.pts = pts;
+ this.start = start;
+ this.end = end;
+ this.context = context;
+ }
+
+ public void setId(int id) { this.id = id; }
+ public int getId() { return id; }
+
+ public Object getContext() { return context; }
+
+ public Envelope getEnvelope()
+ {
+ if (env == null) {
+ Coordinate p0 = pts[start];
+ Coordinate p1 = pts[end];
+ env = new Envelope(p0, p1);
+ }
+ return env;
+ }
+
+ public int getStartIndex() { return start; }
+ public int getEndIndex() { return end; }
+
+ /**
+ * Gets the line segment starting at <code>index</code>
+ *
+ * @param index index of segment
+ * @param ls line segment to extract into
+ */
+ public void getLineSegment(int index, LineSegment ls)
+ {
+ ls.p0 = pts[index];
+ ls.p1 = pts[index + 1];
+ }
+ /**
+ * Return the subsequence of coordinates forming this chain.
+ * Allocates a new array to hold the Coordinates
+ */
+ public Coordinate[] getCoordinates()
+ {
+ Coordinate coord[] = new Coordinate[end - start + 1];
+ int index = 0;
+ for (int i = start; i <= end; i++) {
+ coord[index++] = pts[i];
+ }
+ return coord;
+ }
+
+ /**
+ * Determine all the line segments in the chain whose envelopes overlap
+ * the searchEnvelope, and process them.
+ * <p>
+ * The monotone chain search algorithm attempts to optimize
+ * performance by not calling the select action on chain segments
+ * which it can determine are not in the search envelope.
+ * However, it *may* call the select action on segments
+ * which do not intersect the search envelope.
+ * This saves on the overhead of checking envelope intersection
+ * each time, since clients may be able to do this more efficiently.
+ *
+ * @param searchEnv the search envelope
+ * @param mcs the select action to execute on selected segments
+ */
+ public void select(Envelope searchEnv, MonotoneChainSelectAction mcs)
+ {
+ computeSelect(searchEnv, start, end, mcs);
+ }
+
+ private void computeSelect(
+ Envelope searchEnv,
+ int start0, int end0,
+ MonotoneChainSelectAction mcs )
+ {
+ Coordinate p0 = pts[start0];
+ Coordinate p1 = pts[end0];
+
+//Debug.println("trying:" + p0 + p1 + " [ " + start0 + ", " + end0 + " ]");
+ // terminating condition for the recursion
+ if (end0 - start0 == 1) {
+ //Debug.println("computeSelect:" + p0 + p1);
+ mcs.select(this, start0);
+ return;
+ }
+ // nothing to do if the envelopes don't overlap
+ if (! searchEnv.intersects(p0, p1))
+ return;
+
+ // the chains overlap, so split each in half and iterate (binary search)
+ int mid = (start0 + end0) / 2;
+
+ // Assert: mid != start or end (since we checked above for end - start <= 1)
+ // check terminating conditions before recursing
+ if (start0 < mid) {
+ computeSelect(searchEnv, start0, mid, mcs);
+ }
+ if (mid < end0) {
+ computeSelect(searchEnv, mid, end0, mcs);
+ }
+ }
+
+ /**
+ * Determine all the line segments in two chains which may overlap, and process them.
+ * <p>
+ * The monotone chain search algorithm attempts to optimize
+ * performance by not calling the overlap action on chain segments
+ * which it can determine do not overlap.
+ * However, it *may* call the overlap action on segments
+ * which do not actually interact.
+ * This saves on the overhead of checking intersection
+ * each time, since clients may be able to do this more efficiently.
+ *
+ * @param searchEnv the search envelope
+ * @param mco the overlap action to execute on selected segments
+ */
+ public void computeOverlaps(MonotoneChain mc, MonotoneChainOverlapAction mco)
+ {
+ computeOverlaps(start, end, mc, mc.start, mc.end, mco);
+ }
+
+ private void computeOverlaps(
+ int start0, int end0,
+ MonotoneChain mc,
+ int start1, int end1,
+ MonotoneChainOverlapAction mco)
+ {
+//Debug.println("computeIntersectsForChain:" + p00 + p01 + p10 + p11);
+ // terminating condition for the recursion
+ if (end0 - start0 == 1 && end1 - start1 == 1) {
+ mco.overlap(this, start0, mc, start1);
+ return;
+ }
+ // nothing to do if the envelopes of these subchains don't overlap
+ if (! overlaps(start0, end0, mc, start1, end1)) return;
+
+ // the chains overlap, so split each in half and iterate (binary search)
+ int mid0 = (start0 + end0) / 2;
+ int mid1 = (start1 + end1) / 2;
+
+ // Assert: mid != start or end (since we checked above for end - start <= 1)
+ // check terminating conditions before recursing
+ if (start0 < mid0) {
+ if (start1 < mid1) computeOverlaps(start0, mid0, mc, start1, mid1, mco);
+ if (mid1 < end1) computeOverlaps(start0, mid0, mc, mid1, end1, mco);
+ }
+ if (mid0 < end0) {
+ if (start1 < mid1) computeOverlaps(mid0, end0, mc, start1, mid1, mco);
+ if (mid1 < end1) computeOverlaps(mid0, end0, mc, mid1, end1, mco);
+ }
+ }
+ /**
+ * Tests whether the envelopes of two chain sections overlap (intersect).
+ *
+ * @param start0
+ * @param end0
+ * @param mc
+ * @param start1
+ * @param end1
+ * @return true if the section envelopes overlap
+ */
+ private boolean overlaps(
+ int start0, int end0,
+ MonotoneChain mc,
+ int start1, int end1)
+ {
+ return Envelope.intersects(pts[start0], pts[end0], mc.pts[start1], mc.pts[end1]);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainBuilder.java b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainBuilder.java
new file mode 100644
index 0000000..c976343
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainBuilder.java
@@ -0,0 +1,120 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.chain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Quadrant;
+
+/**
+ * Constructs {@link MonotoneChain}s
+ * for sequences of {@link Coordinate}s.
+ *
+ * @version 1.7
+ */
+public class MonotoneChainBuilder {
+
+ public static int[] toIntArray(List list)
+ {
+ int[] array = new int[list.size()];
+ for (int i = 0; i < array.length; i++) {
+ array[i] = ((Integer) list.get(i)).intValue();
+ }
+ return array;
+ }
+
+ public static List getChains(Coordinate[] pts)
+ {
+ return getChains(pts, null);
+ }
+
+ /**
+ * Return a list of the {@link MonotoneChain}s
+ * for the given list of coordinates.
+ */
+ public static List getChains(Coordinate[] pts, Object context)
+ {
+ List mcList = new ArrayList();
+ int[] startIndex = getChainStartIndices(pts);
+ for (int i = 0; i < startIndex.length - 1; i++) {
+ MonotoneChain mc = new MonotoneChain(pts, startIndex[i], startIndex[i + 1], context);
+ mcList.add(mc);
+ }
+ return mcList;
+ }
+
+ /**
+ * Return an array containing lists of start/end indexes of the monotone chains
+ * for the given list of coordinates.
+ * The last entry in the array points to the end point of the point array,
+ * for use as a sentinel.
+ */
+ public static int[] getChainStartIndices(Coordinate[] pts)
+ {
+ // find the startpoint (and endpoints) of all monotone chains in this edge
+ int start = 0;
+ List startIndexList = new ArrayList();
+ startIndexList.add(new Integer(start));
+ do {
+ int last = findChainEnd(pts, start);
+ startIndexList.add(new Integer(last));
+ start = last;
+ } while (start < pts.length - 1);
+ // copy list to an array of ints, for efficiency
+ int[] startIndex = toIntArray(startIndexList);
+ return startIndex;
+ }
+
+ /**
+ * Finds the index of the last point in a monotone chain
+ * starting at a given point.
+ * Any repeated points (0-length segments) will be included
+ * in the monotone chain returned.
+ *
+ * @return the index of the last point in the monotone chain
+ * starting at <code>start</code>.
+ */
+ private static int findChainEnd(Coordinate[] pts, int start)
+ {
+ int safeStart = start;
+ // skip any zero-length segments at the start of the sequence
+ // (since they cannot be used to establish a quadrant)
+ while (safeStart < pts.length - 1 && pts[safeStart].equals2D(pts[safeStart + 1])) {
+ safeStart++;
+ }
+ // check if there are NO non-zero-length segments
+ if (safeStart >= pts.length - 1) {
+ return pts.length - 1;
+ }
+ // determine overall quadrant for chain (which is the starting quadrant)
+ int chainQuad = Quadrant.quadrant(pts[safeStart], pts[safeStart + 1]);
+ int last = start + 1;
+ while (last < pts.length) {
+ // skip zero-length segments, but include them in the chain
+ if (! pts[last - 1].equals2D(pts[last])) {
+ // compute quadrant for next possible segment in chain
+ int quad = Quadrant.quadrant(pts[last - 1], pts[last]);
+ if (quad != chainQuad) break;
+ }
+ last++;
+ }
+ return last - 1;
+ }
+
+
+ public MonotoneChainBuilder() {
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainOverlapAction.java b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainOverlapAction.java
new file mode 100644
index 0000000..df5b4a2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainOverlapAction.java
@@ -0,0 +1,51 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.chain;
+
+import org.locationtech.jts.geom.LineSegment;
+
+/**
+ * The action for the internal iterator for performing
+ * overlap queries on a MonotoneChain
+ *
+ * @version 1.7
+ */
+public class MonotoneChainOverlapAction
+{
+ protected LineSegment overlapSeg1 = new LineSegment();
+ protected LineSegment overlapSeg2 = new LineSegment();
+
+ /**
+ * This function can be overridden if the original chains are needed
+ *
+ * @param start1 the index of the start of the overlapping segment from mc1
+ * @param start2 the index of the start of the overlapping segment from mc2
+ */
+ public void overlap(MonotoneChain mc1, int start1, MonotoneChain mc2, int start2)
+ {
+ mc1.getLineSegment(start1, overlapSeg1);
+ mc2.getLineSegment(start2, overlapSeg2);
+ overlap(overlapSeg1, overlapSeg2);
+ }
+
+ /**
+ * This is a convenience function which can be overridden to obtain the actual
+ * line segments which overlap
+ * @param seg1
+ * @param seg2
+ */
+ public void overlap(LineSegment seg1, LineSegment seg2)
+ {
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainSelectAction.java b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainSelectAction.java
new file mode 100644
index 0000000..ac61a10
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/chain/MonotoneChainSelectAction.java
@@ -0,0 +1,55 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.chain;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineSegment;
+/**
+ * The action for the internal iterator for performing
+ * envelope select queries on a MonotoneChain
+ *
+ * @version 1.7
+ */
+public class MonotoneChainSelectAction
+{
+ // these envelopes are used during the MonotoneChain search process
+ //Envelope tempEnv1 = new Envelope();
+
+ LineSegment selectedSegment = new LineSegment();
+
+ /**
+ * This method is overridden
+ * to process a segment
+ * in the context of the parent chain.
+ *
+ * @param mc the parent chain
+ * @param startIndex the index of the start vertex of the segment being processed
+ */
+ public void select(MonotoneChain mc, int startIndex)
+ {
+ mc.getLineSegment(startIndex, selectedSegment);
+ // call this routine in case select(segmenet) was overridden
+ select(selectedSegment);
+ }
+
+ /**
+ * This is a convenience method which can be overridden to obtain the actual
+ * line segment which is selected.
+ *
+ * @param seg
+ */
+ public void select(LineSegment seg)
+ {
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/chain/package.html b/modules/core/src/main/java/org/locationtech/jts/index/chain/package.html
new file mode 100644
index 0000000..7becd69
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/chain/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes that implement Monotone Chains
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeBranchNode.java b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeBranchNode.java
new file mode 100644
index 0000000..17d6618
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeBranchNode.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.intervalrtree;
+
+import org.locationtech.jts.index.ItemVisitor;
+
+public class IntervalRTreeBranchNode
+extends IntervalRTreeNode
+{
+ private IntervalRTreeNode node1;
+ private IntervalRTreeNode node2;
+
+ public IntervalRTreeBranchNode(IntervalRTreeNode n1, IntervalRTreeNode n2)
+ {
+ node1 = n1;
+ node2 = n2;
+ buildExtent(node1, node2);
+ }
+
+ private void buildExtent(IntervalRTreeNode n1, IntervalRTreeNode n2)
+ {
+ min = Math.min(n1.min, n2.min);
+ max = Math.max(n1.max, n2.max);
+ }
+
+ public void query(double queryMin, double queryMax, ItemVisitor visitor)
+ {
+ if (! intersects(queryMin, queryMax)) {
+// System.out.println("Does NOT Overlap branch: " + this);
+ return;
+ }
+// System.out.println("Overlaps branch: " + this);
+ if (node1 != null) node1.query(queryMin, queryMax, visitor);
+ if (node2 != null) node2.query(queryMin, queryMax, visitor);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeLeafNode.java b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeLeafNode.java
new file mode 100644
index 0000000..7dfdd0a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeLeafNode.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.intervalrtree;
+
+import org.locationtech.jts.index.ItemVisitor;
+
+public class IntervalRTreeLeafNode
+extends IntervalRTreeNode
+{
+ private Object item;
+
+ public IntervalRTreeLeafNode(double min, double max, Object item)
+ {
+ this.min = min;
+ this.max = max;
+ this.item = item;
+ }
+
+ public void query(double queryMin, double queryMax, ItemVisitor visitor)
+ {
+ if (! intersects(queryMin, queryMax))
+ return;
+
+ visitor.visitItem(item);
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeNode.java b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeNode.java
new file mode 100644
index 0000000..c7f2c35
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeNode.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.intervalrtree;
+
+import java.util.Comparator;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.io.WKTWriter;
+
+
+public abstract class IntervalRTreeNode
+{
+ protected double min = Double.POSITIVE_INFINITY;
+ protected double max = Double.NEGATIVE_INFINITY;
+
+ public double getMin() { return min; }
+ public double getMax() { return max; }
+
+ public abstract void query(double queryMin, double queryMax, ItemVisitor visitor);
+
+ protected boolean intersects(double queryMin, double queryMax)
+ {
+ if (min > queryMax
+ || max < queryMin)
+ return false;
+ return true;
+ }
+
+ public String toString()
+ {
+ return WKTWriter.toLineString(new Coordinate(min, 0), new Coordinate(max, 0));
+ }
+
+ public static class NodeComparator implements Comparator
+ {
+ public int compare(Object o1, Object o2)
+ {
+ IntervalRTreeNode n1 = (IntervalRTreeNode) o1;
+ IntervalRTreeNode n2 = (IntervalRTreeNode) o2;
+ double mid1 = (n1.min + n1.max) / 2;
+ double mid2 = (n2.min + n2.max) / 2;
+ if (mid1 < mid2) return -1;
+ if (mid1 > mid2) return 1;
+ return 0;
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/SortedPackedIntervalRTree.java b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/SortedPackedIntervalRTree.java
new file mode 100644
index 0000000..db858c5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/SortedPackedIntervalRTree.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.intervalrtree;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.io.WKTWriter;
+
+
+/**
+ * A static index on a set of 1-dimensional intervals,
+ * using an R-Tree packed based on the order of the interval midpoints.
+ * It supports range searching,
+ * where the range is an interval of the real line (which may be a single point).
+ * A common use is to index 1-dimensional intervals which
+ * are the projection of 2-D objects onto an axis of the coordinate system.
+ * <p>
+ * This index structure is <i>static</i>
+ * - items cannot be added or removed once the first query has been made.
+ * The advantage of this characteristic is that the index performance
+ * can be optimized based on a fixed set of items.
+ *
+ * @author Martin Davis
+ */
+public class SortedPackedIntervalRTree
+{
+ private List leaves = new ArrayList();
+ private IntervalRTreeNode root = null;
+
+ public SortedPackedIntervalRTree()
+ {
+
+ }
+
+ /**
+ * Adds an item to the index which is associated with the given interval
+ *
+ * @param min the lower bound of the item interval
+ * @param max the upper bound of the item interval
+ * @param item the item to insert
+ *
+ * @throws IllegalStateException if the index has already been queried
+ */
+ public void insert(double min, double max, Object item)
+ {
+ if (root != null)
+ throw new IllegalStateException("Index cannot be added to once it has been queried");
+ leaves.add(new IntervalRTreeLeafNode(min, max, item));
+ }
+
+ private void init()
+ {
+ if (root != null) return;
+ buildRoot();
+ }
+
+ private synchronized void buildRoot()
+ {
+ if (root != null) return;
+ root = buildTree();
+ }
+
+ private IntervalRTreeNode buildTree()
+ {
+
+ // sort the leaf nodes
+ Collections.sort(leaves, new IntervalRTreeNode.NodeComparator());
+
+ // now group nodes into blocks of two and build tree up recursively
+ List src = leaves;
+ List temp = null;
+ List dest = new ArrayList();
+
+ while (true) {
+ buildLevel(src, dest);
+ if (dest.size() == 1)
+ return (IntervalRTreeNode) dest.get(0);
+
+ temp = src;
+ src = dest;
+ dest = temp;
+ }
+ }
+
+ private int level = 0;
+
+ private void buildLevel(List src, List dest)
+ {
+ level++;
+ dest.clear();
+ for (int i = 0; i < src.size(); i += 2) {
+ IntervalRTreeNode n1 = (IntervalRTreeNode) src.get(i);
+ IntervalRTreeNode n2 = (i + 1 < src.size())
+ ? (IntervalRTreeNode) src.get(i) : null;
+ if (n2 == null) {
+ dest.add(n1);
+ } else {
+ IntervalRTreeNode node = new IntervalRTreeBranchNode(
+ (IntervalRTreeNode) src.get(i),
+ (IntervalRTreeNode) src.get(i + 1));
+// printNode(node);
+// System.out.println(node);
+ dest.add(node);
+ }
+ }
+ }
+
+ private void printNode(IntervalRTreeNode node)
+ {
+ System.out.println(WKTWriter.toLineString(new Coordinate(node.min, level), new Coordinate(node.max, level)));
+ }
+
+ /**
+ * Search for intervals in the index which intersect the given closed interval
+ * and apply the visitor to them.
+ *
+ * @param min the lower bound of the query interval
+ * @param max the upper bound of the query interval
+ * @param visitor the visitor to pass any matched items to
+ */
+ public void query(double min, double max, ItemVisitor visitor)
+ {
+ init();
+
+ root.query(min, max, visitor);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/package.html b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/package.html
new file mode 100644
index 0000000..07e85cd
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes to implement an R-tree index for one-dimensional intervals.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdNode.java b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdNode.java
new file mode 100644
index 0000000..d7775f2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdNode.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index.kdtree;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * A node of a {@link KdTree}, which represents one or more points in the same location.
+ *
+ * @author dskea
+ */
+public class KdNode {
+
+ private Coordinate p = null;
+ private Object data;
+ private KdNode left;
+ private KdNode right;
+ private int count;
+
+ /**
+ * Creates a new KdNode.
+ *
+ * @param _x coordinate of point
+ * @param _y coordinate of point
+ * @param data a data objects to associate with this node
+ */
+ public KdNode(double _x, double _y, Object data) {
+ p = new Coordinate(_x, _y);
+ left = null;
+ right = null;
+ count = 1;
+ this.data = data;
+ }
+
+ /**
+ * Creates a new KdNode.
+ *
+ * @param p point location of new node
+ * @param data a data objects to associate with this node
+ */
+ public KdNode(Coordinate p, Object data) {
+ this.p = new Coordinate(p);
+ left = null;
+ right = null;
+ count = 1;
+ this.data = data;
+ }
+
+ /**
+ * Returns the X coordinate of the node
+ *
+ * @return X coordinate of the node
+ */
+ public double getX() {
+ return p.x;
+ }
+
+ /**
+ * Returns the Y coordinate of the node
+ *
+ * @return Y coordinate of the node
+ */
+ public double getY() {
+ return p.y;
+ }
+
+ /**
+ * Returns the location of this node
+ *
+ * @return p location of this node
+ */
+ public Coordinate getCoordinate() {
+ return p;
+ }
+
+ /**
+ * Gets the user data object associated with this node.
+ * @return
+ */
+ public Object getData() {
+ return data;
+ }
+
+ /**
+ * Returns the left node of the tree
+ *
+ * @return left node
+ */
+ public KdNode getLeft() {
+ return left;
+ }
+
+ /**
+ * Returns the right node of the tree
+ *
+ * @return right node
+ */
+ public KdNode getRight() {
+ return right;
+ }
+
+ // Increments counts of points at this location
+ void increment() {
+ count = count + 1;
+ }
+
+ /**
+ * Returns the number of inserted points that are coincident at this location.
+ *
+ * @return number of inserted points that this node represents
+ */
+ public int getCount() {
+ return count;
+ }
+
+ /**
+ * Tests whether more than one point with this value have been inserted (up to the tolerance)
+ *
+ * @return true if more than one point have been inserted with this value
+ */
+ public boolean isRepeated() {
+ return count > 1;
+ }
+
+ // Sets left node value
+ void setLeft(KdNode _left) {
+ left = _left;
+ }
+
+ // Sets right node value
+ void setRight(KdNode _right) {
+ right = _right;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdNodeVisitor.java b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdNodeVisitor.java
new file mode 100644
index 0000000..0fa0b44
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdNodeVisitor.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index.kdtree;
+
+/**
+ * A visitor for {@link KdNode}s in a {@link KdTree} index.
+ *
+ * @version 1.7
+ */
+
+public interface KdNodeVisitor
+{
+ /**
+ * Visits a node.
+ *
+ * @param node the node to visit
+ */
+ void visit(KdNode node);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdTree.java b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdTree.java
new file mode 100644
index 0000000..3997887
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/KdTree.java
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index.kdtree;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Envelope;
+
+
+/**
+ * An implementation of a 2-D KD-Tree. KD-trees provide fast range searching on
+ * point data.
+ * <p>
+ * This implementation supports detecting and snapping points which are closer
+ * than a given distance tolerance.
+ * If the same point (up to tolerance) is inserted
+ * more than once, it is snapped to the existing node.
+ * In other words, if a point is inserted which lies within the tolerance of a node already in the index,
+ * it is snapped to that node.
+ * When a point is snapped to a node then a new node is not created but the count of the existing node
+ * is incremented.
+ * If more than one node in the tree is within tolerance of an inserted point,
+ * the closest and then lowest node is snapped to.
+ *
+ * @author David Skea
+ * @author Martin Davis
+ */
+public class KdTree {
+
+ /**
+ * Converts a collection of {@link KdNode}s to an array of {@link Coordinate}s.
+ *
+ * @param kdnodes
+ * a collection of nodes
+ * @return an array of the coordinates represented by the nodes
+ */
+ public static Coordinate[] toCoordinates(Collection kdnodes) {
+ return toCoordinates(kdnodes, false);
+ }
+
+ /**
+ * Converts a collection of {@link KdNode}s
+ * to an array of {@link Coordinate}s,
+ * specifying whether repeated nodes should be represented
+ * by multiple coordinates.
+ *
+ * @param kdnodes a collection of nodes
+ * @param includeRepeated true if repeated nodes should
+ * be included multiple times
+ * @return an array of the coordinates represented by the nodes
+ */
+ public static Coordinate[] toCoordinates(Collection kdnodes, boolean includeRepeated) {
+ CoordinateList coord = new CoordinateList();
+ for (Iterator it = kdnodes.iterator(); it.hasNext();) {
+ KdNode node = (KdNode) it.next();
+ int count = includeRepeated ? node.getCount() : 1;
+ for (int i = 0; i < count; i++) {
+ coord.add(node.getCoordinate(), true);
+ }
+ }
+ return coord.toCoordinateArray();
+ }
+
+ private KdNode root = null;
+ private long numberOfNodes;
+ private double tolerance;
+
+ /**
+ * Creates a new instance of a KdTree with a snapping tolerance of 0.0. (I.e.
+ * distinct points will <i>not</i> be snapped)
+ */
+ public KdTree() {
+ this(0.0);
+ }
+
+ /**
+ * Creates a new instance of a KdTree, specifying a snapping distance
+ * tolerance. Points which lie closer than the tolerance to a point already in
+ * the tree will be treated as identical to the existing point.
+ *
+ * @param tolerance
+ * the tolerance distance for considering two points equal
+ */
+ public KdTree(double tolerance) {
+ this.tolerance = tolerance;
+ }
+
+ /**
+ * Tests whether the index contains any items.
+ *
+ * @return true if the index does not contain any items
+ */
+ public boolean isEmpty() {
+ if (root == null)
+ return true;
+ return false;
+ }
+
+ /**
+ * Inserts a new point in the kd-tree, with no data.
+ *
+ * @param p
+ * the point to insert
+ * @return the kdnode containing the point
+ */
+ public KdNode insert(Coordinate p) {
+ return insert(p, null);
+ }
+
+ /**
+ * Inserts a new point into the kd-tree.
+ *
+ * @param p
+ * the point to insert
+ * @param data
+ * a data item for the point
+ * @return returns a new KdNode if a new point is inserted, else an existing
+ * node is returned with its counter incremented. This can be checked
+ * by testing returnedNode.getCount() > 1.
+ */
+ public KdNode insert(Coordinate p, Object data) {
+ if (root == null) {
+ root = new KdNode(p, data);
+ return root;
+ }
+
+ /**
+ * Check if the point is already in the tree, up to tolerance.
+ * If tolerance is zero, this phase of the insertion can be skipped.
+ */
+ if ( tolerance > 0 ) {
+ KdNode matchNode = findBestMatchNode(p);
+ if (matchNode != null) {
+ // point already in index - increment counter
+ matchNode.increment();
+ return matchNode;
+ }
+ }
+
+ return insertExact(p, data);
+ }
+
+ /**
+ * Finds the node in the tree which is the best match for a point
+ * being inserted.
+ * The match is made deterministic by returning the lowest of any nodes which
+ * lie the same distance from the point.
+ * There may be no match if the point is not within the distance tolerance of any
+ * existing node.
+ *
+ * @param p the point being inserted
+ * @return the best matching node
+ * @return null if no match was found
+ */
+ private KdNode findBestMatchNode(Coordinate p) {
+ BestMatchVisitor visitor = new BestMatchVisitor(p, tolerance);
+ query(visitor.queryEnvelope(), visitor);
+ return visitor.getNode();
+ }
+
+ static private class BestMatchVisitor implements KdNodeVisitor {
+
+ private double tolerance;
+ private KdNode matchNode = null;
+ private double matchDist = 0.0;
+ private Coordinate p;
+
+ public BestMatchVisitor(Coordinate p, double tolerance) {
+ this.p = p;
+ this.tolerance = tolerance;
+ }
+
+ public Envelope queryEnvelope() {
+ Envelope queryEnv = new Envelope(p);
+ queryEnv.expandBy(tolerance);
+ return queryEnv;
+ }
+
+ public KdNode getNode() {
+ return matchNode;
+ }
+
+ public void visit(KdNode node) {
+ double dist = p.distance(node.getCoordinate());
+ boolean isInTolerance = dist <= tolerance;
+ if (! isInTolerance) return;
+ boolean update = false;
+ if (matchNode == null
+ || dist < matchDist
+ // if distances are the same, record the lesser coordinate
+ || (matchNode != null && dist == matchDist
+ && node.getCoordinate().compareTo(matchNode.getCoordinate()) < 1))
+ update = true;
+
+ if (update) {
+ matchNode = node;
+ matchDist = dist;
+ }
+ }
+ }
+
+ /**
+ * Inserts a point known to be beyond the distance tolerance of any existing node.
+ * The point is inserted at the bottom of the exact splitting path,
+ * so that tree shape is deterministic.
+ *
+ * @param p the point to insert
+ * @param data the data for the point
+ * @return the created node
+ */
+ private KdNode insertExact(Coordinate p, Object data) {
+ KdNode currentNode = root;
+ KdNode leafNode = root;
+ boolean isOddLevel = true;
+ boolean isLessThan = true;
+
+ /**
+ * Traverse the tree, first cutting the plane left-right (by X ordinate)
+ * then top-bottom (by Y ordinate)
+ */
+ while (currentNode != null) {
+ // test if point is already a node (not strictly necessary)
+ if (currentNode != null) {
+ boolean isInTolerance = p.distance(currentNode.getCoordinate()) <= tolerance;
+
+ // check if point is already in tree (up to tolerance) and if so simply
+ // return existing node
+ if (isInTolerance) {
+ currentNode.increment();
+ return currentNode;
+ }
+ }
+
+ if (isOddLevel) {
+ isLessThan = p.x < currentNode.getX();
+ } else {
+ isLessThan = p.y < currentNode.getY();
+ }
+ leafNode = currentNode;
+ if (isLessThan) {
+ currentNode = currentNode.getLeft();
+ } else {
+ currentNode = currentNode.getRight();
+ }
+
+ isOddLevel = ! isOddLevel;
+ }
+
+ // no node found, add new leaf node to tree
+ numberOfNodes = numberOfNodes + 1;
+ KdNode node = new KdNode(p, data);
+ if (isLessThan) {
+ leafNode.setLeft(node);
+ } else {
+ leafNode.setRight(node);
+ }
+ return node;
+ }
+
+ private void queryNode(KdNode currentNode,
+ Envelope queryEnv, boolean odd, KdNodeVisitor visitor) {
+ if (currentNode == null)
+ return;
+
+ double min;
+ double max;
+ double discriminant;
+ if (odd) {
+ min = queryEnv.getMinX();
+ max = queryEnv.getMaxX();
+ discriminant = currentNode.getX();
+ } else {
+ min = queryEnv.getMinY();
+ max = queryEnv.getMaxY();
+ discriminant = currentNode.getY();
+ }
+ boolean searchLeft = min < discriminant;
+ boolean searchRight = discriminant <= max;
+
+ // search is computed via in-order traversal
+ if (searchLeft) {
+ queryNode(currentNode.getLeft(), queryEnv, !odd, visitor);
+ }
+ if (queryEnv.contains(currentNode.getCoordinate())) {
+ visitor.visit(currentNode);
+ }
+ if (searchRight) {
+ queryNode(currentNode.getRight(), queryEnv, !odd, visitor);
+ }
+
+ }
+
+ /**
+ * Performs a range search of the points in the index and visits all nodes found.
+ *
+ * @param queryEnv
+ * the range rectangle to query
+ * @param visitor a visitor to visit all nodes found by the search
+ */
+ public void query(Envelope queryEnv, KdNodeVisitor visitor) {
+ queryNode(root, queryEnv, true, visitor);
+ }
+
+ /**
+ * Performs a range search of the points in the index.
+ *
+ * @param queryEnv
+ * the range rectangle to query
+ * @return a list of the KdNodes found
+ */
+ public List query(Envelope queryEnv) {
+ final List result = new ArrayList();
+ query(queryEnv, result);
+ return result;
+ }
+
+ /**
+ * Performs a range search of the points in the index.
+ *
+ * @param queryEnv
+ * the range rectangle to query
+ * @param result
+ * a list to accumulate the result nodes into
+ */
+ public void query(Envelope queryEnv, final List result) {
+ queryNode(root, queryEnv, true, new KdNodeVisitor() {
+
+ public void visit(KdNode node) {
+ result.add(node);
+ }
+
+ });
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/kdtree/package.html b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/package.html
new file mode 100644
index 0000000..66462bf
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/kdtree/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes which implement a k-D tree index over 2-D point data.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/package.html b/modules/core/src/main/java/org/locationtech/jts/index/package.html
new file mode 100644
index 0000000..6fa83a8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Provides classes for various kinds of spatial indexes.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/DoubleBits.java b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/DoubleBits.java
new file mode 100644
index 0000000..098ebe0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/DoubleBits.java
@@ -0,0 +1,153 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+/**
+ * DoubleBits manipulates Double numbers
+ * by using bit manipulation and bit-field extraction.
+ * For some operations (such as determining the exponent)
+ * this is more accurate than using mathematical operations
+ * (which suffer from round-off error).
+ * <p>
+ * The algorithms and constants in this class
+ * apply only to IEEE-754 double-precision floating point format.
+ *
+ * @version 1.7
+ */
+public class DoubleBits {
+
+ public static final int EXPONENT_BIAS = 1023;
+
+ public static double powerOf2(int exp)
+ {
+ if (exp > 1023 || exp < -1022)
+ throw new IllegalArgumentException("Exponent out of bounds");
+ long expBias = exp + EXPONENT_BIAS;
+ long bits = expBias << 52;
+ return Double.longBitsToDouble(bits);
+ }
+
+ public static int exponent(double d)
+ {
+ DoubleBits db = new DoubleBits(d);
+ return db.getExponent();
+ }
+
+ public static double truncateToPowerOfTwo(double d)
+ {
+ DoubleBits db = new DoubleBits(d);
+ db.zeroLowerBits(52);
+ return db.getDouble();
+ }
+
+ public static String toBinaryString(double d)
+ {
+ DoubleBits db = new DoubleBits(d);
+ return db.toString();
+ }
+
+ public static double maximumCommonMantissa(double d1, double d2)
+ {
+ if (d1 == 0.0 || d2 == 0.0) return 0.0;
+
+ DoubleBits db1 = new DoubleBits(d1);
+ DoubleBits db2 = new DoubleBits(d2);
+
+ if (db1.getExponent() != db2.getExponent()) return 0.0;
+
+ int maxCommon = db1.numCommonMantissaBits(db2);
+ db1.zeroLowerBits(64 - (12 + maxCommon));
+ return db1.getDouble();
+ }
+
+ private double x;
+ private long xBits;
+
+ public DoubleBits(double x)
+ {
+ this.x = x;
+ xBits = Double.doubleToLongBits(x);
+ }
+
+ public double getDouble()
+ {
+ return Double.longBitsToDouble(xBits);
+ }
+
+ /**
+ * Determines the exponent for the number
+ */
+ public int biasedExponent()
+ {
+ int signExp = (int) (xBits >> 52);
+ int exp = signExp & 0x07ff;
+ return exp;
+ }
+
+ /**
+ * Determines the exponent for the number
+ */
+ public int getExponent()
+ {
+ return biasedExponent() - EXPONENT_BIAS;
+ }
+
+ public void zeroLowerBits(int nBits)
+ {
+ long invMask = (1L << nBits) - 1L;
+ long mask = ~ invMask;
+ xBits &= mask;
+ }
+
+ public int getBit(int i)
+ {
+ long mask = (1L << i);
+ return (xBits & mask) != 0 ? 1 : 0;
+ }
+
+ /**
+ * This computes the number of common most-significant bits in the mantissa.
+ * It does not count the hidden bit, which is always 1.
+ * It does not determine whether the numbers have the same exponent - if they do
+ * not, the value computed by this function is meaningless.
+ * @param db
+ * @return the number of common most-significant mantissa bits
+ */
+ public int numCommonMantissaBits(DoubleBits db)
+ {
+ for (int i = 0; i < 52; i++)
+ {
+ int bitIndex = i + 12;
+ if (getBit(i) != db.getBit(i))
+ return i;
+ }
+ return 52;
+ }
+
+ /**
+ * A representation of the Double bits formatted for easy readability
+ */
+ public String toString()
+ {
+ String numStr = Long.toBinaryString(xBits);
+ // 64 zeroes!
+ String zero64 = "0000000000000000000000000000000000000000000000000000000000000000";
+ String padStr = zero64 + numStr;
+ String bitStr = padStr.substring(padStr.length() - 64);
+ String str = bitStr.substring(0, 1) + " "
+ + bitStr.substring(1, 12) + "(" + getExponent() + ") "
+ + bitStr.substring(12)
+ + " [ " + x + " ]";
+ return str;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/IntervalSize.java b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/IntervalSize.java
new file mode 100644
index 0000000..3f9cc8f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/IntervalSize.java
@@ -0,0 +1,52 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+/**
+ * Provides a test for whether an interval is
+ * so small it should be considered as zero for the purposes of
+ * inserting it into a binary tree.
+ * The reason this check is necessary is that round-off error can
+ * cause the algorithm used to subdivide an interval to fail, by
+ * computing a midpoint value which does not lie strictly between the
+ * endpoints.
+ *
+ * @version 1.7
+ */
+public class IntervalSize {
+
+ /**
+ * This value is chosen to be a few powers of 2 less than the
+ * number of bits available in the double representation (i.e. 53).
+ * This should allow enough extra precision for simple computations to be correct,
+ * at least for comparison purposes.
+ */
+ public static final int MIN_BINARY_EXPONENT = -50;
+
+ /**
+ * Computes whether the interval [min, max] is effectively zero width.
+ * I.e. the width of the interval is so much less than the
+ * location of the interval that the midpoint of the interval cannot be
+ * represented precisely.
+ */
+ public static boolean isZeroWidth(double min, double max)
+ {
+ double width = max - min;
+ if (width == 0.0) return true;
+
+ double maxAbs = Math.max(Math.abs(min), Math.abs(max));
+ double scaledInterval = width / maxAbs;
+ int level = DoubleBits.exponent(scaledInterval);
+ return level <= MIN_BINARY_EXPONENT;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Key.java b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Key.java
new file mode 100644
index 0000000..112b0e8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Key.java
@@ -0,0 +1,81 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+
+/**
+ * A Key is a unique identifier for a node in a quadtree.
+ * It contains a lower-left point and a level number. The level number
+ * is the power of two for the size of the node envelope
+ *
+ * @version 1.7
+ */
+public class Key {
+
+ public static int computeQuadLevel(Envelope env)
+ {
+ double dx = env.getWidth();
+ double dy = env.getHeight();
+ double dMax = dx > dy ? dx : dy;
+ int level = DoubleBits.exponent(dMax) + 1;
+ return level;
+ }
+
+ // the fields which make up the key
+ private Coordinate pt = new Coordinate();
+ private int level = 0;
+ // auxiliary data which is derived from the key for use in computation
+ private Envelope env = null;
+
+ public Key(Envelope itemEnv)
+ {
+ computeKey(itemEnv);
+ }
+
+ public Coordinate getPoint() { return pt; }
+ public int getLevel() { return level; }
+ public Envelope getEnvelope() { return env; }
+
+ public Coordinate getCentre()
+ {
+ return new Coordinate(
+ (env.getMinX() + env.getMaxX()) / 2,
+ (env.getMinY() + env.getMaxY()) / 2
+ );
+ }
+ /**
+ * return a square envelope containing the argument envelope,
+ * whose extent is a power of two and which is based at a power of 2
+ */
+ public void computeKey(Envelope itemEnv)
+ {
+ level = computeQuadLevel(itemEnv);
+ env = new Envelope();
+ computeKey(level, itemEnv);
+ // MD - would be nice to have a non-iterative form of this algorithm
+ while (! env.contains(itemEnv)) {
+ level += 1;
+ computeKey(level, itemEnv);
+ }
+ }
+
+ private void computeKey(int level, Envelope itemEnv)
+ {
+ double quadSize = DoubleBits.powerOf2(level);
+ pt.x = Math.floor(itemEnv.getMinX() / quadSize) * quadSize;
+ pt.y = Math.floor(itemEnv.getMinY() / quadSize) * quadSize;
+ env.init(pt.x, pt.x + quadSize, pt.y, pt.y + quadSize);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Node.java b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Node.java
new file mode 100644
index 0000000..10c8717
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Node.java
@@ -0,0 +1,179 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Represents a node of a {@link Quadtree}. Nodes contain
+ * items which have a spatial extent corresponding to the node's position
+ * in the quadtree.
+ *
+ * @version 1.7
+ */
+public class Node
+ extends NodeBase
+{
+ public static Node createNode(Envelope env)
+ {
+ Key key = new Key(env);
+ Node node = new Node(key.getEnvelope(), key.getLevel());
+ return node;
+ }
+
+ public static Node createExpanded(Node node, Envelope addEnv)
+ {
+ Envelope expandEnv = new Envelope(addEnv);
+ if (node != null) expandEnv.expandToInclude(node.env);
+
+ Node largerNode = createNode(expandEnv);
+ if (node != null) largerNode.insertNode(node);
+ return largerNode;
+ }
+
+ private Envelope env;
+ private double centrex;
+ private double centrey;
+ private int level;
+
+ public Node(Envelope env, int level)
+ {
+ //this.parent = parent;
+ this.env = env;
+ this.level = level;
+ centrex = (env.getMinX() + env.getMaxX()) / 2;
+ centrey = (env.getMinY() + env.getMaxY()) / 2;
+ }
+
+ public Envelope getEnvelope() { return env; }
+
+ protected boolean isSearchMatch(Envelope searchEnv)
+ {
+ if (searchEnv == null) return false;
+ return env.intersects(searchEnv);
+ }
+
+ /**
+ * Returns the subquad containing the envelope <tt>searchEnv</tt>.
+ * Creates the subquad if
+ * it does not already exist.
+ *
+ * @return the subquad containing the search envelope
+ */
+ public Node getNode(Envelope searchEnv)
+ {
+ int subnodeIndex = getSubnodeIndex(searchEnv, centrex, centrey);
+ // if subquadIndex is -1 searchEnv is not contained in a subquad
+ if (subnodeIndex != -1) {
+ // create the quad if it does not exist
+ Node node = getSubnode(subnodeIndex);
+ // recursively search the found/created quad
+ return node.getNode(searchEnv);
+ }
+ else {
+ return this;
+ }
+ }
+
+ /**
+ * Returns the smallest <i>existing</i>
+ * node containing the envelope.
+ */
+ public NodeBase find(Envelope searchEnv)
+ {
+ int subnodeIndex = getSubnodeIndex(searchEnv, centrex, centrey);
+ if (subnodeIndex == -1)
+ return this;
+ if (subnode[subnodeIndex] != null) {
+ // query lies in subquad, so search it
+ Node node = subnode[subnodeIndex];
+ return node.find(searchEnv);
+ }
+ // no existing subquad, so return this one anyway
+ return this;
+ }
+
+ void insertNode(Node node)
+ {
+ Assert.isTrue(env == null || env.contains(node.env));
+//System.out.println(env);
+//System.out.println(quad.env);
+ int index = getSubnodeIndex(node.env, centrex, centrey);
+//System.out.println(index);
+ if (node.level == level - 1) {
+ subnode[index] = node;
+//System.out.println("inserted");
+ }
+ else {
+ // the quad is not a direct child, so make a new child quad to contain it
+ // and recursively insert the quad
+ Node childNode = createSubnode(index);
+ childNode.insertNode(node);
+ subnode[index] = childNode;
+ }
+ }
+
+ /**
+ * get the subquad for the index.
+ * If it doesn't exist, create it
+ */
+ private Node getSubnode(int index)
+ {
+ if (subnode[index] == null) {
+ subnode[index] = createSubnode(index);
+ }
+ return subnode[index];
+ }
+
+ private Node createSubnode(int index)
+ {
+ // create a new subquad in the appropriate quadrant
+
+ double minx = 0.0;
+ double maxx = 0.0;
+ double miny = 0.0;
+ double maxy = 0.0;
+
+ switch (index) {
+ case 0:
+ minx = env.getMinX();
+ maxx = centrex;
+ miny = env.getMinY();
+ maxy = centrey;
+ break;
+ case 1:
+ minx = centrex;
+ maxx = env.getMaxX();
+ miny = env.getMinY();
+ maxy = centrey;
+ break;
+ case 2:
+ minx = env.getMinX();
+ maxx = centrex;
+ miny = centrey;
+ maxy = env.getMaxY();
+ break;
+ case 3:
+ minx = centrex;
+ maxx = env.getMaxX();
+ miny = centrey;
+ maxy = env.getMaxY();
+ break;
+ }
+ Envelope sqEnv = new Envelope(minx, maxx, miny, maxy);
+ Node node = new Node(sqEnv, level - 1);
+ return node;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/NodeBase.java b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/NodeBase.java
new file mode 100644
index 0000000..89e92f0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/NodeBase.java
@@ -0,0 +1,236 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.ItemVisitor;
+
+
+/**
+ * The base class for nodes in a {@link Quadtree}.
+ *
+ * @version 1.7
+ */
+public abstract class NodeBase implements Serializable {
+
+//DEBUG private static int itemCount = 0; // debugging
+
+ /**
+ * Gets the index of the subquad that wholly contains the given envelope.
+ * If none does, returns -1.
+ *
+ * @return the index of the subquad that wholly contains the given envelope
+ * or -1 if no subquad wholly contains the envelope
+ */
+ public static int getSubnodeIndex(Envelope env, double centrex, double centrey)
+ {
+ int subnodeIndex = -1;
+ if (env.getMinX() >= centrex) {
+ if (env.getMinY() >= centrey) subnodeIndex = 3;
+ if (env.getMaxY() <= centrey) subnodeIndex = 1;
+ }
+ if (env.getMaxX() <= centrex) {
+ if (env.getMinY() >= centrey) subnodeIndex = 2;
+ if (env.getMaxY() <= centrey) subnodeIndex = 0;
+ }
+ return subnodeIndex;
+ }
+
+ protected List items = new ArrayList();
+
+ /**
+ * subquads are numbered as follows:
+ * <pre>
+ * 2 | 3
+ * --+--
+ * 0 | 1
+ * </pre>
+ */
+ protected Node[] subnode = new Node[4];
+
+ public NodeBase() {
+ }
+
+ public List getItems() { return items; }
+
+ public boolean hasItems() { return ! items.isEmpty(); }
+
+ public void add(Object item)
+ {
+ items.add(item);
+//DEBUG itemCount++;
+//DEBUG System.out.print(itemCount);
+ }
+
+ /**
+ * Removes a single item from this subtree.
+ *
+ * @param itemEnv the envelope containing the item
+ * @param item the item to remove
+ * @return <code>true</code> if the item was found and removed
+ */
+ public boolean remove(Envelope itemEnv, Object item)
+ {
+ // use envelope to restrict nodes scanned
+ if (! isSearchMatch(itemEnv))
+ return false;
+
+ boolean found = false;
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ found = subnode[i].remove(itemEnv, item);
+ if (found) {
+ // trim subtree if empty
+ if (subnode[i].isPrunable())
+ subnode[i] = null;
+ break;
+ }
+ }
+ }
+ // if item was found lower down, don't need to search for it here
+ if (found) return found;
+ // otherwise, try and remove the item from the list of items in this node
+ found = items.remove(item);
+ return found;
+ }
+
+ public boolean isPrunable()
+ {
+ return ! (hasChildren() || hasItems());
+ }
+
+ public boolean hasChildren()
+ {
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null)
+ return true;
+ }
+ return false;
+ }
+
+ public boolean isEmpty()
+ {
+ boolean isEmpty = true;
+ if (! items.isEmpty()) isEmpty = false;
+ else {
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ if (!subnode[i].isEmpty()) {
+ isEmpty = false;
+ break;
+ }
+ }
+ }
+ }
+ return isEmpty;
+ }
+
+ //<<TODO:RENAME?>> Sounds like this method adds resultItems to items
+ //(like List#addAll). Perhaps it should be renamed to "addAllItemsTo" [Jon Aquino]
+ public List addAllItems(List resultItems)
+ {
+ // this node may have items as well as subnodes (since items may not
+ // be wholely contained in any single subnode
+ resultItems.addAll(this.items);
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ subnode[i].addAllItems(resultItems);
+ }
+ }
+ return resultItems;
+ }
+ protected abstract boolean isSearchMatch(Envelope searchEnv);
+
+ public void addAllItemsFromOverlapping(Envelope searchEnv, List resultItems)
+ {
+ if (! isSearchMatch(searchEnv))
+ return;
+
+ // this node may have items as well as subnodes (since items may not
+ // be wholely contained in any single subnode
+ resultItems.addAll(items);
+
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ subnode[i].addAllItemsFromOverlapping(searchEnv, resultItems);
+ }
+ }
+ }
+
+ public void visit(Envelope searchEnv, ItemVisitor visitor)
+ {
+ if (! isSearchMatch(searchEnv))
+ return;
+
+ // this node may have items as well as subnodes (since items may not
+ // be wholely contained in any single subnode
+ visitItems(searchEnv, visitor);
+
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ subnode[i].visit(searchEnv, visitor);
+ }
+ }
+ }
+
+ private void visitItems(Envelope searchEnv, ItemVisitor visitor)
+ {
+ // would be nice to filter items based on search envelope, but can't until they contain an envelope
+ for (Iterator i = items.iterator(); i.hasNext(); ) {
+ visitor.visitItem(i.next());
+ }
+ }
+
+//<<TODO:RENAME?>> In Samet's terminology, I think what we're returning here is
+//actually level+1 rather than depth. (See p. 4 of his book) [Jon Aquino]
+ int depth()
+ {
+ int maxSubDepth = 0;
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ int sqd = subnode[i].depth();
+ if (sqd > maxSubDepth)
+ maxSubDepth = sqd;
+ }
+ }
+ return maxSubDepth + 1;
+ }
+
+ int size()
+ {
+ int subSize = 0;
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ subSize += subnode[i].size();
+ }
+ }
+ return subSize + items.size();
+ }
+
+ int getNodeCount()
+ {
+ int subSize = 0;
+ for (int i = 0; i < 4; i++) {
+ if (subnode[i] != null) {
+ subSize += subnode[i].size();
+ }
+ }
+ return subSize + 1;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Quadtree.java b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Quadtree.java
new file mode 100644
index 0000000..2284498
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Quadtree.java
@@ -0,0 +1,242 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.index.ArrayListVisitor;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.index.SpatialIndex;
+/**
+ * A Quadtree is a spatial index structure for efficient range querying
+ * of items bounded by 2D rectangles.
+ * {@link Geometry}s can be indexed by using their
+ * {@link Envelope}s.
+ * Any type of Object can also be indexed as
+ * long as it has an extent that can be represented by an {@link Envelope}.
+ * <p>
+ * This Quadtree index provides a <b>primary filter</b>
+ * for range rectangle queries. The various query methods return a list of
+ * all items which <i>may</i> intersect the query rectangle. Note that
+ * it may thus return items which do <b>not</b> in fact intersect the query rectangle.
+ * A secondary filter is required to test for actual intersection
+ * between the query rectangle and the envelope of each candidate item.
+ * The secondary filter may be performed explicitly,
+ * or it may be provided implicitly by subsequent operations executed on the items
+ * (for instance, if the index query is followed by computing a spatial predicate
+ * between the query geometry and tree items,
+ * the envelope intersection check is performed automatically.
+ * <p>
+ * This implementation does not require specifying the extent of the inserted
+ * items beforehand. It will automatically expand to accommodate any extent
+ * of dataset.
+ * <p>
+ * This data structure is also known as an <i>MX-CIF quadtree</i>
+ * following the terminology of Samet and others.
+ *
+ * @version 1.7
+ */
+public class Quadtree
+ implements SpatialIndex, Serializable
+{
+ private static final long serialVersionUID = -7461163625812743604L;
+
+ /**
+ * Ensure that the envelope for the inserted item has non-zero extents.
+ * Use the current minExtent to pad the envelope, if necessary
+ */
+ public static Envelope ensureExtent(Envelope itemEnv, double minExtent)
+ {
+ //The names "ensureExtent" and "minExtent" are misleading -- sounds like
+ //this method ensures that the extents are greater than minExtent.
+ //Perhaps we should rename them to "ensurePositiveExtent" and "defaultExtent".
+ //[Jon Aquino]
+ double minx = itemEnv.getMinX();
+ double maxx = itemEnv.getMaxX();
+ double miny = itemEnv.getMinY();
+ double maxy = itemEnv.getMaxY();
+ // has a non-zero extent
+ if (minx != maxx && miny != maxy) return itemEnv;
+
+ // pad one or both extents
+ if (minx == maxx) {
+ minx = minx - minExtent / 2.0;
+ maxx = minx + minExtent / 2.0;
+ }
+ if (miny == maxy) {
+ miny = miny - minExtent / 2.0;
+ maxy = miny + minExtent / 2.0;
+ }
+ return new Envelope(minx, maxx, miny, maxy);
+ }
+
+ private Root root;
+ /**
+
+ * minExtent is the minimum envelope extent of all items
+ * inserted into the tree so far. It is used as a heuristic value
+ * to construct non-zero envelopes for features with zero X and/or Y extent.
+ * Start with a non-zero extent, in case the first feature inserted has
+ * a zero extent in both directions. This value may be non-optimal, but
+ * only one feature will be inserted with this value.
+ **/
+ private double minExtent = 1.0;
+
+ /**
+ * Constructs a Quadtree with zero items.
+ */
+ public Quadtree()
+ {
+ root = new Root();
+ }
+
+ /**
+ * Returns the number of levels in the tree.
+ */
+ public int depth()
+ {
+ //I don't think it's possible for root to be null. Perhaps we should
+ //remove the check. [Jon Aquino]
+ //Or make an assertion [Jon Aquino 10/29/2003]
+ if (root != null) return root.depth();
+ return 0;
+ }
+
+ /**
+ * Tests whether the index contains any items.
+ *
+ * @return true if the index does not contain any items
+ */
+ public boolean isEmpty()
+ {
+ if (root == null) return true;
+ return root.isEmpty();
+ }
+
+ /**
+ * Returns the number of items in the tree.
+ *
+ * @return the number of items in the tree
+ */
+ public int size()
+ {
+ if (root != null) return root.size();
+ return 0;
+ }
+
+ public void insert(Envelope itemEnv, Object item)
+ {
+ collectStats(itemEnv);
+ Envelope insertEnv = ensureExtent(itemEnv, minExtent);
+ root.insert(insertEnv, item);
+ }
+
+ /**
+ * Removes a single item from the tree.
+ *
+ * @param itemEnv the Envelope of the item to be removed
+ * @param item the item to remove
+ * @return <code>true</code> if the item was found (and thus removed)
+ */
+ public boolean remove(Envelope itemEnv, Object item)
+ {
+ Envelope posEnv = ensureExtent(itemEnv, minExtent);
+ return root.remove(posEnv, item);
+ }
+
+/*
+ public List OLDquery(Envelope searchEnv)
+ {
+ /**
+ * the items that are matched are the items in quads which
+ * overlap the search envelope
+ */
+ /*
+ List foundItems = new ArrayList();
+ root.addAllItemsFromOverlapping(searchEnv, foundItems);
+ return foundItems;
+ }
+*/
+
+ /**
+ * Queries the tree and returns items which may lie in the given search envelope.
+ * Precisely, the items that are returned are all items in the tree
+ * whose envelope <b>may</b> intersect the search Envelope.
+ * Note that some items with non-intersecting envelopes may be returned as well;
+ * the client is responsible for filtering these out.
+ * In most situations there will be many items in the tree which do not
+ * intersect the search envelope and which are not returned - thus
+ * providing improved performance over a simple linear scan.
+ *
+ * @param searchEnv the envelope of the desired query area.
+ * @return a List of items which may intersect the search envelope
+ */
+ public List query(Envelope searchEnv)
+ {
+ /**
+ * the items that are matched are the items in quads which
+ * overlap the search envelope
+ */
+ ArrayListVisitor visitor = new ArrayListVisitor();
+ query(searchEnv, visitor);
+ return visitor.getItems();
+ }
+
+ /**
+ * Queries the tree and visits items which may lie in the given search envelope.
+ * Precisely, the items that are visited are all items in the tree
+ * whose envelope <b>may</b> intersect the search Envelope.
+ * Note that some items with non-intersecting envelopes may be visited as well;
+ * the client is responsible for filtering these out.
+ * In most situations there will be many items in the tree which do not
+ * intersect the search envelope and which are not visited - thus
+ * providing improved performance over a simple linear scan.
+ *
+ * @param searchEnv the envelope of the desired query area.
+ * @param visitor a visitor object which is passed the visited items
+ */
+ public void query(Envelope searchEnv, ItemVisitor visitor)
+ {
+ /**
+ * the items that are matched are the items in quads which
+ * overlap the search envelope
+ */
+ root.visit(searchEnv, visitor);
+ }
+
+ /**
+ * Return a list of all items in the Quadtree
+ */
+ public List queryAll()
+ {
+ List foundItems = new ArrayList();
+ root.addAllItems(foundItems);
+ return foundItems;
+ }
+
+ private void collectStats(Envelope itemEnv)
+ {
+ double delX = itemEnv.getWidth();
+ if (delX < minExtent && delX > 0.0)
+ minExtent = delX;
+
+ double delY = itemEnv.getHeight();
+ if (delY < minExtent && delY > 0.0)
+ minExtent = delY;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Root.java b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Root.java
new file mode 100644
index 0000000..44b0d02
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/Root.java
@@ -0,0 +1,99 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * QuadRoot is the root of a single Quadtree. It is centred at the origin,
+ * and does not have a defined extent.
+ *
+ * @version 1.7
+ */
+public class Root
+ extends NodeBase
+{
+
+ // the singleton root quad is centred at the origin.
+ private static final Coordinate origin = new Coordinate(0.0, 0.0);
+
+ public Root()
+ {
+ }
+
+ /**
+ * Insert an item into the quadtree this is the root of.
+ */
+ public void insert(Envelope itemEnv, Object item)
+ {
+ int index = getSubnodeIndex(itemEnv, origin.x, origin.y);
+ // if index is -1, itemEnv must cross the X or Y axis.
+ if (index == -1) {
+ add(item);
+ return;
+ }
+ /**
+ * the item must be contained in one quadrant, so insert it into the
+ * tree for that quadrant (which may not yet exist)
+ */
+ Node node = subnode[index];
+ /**
+ * If the subquad doesn't exist or this item is not contained in it,
+ * have to expand the tree upward to contain the item.
+ */
+
+ if (node == null || ! node.getEnvelope().contains(itemEnv)) {
+ Node largerNode = Node.createExpanded(node, itemEnv);
+ subnode[index] = largerNode;
+ }
+ /**
+ * At this point we have a subquad which exists and must contain
+ * contains the env for the item. Insert the item into the tree.
+ */
+ insertContained(subnode[index], itemEnv, item);
+ //System.out.println("depth = " + root.depth() + " size = " + root.size());
+ //System.out.println(" size = " + size());
+ }
+
+ /**
+ * insert an item which is known to be contained in the tree rooted at
+ * the given QuadNode root. Lower levels of the tree will be created
+ * if necessary to hold the item.
+ */
+ private void insertContained(Node tree, Envelope itemEnv, Object item)
+ {
+ Assert.isTrue(tree.getEnvelope().contains(itemEnv));
+ /**
+ * Do NOT create a new quad for zero-area envelopes - this would lead
+ * to infinite recursion. Instead, use a heuristic of simply returning
+ * the smallest existing quad containing the query
+ */
+ boolean isZeroX = IntervalSize.isZeroWidth(itemEnv.getMinX(), itemEnv.getMaxX());
+ boolean isZeroY = IntervalSize.isZeroWidth(itemEnv.getMinY(), itemEnv.getMaxY());
+ NodeBase node;
+ if (isZeroX || isZeroY)
+ node = tree.find(itemEnv);
+ else
+ node = tree.getNode(itemEnv);
+ node.add(item);
+ }
+
+ protected boolean isSearchMatch(Envelope searchEnv)
+ {
+ return true;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/quadtree/package.html b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/package.html
new file mode 100644
index 0000000..2e84919
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/quadtree/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes that implement a Quadtree spatial index
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractNode.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractNode.java
new file mode 100644
index 0000000..2995fc4
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractNode.java
@@ -0,0 +1,125 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A node of an {@link AbstractSTRtree}. A node is one of:
+ * <ul>
+ * <li>empty
+ * <li>an <i>interior node</i> containing child {@link AbstractNode}s
+ * <li>a <i>leaf node</i> containing data items ({@link ItemBoundable}s).
+ * </ul>
+ * A node stores the bounds of its children, and its level within the index tree.
+ *
+ * @version 1.7
+ */
+public abstract class AbstractNode implements Boundable, Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6493722185909573708L;
+
+ private ArrayList childBoundables = new ArrayList();
+ private Object bounds = null;
+ private int level;
+
+ /**
+ * Default constructor required for serialization.
+ */
+ public AbstractNode() {
+ }
+
+ /**
+ * Constructs an AbstractNode at the given level in the tree
+ * @param level 0 if this node is a leaf, 1 if a parent of a leaf, and so on; the
+ * root node will have the highest level
+ */
+ public AbstractNode(int level) {
+ this.level = level;
+ }
+
+ /**
+ * Returns either child {@link AbstractNode}s, or if this is a leaf node, real data (wrapped
+ * in {@link ItemBoundable}s).
+ */
+ public List getChildBoundables() {
+ return childBoundables;
+ }
+
+ /**
+ * Returns a representation of space that encloses this Boundable,
+ * preferably not much bigger than this Boundable's boundary yet fast to
+ * test for intersection with the bounds of other Boundables. The class of
+ * object returned depends on the subclass of AbstractSTRtree.
+ *
+ * @return an Envelope (for STRtrees), an Interval (for SIRtrees), or other
+ * object (for other subclasses of AbstractSTRtree)
+ * @see AbstractSTRtree.IntersectsOp
+ */
+ protected abstract Object computeBounds();
+
+ /**
+ * Gets the bounds of this node
+ *
+ * @return the object representing bounds in this index
+ */
+ public Object getBounds() {
+ if (bounds == null) {
+ bounds = computeBounds();
+ }
+ return bounds;
+ }
+
+ /**
+ * Returns 0 if this node is a leaf, 1 if a parent of a leaf, and so on; the
+ * root node will have the highest level
+ */
+ public int getLevel() {
+ return level;
+ }
+
+ /**
+ * Gets the count of the {@link Boundable}s at this node.
+ *
+ * @return the count of boundables at this node
+ */
+ public int size()
+ {
+ return childBoundables.size();
+ }
+
+ /**
+ * Tests whether there are any {@link Boundable}s at this node.
+ *
+ * @return true if there are boundables at this node
+ */
+ public boolean isEmpty()
+ {
+ return childBoundables.isEmpty();
+ }
+
+ /**
+ * Adds either an AbstractNode, or if this is a leaf node, a data object
+ * (wrapped in an ItemBoundable)
+ */
+ public void addChildBoundable(Boundable childBoundable) {
+ Assert.isTrue(bounds == null);
+ childBoundables.add(childBoundable);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java
new file mode 100644
index 0000000..b65203f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java
@@ -0,0 +1,450 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Base class for STRtree and SIRtree. STR-packed R-trees are described in:
+ * P. Rigaux, Michel Scholl and Agnes Voisard. <i>Spatial Databases With
+ * Application To GIS.</i> Morgan Kaufmann, San Francisco, 2002.
+ * <p>
+ * This implementation is based on {@link Boundable}s rather than {@link AbstractNode}s,
+ * because the STR algorithm operates on both nodes and
+ * data, both of which are treated as Boundables.
+ * <p>
+ * This class is thread-safe. Building the tree is synchronized,
+ * and querying is stateless.
+ *
+ * @see STRtree
+ * @see SIRtree
+ *
+ * @version 1.7
+ */
+public abstract class AbstractSTRtree implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3886435814360241337L;
+
+ /**
+ * A test for intersection between two bounds, necessary because subclasses
+ * of AbstractSTRtree have different implementations of bounds.
+ */
+ protected static interface IntersectsOp {
+ /**
+ * For STRtrees, the bounds will be Envelopes; for SIRtrees, Intervals;
+ * for other subclasses of AbstractSTRtree, some other class.
+ * @param aBounds the bounds of one spatial object
+ * @param bBounds the bounds of another spatial object
+ * @return whether the two bounds intersect
+ */
+ boolean intersects(Object aBounds, Object bBounds);
+ }
+
+ protected AbstractNode root;
+
+ private boolean built = false;
+ /**
+ * Set to <tt>null</tt> when index is built, to avoid retaining memory.
+ */
+ private ArrayList itemBoundables = new ArrayList();
+
+ private int nodeCapacity;
+
+ private static final int DEFAULT_NODE_CAPACITY = 10;
+
+ /**
+ * Constructs an AbstractSTRtree with the
+ * default node capacity.
+ */
+ public AbstractSTRtree() {
+ this(DEFAULT_NODE_CAPACITY);
+ }
+
+ /**
+ * Constructs an AbstractSTRtree with the specified maximum number of child
+ * nodes that a node may have
+ *
+ * @param nodeCapacity the maximum number of child nodes in a node
+ */
+ public AbstractSTRtree(int nodeCapacity) {
+ Assert.isTrue(nodeCapacity > 1, "Node capacity must be greater than 1");
+ this.nodeCapacity = nodeCapacity;
+ }
+
+ /**
+ * Creates parent nodes, grandparent nodes, and so forth up to the root
+ * node, for the data that has been inserted into the tree. Can only be
+ * called once, and thus can be called only after all of the data has been
+ * inserted into the tree.
+ */
+ public synchronized void build() {
+ if (built) return;
+ root = itemBoundables.isEmpty()
+ ? createNode(0)
+ : createHigherLevels(itemBoundables, -1);
+ // the item list is no longer needed
+ itemBoundables = null;
+ built = true;
+ }
+
+ protected abstract AbstractNode createNode(int level);
+
+ /**
+ * Sorts the childBoundables then divides them into groups of size M, where
+ * M is the node capacity.
+ */
+ protected List createParentBoundables(List childBoundables, int newLevel) {
+ Assert.isTrue(!childBoundables.isEmpty());
+ ArrayList parentBoundables = new ArrayList();
+ parentBoundables.add(createNode(newLevel));
+ ArrayList sortedChildBoundables = new ArrayList(childBoundables);
+ Collections.sort(sortedChildBoundables, getComparator());
+ for (Iterator i = sortedChildBoundables.iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (lastNode(parentBoundables).getChildBoundables().size() == getNodeCapacity()) {
+ parentBoundables.add(createNode(newLevel));
+ }
+ lastNode(parentBoundables).addChildBoundable(childBoundable);
+ }
+ return parentBoundables;
+ }
+
+ protected AbstractNode lastNode(List nodes) {
+ return (AbstractNode) nodes.get(nodes.size() - 1);
+ }
+
+ protected static int compareDoubles(double a, double b) {
+ return a > b ? 1
+ : a < b ? -1
+ : 0;
+ }
+
+ /**
+ * Creates the levels higher than the given level
+ *
+ * @param boundablesOfALevel
+ * the level to build on
+ * @param level
+ * the level of the Boundables, or -1 if the boundables are item
+ * boundables (that is, below level 0)
+ * @return the root, which may be a ParentNode or a LeafNode
+ */
+ private AbstractNode createHigherLevels(List boundablesOfALevel, int level) {
+ Assert.isTrue(!boundablesOfALevel.isEmpty());
+ List parentBoundables = createParentBoundables(boundablesOfALevel, level + 1);
+ if (parentBoundables.size() == 1) {
+ return (AbstractNode) parentBoundables.get(0);
+ }
+ return createHigherLevels(parentBoundables, level + 1);
+ }
+
+ public AbstractNode getRoot()
+ {
+ build();
+ return root;
+ }
+
+ /**
+ * Returns the maximum number of child nodes that a node may have
+ */
+ public int getNodeCapacity() { return nodeCapacity; }
+
+ /**
+ * Tests whether the index contains any items.
+ * This method does not build the index,
+ * so items can still be inserted after it has been called.
+ *
+ * @return true if the index does not contain any items
+ */
+ public boolean isEmpty()
+ {
+ if (! built) return itemBoundables.isEmpty();
+ return root.isEmpty();
+ }
+
+ protected int size() {
+ if (isEmpty()) {
+ return 0;
+ }
+ build();
+ return size(root);
+ }
+
+ protected int size(AbstractNode node)
+ {
+ int size = 0;
+ for (Iterator i = node.getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (childBoundable instanceof AbstractNode) {
+ size += size((AbstractNode) childBoundable);
+ }
+ else if (childBoundable instanceof ItemBoundable) {
+ size += 1;
+ }
+ }
+ return size;
+ }
+
+ protected int depth() {
+ if (isEmpty()) {
+ return 0;
+ }
+ build();
+ return depth(root);
+ }
+
+ protected int depth(AbstractNode node)
+ {
+ int maxChildDepth = 0;
+ for (Iterator i = node.getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (childBoundable instanceof AbstractNode) {
+ int childDepth = depth((AbstractNode) childBoundable);
+ if (childDepth > maxChildDepth)
+ maxChildDepth = childDepth;
+ }
+ }
+ return maxChildDepth + 1;
+ }
+
+
+ protected void insert(Object bounds, Object item) {
+ Assert.isTrue(!built, "Cannot insert items into an STR packed R-tree after it has been built.");
+ itemBoundables.add(new ItemBoundable(bounds, item));
+ }
+
+ /**
+ * Also builds the tree, if necessary.
+ */
+ protected List query(Object searchBounds) {
+ build();
+ ArrayList matches = new ArrayList();
+ if (isEmpty()) {
+ //Assert.isTrue(root.getBounds() == null);
+ return matches;
+ }
+ if (getIntersectsOp().intersects(root.getBounds(), searchBounds)) {
+ queryInternal(searchBounds, root, matches);
+ }
+ return matches;
+ }
+
+ /**
+ * Also builds the tree, if necessary.
+ */
+ protected void query(Object searchBounds, ItemVisitor visitor) {
+ build();
+ if (isEmpty()) {
+ // nothing in tree, so return
+ //Assert.isTrue(root.getBounds() == null);
+ return;
+ }
+ if (getIntersectsOp().intersects(root.getBounds(), searchBounds)) {
+ queryInternal(searchBounds, root, visitor);
+ }
+ }
+
+ /**
+ * @return a test for intersection between two bounds, necessary because subclasses
+ * of AbstractSTRtree have different implementations of bounds.
+ * @see IntersectsOp
+ */
+ protected abstract IntersectsOp getIntersectsOp();
+
+ private void queryInternal(Object searchBounds, AbstractNode node, List matches) {
+ List childBoundables = node.getChildBoundables();
+ for (int i = 0; i < childBoundables.size(); i++) {
+ Boundable childBoundable = (Boundable) childBoundables.get(i);
+ if (! getIntersectsOp().intersects(childBoundable.getBounds(), searchBounds)) {
+ continue;
+ }
+ if (childBoundable instanceof AbstractNode) {
+ queryInternal(searchBounds, (AbstractNode) childBoundable, matches);
+ }
+ else if (childBoundable instanceof ItemBoundable) {
+ matches.add(((ItemBoundable)childBoundable).getItem());
+ }
+ else {
+ Assert.shouldNeverReachHere();
+ }
+ }
+ }
+
+ private void queryInternal(Object searchBounds, AbstractNode node, ItemVisitor visitor) {
+ List childBoundables = node.getChildBoundables();
+ for (int i = 0; i < childBoundables.size(); i++) {
+ Boundable childBoundable = (Boundable) childBoundables.get(i);
+ if (! getIntersectsOp().intersects(childBoundable.getBounds(), searchBounds)) {
+ continue;
+ }
+ if (childBoundable instanceof AbstractNode) {
+ queryInternal(searchBounds, (AbstractNode) childBoundable, visitor);
+ }
+ else if (childBoundable instanceof ItemBoundable) {
+ visitor.visitItem(((ItemBoundable)childBoundable).getItem());
+ }
+ else {
+ Assert.shouldNeverReachHere();
+ }
+ }
+ }
+
+ /**
+ * Gets a tree structure (as a nested list)
+ * corresponding to the structure of the items and nodes in this tree.
+ * <p>
+ * The returned {@link List}s contain either {@link Object} items,
+ * or Lists which correspond to subtrees of the tree
+ * Subtrees which do not contain any items are not included.
+ * <p>
+ * Builds the tree if necessary.
+ *
+ * @return a List of items and/or Lists
+ */
+ public List itemsTree()
+ {
+ build();
+
+ List valuesTree = itemsTree(root);
+ if (valuesTree == null)
+ return new ArrayList();
+ return valuesTree;
+ }
+
+ private List itemsTree(AbstractNode node)
+ {
+ List valuesTreeForNode = new ArrayList();
+ for (Iterator i = node.getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (childBoundable instanceof AbstractNode) {
+ List valuesTreeForChild = itemsTree((AbstractNode) childBoundable);
+ // only add if not null (which indicates an item somewhere in this tree
+ if (valuesTreeForChild != null)
+ valuesTreeForNode.add(valuesTreeForChild);
+ }
+ else if (childBoundable instanceof ItemBoundable) {
+ valuesTreeForNode.add(((ItemBoundable)childBoundable).getItem());
+ }
+ else {
+ Assert.shouldNeverReachHere();
+ }
+ }
+ if (valuesTreeForNode.size() <= 0)
+ return null;
+ return valuesTreeForNode;
+ }
+
+ /**
+ * Removes an item from the tree.
+ * (Builds the tree, if necessary.)
+ */
+ protected boolean remove(Object searchBounds, Object item) {
+ build();
+ if (getIntersectsOp().intersects(root.getBounds(), searchBounds)) {
+ return remove(searchBounds, root, item);
+ }
+ return false;
+ }
+
+ private boolean removeItem(AbstractNode node, Object item)
+ {
+ Boundable childToRemove = null;
+ for (Iterator i = node.getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (childBoundable instanceof ItemBoundable) {
+ if ( ((ItemBoundable) childBoundable).getItem() == item)
+ childToRemove = childBoundable;
+ }
+ }
+ if (childToRemove != null) {
+ node.getChildBoundables().remove(childToRemove);
+ return true;
+ }
+ return false;
+ }
+
+ private boolean remove(Object searchBounds, AbstractNode node, Object item) {
+ // first try removing item from this node
+ boolean found = removeItem(node, item);
+ if (found)
+ return true;
+
+ AbstractNode childToPrune = null;
+ // next try removing item from lower nodes
+ for (Iterator i = node.getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (!getIntersectsOp().intersects(childBoundable.getBounds(), searchBounds)) {
+ continue;
+ }
+ if (childBoundable instanceof AbstractNode) {
+ found = remove(searchBounds, (AbstractNode) childBoundable, item);
+ // if found, record child for pruning and exit
+ if (found) {
+ childToPrune = (AbstractNode) childBoundable;
+ break;
+ }
+ }
+ }
+ // prune child if possible
+ if (childToPrune != null) {
+ if (childToPrune.getChildBoundables().isEmpty()) {
+ node.getChildBoundables().remove(childToPrune);
+ }
+ }
+ return found;
+ }
+
+ protected List boundablesAtLevel(int level) {
+ ArrayList boundables = new ArrayList();
+ boundablesAtLevel(level, root, boundables);
+ return boundables;
+ }
+
+ /**
+ * @param level -1 to get items
+ */
+ private void boundablesAtLevel(int level, AbstractNode top, Collection boundables) {
+ Assert.isTrue(level > -2);
+ if (top.getLevel() == level) {
+ boundables.add(top);
+ return;
+ }
+ for (Iterator i = top.getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable boundable = (Boundable) i.next();
+ if (boundable instanceof AbstractNode) {
+ boundablesAtLevel(level, (AbstractNode)boundable, boundables);
+ }
+ else {
+ Assert.isTrue(boundable instanceof ItemBoundable);
+ if (level == -1) { boundables.add(boundable); }
+ }
+ }
+ return;
+ }
+
+ protected abstract Comparator getComparator();
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/Boundable.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/Boundable.java
new file mode 100644
index 0000000..e85728a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/Boundable.java
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+/**
+ * A spatial object in an AbstractSTRtree.
+ *
+ * @version 1.7
+ */
+public interface Boundable {
+ /**
+ * Returns a representation of space that encloses this Boundable, preferably
+ * not much bigger than this Boundable's boundary yet fast to test for intersection
+ * with the bounds of other Boundables. The class of object returned depends
+ * on the subclass of AbstractSTRtree.
+ * @return an Envelope (for STRtrees), an Interval (for SIRtrees), or other object
+ * (for other subclasses of AbstractSTRtree)
+ */
+ Object getBounds();
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePair.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePair.java
new file mode 100644
index 0000000..599e856
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePair.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.util.PriorityQueue;
+
+
+/**
+ * A pair of {@link Boundable}s, whose leaf items
+ * support a distance metric between them.
+ * Used to compute the distance between the members,
+ * and to expand a member relative to the other
+ * in order to produce new branches of the
+ * Branch-and-Bound evaluation tree.
+ * Provides an ordering based on the distance between the members,
+ * which allows building a priority queue by minimum distance.
+ *
+ * @author Martin Davis
+ *
+ */
+class BoundablePair
+ implements Comparable
+{
+ private Boundable boundable1;
+ private Boundable boundable2;
+ private double distance;
+ private ItemDistance itemDistance;
+ //private double maxDistance = -1.0;
+
+ public BoundablePair(Boundable boundable1, Boundable boundable2, ItemDistance itemDistance)
+ {
+ this.boundable1 = boundable1;
+ this.boundable2 = boundable2;
+ this.itemDistance = itemDistance;
+ distance = distance();
+ }
+
+ /**
+ * Gets one of the member {@link Boundable}s in the pair
+ * (indexed by [0, 1]).
+ *
+ * @param i the index of the member to return (0 or 1)
+ * @return the chosen member
+ */
+ public Boundable getBoundable(int i)
+ {
+ if (i == 0) return boundable1;
+ return boundable2;
+ }
+
+ /**
+ * Computes the distance between the {@link Boundable}s in this pair.
+ * The boundables are either composites or leaves.
+ * If either is composite, the distance is computed as the minimum distance
+ * between the bounds.
+ * If both are leaves, the distance is computed by {@link #itemDistance(ItemBoundable, ItemBoundable)}.
+ *
+ * @return
+ */
+ private double distance()
+ {
+ // if items, compute exact distance
+ if (isLeaves()) {
+ return itemDistance.distance((ItemBoundable) boundable1,
+ (ItemBoundable) boundable2);
+ }
+ // otherwise compute distance between bounds of boundables
+ return ((Envelope) boundable1.getBounds()).distance(
+ ((Envelope) boundable2.getBounds()));
+ }
+
+
+ /*
+ public double getMaximumDistance()
+ {
+ if (maxDistance < 0.0)
+ maxDistance = maxDistance();
+ return maxDistance;
+ }
+ */
+
+ /*
+ private double maxDistance()
+ {
+ return maximumDistance(
+ (Envelope) boundable1.getBounds(),
+ (Envelope) boundable2.getBounds());
+ }
+
+ private static double maximumDistance(Envelope env1, Envelope env2)
+ {
+ double minx = Math.min(env1.getMinX(), env2.getMinX());
+ double miny = Math.min(env1.getMinY(), env2.getMinY());
+ double maxx = Math.max(env1.getMaxX(), env2.getMaxX());
+ double maxy = Math.max(env1.getMaxY(), env2.getMaxY());
+ Coordinate min = new Coordinate(minx, miny);
+ Coordinate max = new Coordinate(maxx, maxy);
+ return min.distance(max);
+ }
+ */
+
+ /**
+ * Gets the minimum possible distance between the Boundables in
+ * this pair.
+ * If the members are both items, this will be the
+ * exact distance between them.
+ * Otherwise, this distance will be a lower bound on
+ * the distances between the items in the members.
+ *
+ * @return the exact or lower bound distance for this pair
+ */
+ public double getDistance() { return distance; }
+
+ /**
+ * Compares two pairs based on their minimum distances
+ */
+ public int compareTo(Object o)
+ {
+ BoundablePair nd = (BoundablePair) o;
+ if (distance < nd.distance) return -1;
+ if (distance > nd.distance) return 1;
+ return 0;
+ }
+
+ /**
+ * Tests if both elements of the pair are leaf nodes
+ *
+ * @return true if both pair elements are leaf nodes
+ */
+ public boolean isLeaves()
+ {
+ return ! (isComposite(boundable1) || isComposite(boundable2));
+ }
+
+ public static boolean isComposite(Object item)
+ {
+ return (item instanceof AbstractNode);
+ }
+
+ private static double area(Boundable b)
+ {
+ return ((Envelope) b.getBounds()).getArea();
+ }
+
+ /**
+ * For a pair which is not a leaf
+ * (i.e. has at least one composite boundable)
+ * computes a list of new pairs
+ * from the expansion of the larger boundable.
+ *
+ */
+ public void expandToQueue(PriorityQueue priQ, double minDistance)
+ {
+ boolean isComp1 = isComposite(boundable1);
+ boolean isComp2 = isComposite(boundable2);
+
+ /**
+ * HEURISTIC: If both boundable are composite,
+ * choose the one with largest area to expand.
+ * Otherwise, simply expand whichever is composite.
+ */
+ if (isComp1 && isComp2) {
+ if (area(boundable1) > area(boundable2)) {
+ expand(boundable1, boundable2, priQ, minDistance);
+ return;
+ }
+ else {
+ expand(boundable2, boundable1, priQ, minDistance);
+ return;
+ }
+ }
+ else if (isComp1) {
+ expand(boundable1, boundable2, priQ, minDistance);
+ return;
+ }
+ else if (isComp2) {
+ expand(boundable2, boundable1, priQ, minDistance);
+ return;
+ }
+
+ throw new IllegalArgumentException("neither boundable is composite");
+ }
+
+ private void expand(Boundable bndComposite, Boundable bndOther,
+ PriorityQueue priQ, double minDistance)
+ {
+ List children = ((AbstractNode) bndComposite).getChildBoundables();
+ for (Iterator i = children.iterator(); i.hasNext(); ) {
+ Boundable child = (Boundable) i.next();
+ BoundablePair bp = new BoundablePair(child, bndOther, itemDistance);
+ // only add to queue if this pair might contain the closest points
+ // MD - it's actually faster to construct the object rather than called distance(child, bndOther)!
+ if (bp.getDistance() < minDistance) {
+ priQ.add(bp);
+ }
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePairDistanceComparator.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePairDistanceComparator.java
new file mode 100644
index 0000000..634f917
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePairDistanceComparator.java
@@ -0,0 +1,65 @@
+
+/*
+ * Copyright (c) 2017 Jia Yu.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+
+/**
+ * The Class BoundablePairDistanceComparator. It implements Java comparator and is used
+ * as a parameter to sort the BoundablePair list.
+ */
+public class BoundablePairDistanceComparator implements Comparator<BoundablePair>, Serializable{
+
+ /** The normal order. */
+ boolean normalOrder;
+
+ /**
+ * Instantiates a new boundable pair distance comparator.
+ *
+ * @param normalOrder The true means puts the least record at the head of this queue.
+ * This is the natural order. PriorityQueue peek() will get the least element. Vice versa.
+ */
+ public BoundablePairDistanceComparator(boolean normalOrder)
+ {
+ this.normalOrder = normalOrder;
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ */
+ public int compare(BoundablePair p1, BoundablePair p2) {
+ double distance1 = p1.getDistance();
+ double distance2 = p2.getDistance();
+ if(this.normalOrder)
+ {
+ if (distance1 > distance2) {
+ return 1;
+ } else if (distance1 == distance2) {
+ return 0;
+ }
+ return -1;
+ }
+ else
+ {
+ if (distance1 > distance2) {
+ return -1;
+ } else if (distance1 == distance2) {
+ return 0;
+ }
+ return 1;
+ }
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/GeometryItemDistance.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/GeometryItemDistance.java
new file mode 100644
index 0000000..90a3d65
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/GeometryItemDistance.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index.strtree;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * An ItemDistance function for
+ * items which are {@link Geometry}s,
+ * using the {@link Geometry#distance(Geometry)} method.
+ *
+ * @author Martin Davis
+ *
+ */
+public class GeometryItemDistance
+implements ItemDistance
+{
+ /**
+ * Computes the distance between two {@link Geometry} items,
+ * using the {@link Geometry#distance(Geometry)} method.
+ *
+ * @param item1 an item which is a Geometry
+ * @param item2 an item which is a Geometry
+ * @return the distance between the geometries
+ * @throws ClassCastException if either item is not a Geometry
+ */
+ public double distance(ItemBoundable item1, ItemBoundable item2) {
+ Geometry g1 = (Geometry) item1.getItem();
+ Geometry g2 = (Geometry) item2.getItem();
+ return g1.distance(g2);
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/Interval.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/Interval.java
new file mode 100644
index 0000000..a81fedb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/Interval.java
@@ -0,0 +1,57 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A contiguous portion of 1D-space. Used internally by SIRtree.
+ * @see SIRtree
+ *
+ * @version 1.7
+ */
+public class Interval {
+
+ public Interval(Interval other) {
+ this(other.min, other.max);
+ }
+
+ public Interval(double min, double max) {
+ Assert.isTrue(min <= max);
+ this.min = min;
+ this.max = max;
+ }
+
+ private double min;
+ private double max;
+
+ public double getCentre() { return (min+max)/2; }
+
+ /**
+ * @return this
+ */
+ public Interval expandToInclude(Interval other) {
+ max = Math.max(max, other.max);
+ min = Math.min(min, other.min);
+ return this;
+ }
+
+ public boolean intersects(Interval other) {
+ return !(other.min > max || other.max < min);
+ }
+ public boolean equals(Object o) {
+ if (! (o instanceof Interval)) { return false; }
+ Interval other = (Interval) o;
+ return min == other.min && max == other.max;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/ItemBoundable.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/ItemBoundable.java
new file mode 100644
index 0000000..f853bfa
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/ItemBoundable.java
@@ -0,0 +1,37 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+import java.io.Serializable;
+
+/**
+ * Boundable wrapper for a non-Boundable spatial object. Used internally by
+ * AbstractSTRtree.
+ *
+ * @version 1.7
+ */
+public class ItemBoundable implements Boundable, Serializable {
+ private Object bounds;
+ private Object item;
+
+ public ItemBoundable(Object bounds, Object item) {
+ this.bounds = bounds;
+ this.item = item;
+ }
+
+ public Object getBounds() {
+ return bounds;
+ }
+
+ public Object getItem() { return item; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/ItemDistance.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/ItemDistance.java
new file mode 100644
index 0000000..1969255
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/ItemDistance.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index.strtree;
+
+
+/**
+ * A function method which computes the distance
+ * between two {@link ItemBoundable}s in an {@link STRtree}.
+ * Used for Nearest Neighbour searches.
+ *
+ * @author Martin Davis
+ *
+ */
+public interface ItemDistance
+{
+ /**
+ * Computes the distance between two items.
+ *
+ * @param item1
+ * @param item2
+ * @return the distance between the items
+ *
+ * @throws IllegalArgumentException if the metric is not applicable to the arguments
+ */
+ double distance(ItemBoundable item1, ItemBoundable item2);
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/SIRtree.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/SIRtree.java
new file mode 100644
index 0000000..3bcd076
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/SIRtree.java
@@ -0,0 +1,109 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * One-dimensional version of an STR-packed R-tree. SIR stands for
+ * "Sort-Interval-Recursive". STR-packed R-trees are described in:
+ * P. Rigaux, Michel Scholl and Agnes Voisard. Spatial Databases With
+ * Application To GIS. Morgan Kaufmann, San Francisco, 2002.
+ * <p>
+ * This class is thread-safe. Building the tree is synchronized,
+ * and querying is stateless.
+ *
+ * @see STRtree
+ *
+ * @version 1.7
+ */
+public class SIRtree extends AbstractSTRtree {
+
+ private Comparator comparator = new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return compareDoubles(
+ ((Interval)((Boundable)o1).getBounds()).getCentre(),
+ ((Interval)((Boundable)o2).getBounds()).getCentre());
+ }
+ };
+
+ private IntersectsOp intersectsOp = new IntersectsOp() {
+ public boolean intersects(Object aBounds, Object bBounds) {
+ return ((Interval)aBounds).intersects((Interval)bBounds);
+ }
+ };
+
+ /**
+ * Constructs an SIRtree with the default node capacity.
+ */
+ public SIRtree() { this(10); }
+
+ /**
+ * Constructs an SIRtree with the given maximum number of child nodes that
+ * a node may have
+ */
+ public SIRtree(int nodeCapacity) {
+ super(nodeCapacity);
+ }
+
+ protected AbstractNode createNode(int level) {
+ return new AbstractNode(level) {
+ protected Object computeBounds() {
+ Interval bounds = null;
+ for (Iterator i = getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (bounds == null) {
+ bounds = new Interval((Interval)childBoundable.getBounds());
+ }
+ else {
+ bounds.expandToInclude((Interval)childBoundable.getBounds());
+ }
+ }
+ return bounds;
+ }
+ };
+ }
+
+ /**
+ * Inserts an item having the given bounds into the tree.
+ */
+ public void insert(double x1, double x2, Object item) {
+ super.insert(new Interval(Math.min(x1, x2), Math.max(x1, x2)), item);
+ }
+
+ /**
+ * Returns items whose bounds intersect the given value.
+ */
+ public List query(double x) {
+ return query(x, x);
+ }
+
+ /**
+ * Returns items whose bounds intersect the given bounds.
+ * @param x1 possibly equal to x2
+ */
+ public List query(double x1, double x2) {
+ return super.query(new Interval(Math.min(x1, x2), Math.max(x1, x2)));
+ }
+
+ protected IntersectsOp getIntersectsOp() {
+ return intersectsOp;
+ }
+
+ protected Comparator getComparator() {
+ return comparator;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/STRtree.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/STRtree.java
new file mode 100644
index 0000000..fd12580
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/STRtree.java
@@ -0,0 +1,500 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jts.util.PriorityQueue;
+
+/**
+ * A query-only R-tree created using the Sort-Tile-Recursive (STR) algorithm.
+ * For two-dimensional spatial data.
+ * <P>
+ * The STR packed R-tree is simple to implement and maximizes space
+ * utilization; that is, as many leaves as possible are filled to capacity.
+ * Overlap between nodes is far less than in a basic R-tree. However, once the
+ * tree has been built (explicitly or on the first call to #query), items may
+ * not be added or removed.
+ * <P>
+ * Described in: P. Rigaux, Michel Scholl and Agnes Voisard.
+ * <i>Spatial Databases With Application To GIS</i>.
+ * Morgan Kaufmann, San Francisco, 2002.
+ * <p>
+ * This class is thread-safe. Building the tree is synchronized,
+ * and querying is stateless.
+ *
+ * @version 1.7
+ */
+public class STRtree extends AbstractSTRtree
+implements SpatialIndex, Serializable
+{
+
+ private static final class STRtreeNode extends AbstractNode
+ {
+ private STRtreeNode(int level)
+ {
+ super(level);
+ }
+
+ protected Object computeBounds() {
+ Envelope bounds = null;
+ for (Iterator i = getChildBoundables().iterator(); i.hasNext(); ) {
+ Boundable childBoundable = (Boundable) i.next();
+ if (bounds == null) {
+ bounds = new Envelope((Envelope)childBoundable.getBounds());
+ }
+ else {
+ bounds.expandToInclude((Envelope)childBoundable.getBounds());
+ }
+ }
+ return bounds;
+ }
+ }
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 259274702368956900L;
+
+ private static Comparator xComparator =
+ new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return compareDoubles(
+ centreX((Envelope)((Boundable)o1).getBounds()),
+ centreX((Envelope)((Boundable)o2).getBounds()));
+ }
+ };
+ private static Comparator yComparator =
+ new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return compareDoubles(
+ centreY((Envelope)((Boundable)o1).getBounds()),
+ centreY((Envelope)((Boundable)o2).getBounds()));
+ }
+ };
+
+ private static double centreX(Envelope e) {
+ return avg(e.getMinX(), e.getMaxX());
+ }
+
+ private static double centreY(Envelope e) {
+ return avg(e.getMinY(), e.getMaxY());
+ }
+
+ private static double avg(double a, double b) { return (a + b) / 2d; }
+
+ private static IntersectsOp intersectsOp = new IntersectsOp() {
+ public boolean intersects(Object aBounds, Object bBounds) {
+ return ((Envelope)aBounds).intersects((Envelope)bBounds);
+ }
+ };
+
+ /**
+ * Creates the parent level for the given child level. First, orders the items
+ * by the x-values of the midpoints, and groups them into vertical slices.
+ * For each slice, orders the items by the y-values of the midpoints, and
+ * group them into runs of size M (the node capacity). For each run, creates
+ * a new (parent) node.
+ */
+ protected List createParentBoundables(List childBoundables, int newLevel) {
+ Assert.isTrue(!childBoundables.isEmpty());
+ int minLeafCount = (int) Math.ceil((childBoundables.size() / (double) getNodeCapacity()));
+ ArrayList sortedChildBoundables = new ArrayList(childBoundables);
+ Collections.sort(sortedChildBoundables, xComparator);
+ List[] verticalSlices = verticalSlices(sortedChildBoundables,
+ (int) Math.ceil(Math.sqrt(minLeafCount)));
+ return createParentBoundablesFromVerticalSlices(verticalSlices, newLevel);
+ }
+
+ private List createParentBoundablesFromVerticalSlices(List[] verticalSlices, int newLevel) {
+ Assert.isTrue(verticalSlices.length > 0);
+ List parentBoundables = new ArrayList();
+ for (int i = 0; i < verticalSlices.length; i++) {
+ parentBoundables.addAll(
+ createParentBoundablesFromVerticalSlice(verticalSlices[i], newLevel));
+ }
+ return parentBoundables;
+ }
+
+ protected List createParentBoundablesFromVerticalSlice(List childBoundables, int newLevel) {
+ return super.createParentBoundables(childBoundables, newLevel);
+ }
+
+ /**
+ * @param childBoundables Must be sorted by the x-value of the envelope midpoints
+ */
+ protected List[] verticalSlices(List childBoundables, int sliceCount) {
+ int sliceCapacity = (int) Math.ceil(childBoundables.size() / (double) sliceCount);
+ List[] slices = new List[sliceCount];
+ Iterator i = childBoundables.iterator();
+ for (int j = 0; j < sliceCount; j++) {
+ slices[j] = new ArrayList();
+ int boundablesAddedToSlice = 0;
+ while (i.hasNext() && boundablesAddedToSlice < sliceCapacity) {
+ Boundable childBoundable = (Boundable) i.next();
+ slices[j].add(childBoundable);
+ boundablesAddedToSlice++;
+ }
+ }
+ return slices;
+ }
+
+ private static final int DEFAULT_NODE_CAPACITY = 10;
+
+ /**
+ * Constructs an STRtree with the default node capacity.
+ */
+ public STRtree()
+ {
+ this(DEFAULT_NODE_CAPACITY);
+ }
+
+ /**
+ * Constructs an STRtree with the given maximum number of child nodes that
+ * a node may have.
+ * <p>
+ * The minimum recommended capacity setting is 4.
+ *
+ */
+ public STRtree(int nodeCapacity) {
+ super(nodeCapacity);
+ }
+
+ protected AbstractNode createNode(int level) {
+ return new STRtreeNode(level);
+ }
+
+ protected IntersectsOp getIntersectsOp() {
+ return intersectsOp;
+ }
+
+ /**
+ * Inserts an item having the given bounds into the tree.
+ */
+ public void insert(Envelope itemEnv, Object item) {
+ if (itemEnv.isNull()) { return; }
+ super.insert(itemEnv, item);
+ }
+
+ /**
+ * Returns items whose bounds intersect the given envelope.
+ */
+ public List query(Envelope searchEnv) {
+ //Yes this method does something. It specifies that the bounds is an
+ //Envelope. super.query takes an Object, not an Envelope. [Jon Aquino 10/24/2003]
+ return super.query(searchEnv);
+ }
+
+ /**
+ * Returns items whose bounds intersect the given envelope.
+ */
+ public void query(Envelope searchEnv, ItemVisitor visitor) {
+ //Yes this method does something. It specifies that the bounds is an
+ //Envelope. super.query takes an Object, not an Envelope. [Jon Aquino 10/24/2003]
+ super.query(searchEnv, visitor);
+ }
+
+ /**
+ * Removes a single item from the tree.
+ *
+ * @param itemEnv the Envelope of the item to remove
+ * @param item the item to remove
+ * @return <code>true</code> if the item was found
+ */
+ public boolean remove(Envelope itemEnv, Object item) {
+ return super.remove(itemEnv, item);
+ }
+
+ /**
+ * Returns the number of items in the tree.
+ *
+ * @return the number of items in the tree
+ */
+ public int size()
+ {
+ return super.size();
+ }
+
+ /**
+ * Returns the number of items in the tree.
+ *
+ * @return the number of items in the tree
+ */
+ public int depth()
+ {
+ return super.depth();
+ }
+
+ protected Comparator getComparator() {
+ return yComparator;
+ }
+
+ /**
+ * Finds the two nearest items in the tree,
+ * using {@link ItemDistance} as the distance metric.
+ * A Branch-and-Bound tree traversal algorithm is used
+ * to provide an efficient search.
+ *
+ * @param itemDist a distance metric applicable to the items in this tree
+ * @return the pair of the nearest items
+ */
+ public Object[] nearestNeighbour(ItemDistance itemDist)
+ {
+ BoundablePair bp = new BoundablePair(this.getRoot(), this.getRoot(), itemDist);
+ return nearestNeighbour(bp);
+ }
+ /**
+ * Finds k items in this tree which are the top k nearest neighbors to the given {@code item},
+ * using {@code itemDist} as the distance metric.
+ * A Branch-and-Bound tree traversal algorithm is used
+ * to provide an efficient search.
+ * This method implements the KNN algorithm described in the following paper:
+ * <p>
+ * Roussopoulos, Nick, Stephen Kelley, and Frédéric Vincent. "Nearest neighbor queries."
+ * ACM sigmod record. Vol. 24. No. 2. ACM, 1995.
+ * <p>
+ * The query {@code item} does <b>not</b> have to be
+ * contained in the tree, but it does
+ * have to be compatible with the {@code itemDist}
+ * distance metric.
+ *
+ * @param env the envelope of the query item
+ * @param item the item to find the nearest neighbour of
+ * @param itemDist a distance metric applicable to the items in this tree and the query item
+ * @param k the K nearest items in kNearestNeighbour
+ * @return the K nearest items in this tree
+ */
+ public Object[] nearestNeighbour(Envelope env, Object item, ItemDistance itemDist,int k)
+ {
+ Boundable bnd = new ItemBoundable(env, item);
+ BoundablePair bp = new BoundablePair(this.getRoot(), bnd, itemDist);
+ return nearestNeighbour(bp,k);
+ }
+ /**
+ * Finds the item in this tree which is nearest to the given {@link Object},
+ * using {@link ItemDistance} as the distance metric.
+ * A Branch-and-Bound tree traversal algorithm is used
+ * to provide an efficient search.
+ * <p>
+ * The query <tt>object</tt> does <b>not</b> have to be
+ * contained in the tree, but it does
+ * have to be compatible with the <tt>itemDist</tt>
+ * distance metric.
+ *
+ * @param env the envelope of the query item
+ * @param item the item to find the nearest neighbour of
+ * @param itemDist a distance metric applicable to the items in this tree and the query item
+ * @return the nearest item in this tree
+ */
+ public Object nearestNeighbour(Envelope env, Object item, ItemDistance itemDist)
+ {
+ Boundable bnd = new ItemBoundable(env, item);
+ BoundablePair bp = new BoundablePair(this.getRoot(), bnd, itemDist);
+ return nearestNeighbour(bp)[0];
+ }
+
+ /**
+ * Finds the two nearest items from this tree
+ * and another tree,
+ * using {@link ItemDistance} as the distance metric.
+ * A Branch-and-Bound tree traversal algorithm is used
+ * to provide an efficient search.
+ * The result value is a pair of items,
+ * the first from this tree and the second
+ * from the argument tree.
+ *
+ * @param tree another tree
+ * @param itemDist a distance metric applicable to the items in the trees
+ * @return the pair of the nearest items, one from each tree
+ */
+ public Object[] nearestNeighbour(STRtree tree, ItemDistance itemDist)
+ {
+ BoundablePair bp = new BoundablePair(this.getRoot(), tree.getRoot(), itemDist);
+ return nearestNeighbour(bp);
+ }
+
+ private Object[] nearestNeighbour(BoundablePair initBndPair)
+ {
+ return nearestNeighbour(initBndPair, Double.POSITIVE_INFINITY);
+ }
+ private Object[] nearestNeighbour(BoundablePair initBndPair, int k)
+ {
+ return nearestNeighbour(initBndPair, Double.POSITIVE_INFINITY,k);
+ }
+ private Object[] nearestNeighbour(BoundablePair initBndPair, double maxDistance)
+ {
+ double distanceLowerBound = maxDistance;
+ BoundablePair minPair = null;
+
+ // initialize internal structures
+ PriorityQueue priQ = new PriorityQueue();
+
+ // initialize queue
+ priQ.add(initBndPair);
+
+ while (! priQ.isEmpty() && distanceLowerBound > 0.0) {
+ // pop head of queue and expand one side of pair
+ BoundablePair bndPair = (BoundablePair) priQ.poll();
+ double currentDistance = bndPair.getDistance();
+
+ /**
+ * If the distance for the first node in the queue
+ * is >= the current minimum distance, all other nodes
+ * in the queue must also have a greater distance.
+ * So the current minDistance must be the true minimum,
+ * and we are done.
+ */
+ if (currentDistance >= distanceLowerBound)
+ break;
+
+ /**
+ * If the pair members are leaves
+ * then their distance is the exact lower bound.
+ * Update the distanceLowerBound to reflect this
+ * (which must be smaller, due to the test
+ * immediately prior to this).
+ */
+ if (bndPair.isLeaves()) {
+ // assert: currentDistance < minimumDistanceFound
+ distanceLowerBound = currentDistance;
+ minPair = bndPair;
+ }
+ else {
+ // testing - does allowing a tolerance improve speed?
+ // Ans: by only about 10% - not enough to matter
+ /*
+ double maxDist = bndPair.getMaximumDistance();
+ if (maxDist * .99 < lastComputedDistance)
+ return;
+ //*/
+
+ /**
+ * Otherwise, expand one side of the pair,
+ * (the choice of which side to expand is heuristically determined)
+ * and insert the new expanded pairs into the queue
+ */
+ bndPair.expandToQueue(priQ, distanceLowerBound);
+ }
+ }
+ // done - return items with min distance
+ return new Object[] {
+ ((ItemBoundable) minPair.getBoundable(0)).getItem(),
+ ((ItemBoundable) minPair.getBoundable(1)).getItem()
+ };
+ }
+ private Object[] nearestNeighbour(BoundablePair initBndPair, double maxDistance, int k)
+ {
+ double distanceLowerBound = maxDistance;
+
+ // initialize internal structures
+ PriorityQueue priQ = new PriorityQueue();
+
+ // initialize queue
+ priQ.add(initBndPair);
+
+ java.util.PriorityQueue<BoundablePair> kNearestNeighbors = new java.util.PriorityQueue<BoundablePair>(k, new BoundablePairDistanceComparator(false));
+
+ while (! priQ.isEmpty() && distanceLowerBound >= 0.0) {
+ // pop head of queue and expand one side of pair
+ BoundablePair bndPair = (BoundablePair) priQ.poll();
+ double currentDistance = bndPair.getDistance();
+
+
+ /**
+ * If the distance for the first node in the queue
+ * is >= the current maximum distance in the k queue , all other nodes
+ * in the queue must also have a greater distance.
+ * So the current minDistance must be the true minimum,
+ * and we are done.
+ */
+
+
+ if (currentDistance >= distanceLowerBound){
+ break;
+ }
+ /**
+ * If the pair members are leaves
+ * then their distance is the exact lower bound.
+ * Update the distanceLowerBound to reflect this
+ * (which must be smaller, due to the test
+ * immediately prior to this).
+ */
+ if (bndPair.isLeaves()) {
+ // assert: currentDistance < minimumDistanceFound
+
+ if(kNearestNeighbors.size()<k){
+ kNearestNeighbors.add(bndPair);
+ }
+ else
+ {
+
+ if(kNearestNeighbors.peek().getDistance()>currentDistance)
+ {
+ kNearestNeighbors.poll();
+ kNearestNeighbors.add(bndPair);
+ }
+ /*
+ * minDistance should be the farthest point in the K nearest neighbor queue.
+ */
+ distanceLowerBound = kNearestNeighbors.peek().getDistance();
+
+ }
+ }
+ else {
+ // testing - does allowing a tolerance improve speed?
+ // Ans: by only about 10% - not enough to matter
+ /*
+ double maxDist = bndPair.getMaximumDistance();
+ if (maxDist * .99 < lastComputedDistance)
+ return;
+ //*/
+
+ /**
+ * Otherwise, expand one side of the pair,
+ * (the choice of which side to expand is heuristically determined)
+ * and insert the new expanded pairs into the queue
+ */
+ bndPair.expandToQueue(priQ, distanceLowerBound);
+ }
+ }
+ // done - return items with min distance
+
+ return getItems(kNearestNeighbors);
+ }
+ private static Object[] getItems(java.util.PriorityQueue<BoundablePair> kNearestNeighbors)
+ {
+ /**
+ * Iterate the K Nearest Neighbour Queue and retrieve the item from each BoundablePair
+ * in this queue
+ */
+ Object[] items = new Object[kNearestNeighbors.size()];
+ Iterator<BoundablePair> resultIterator = kNearestNeighbors.iterator();
+ int count=0;
+ while(resultIterator.hasNext())
+ {
+ items[count]=((ItemBoundable)resultIterator.next().getBoundable(0)).getItem();
+ count++;
+ }
+ return items;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/package.html b/modules/core/src/main/java/org/locationtech/jts/index/strtree/package.html
new file mode 100644
index 0000000..16a836e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/package.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+Contains 2-D and 1-D versions of the Sort-Tile-Recursive (STR) tree, a query-only R-tree.
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineEvent.java b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineEvent.java
new file mode 100644
index 0000000..6b44bb7
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineEvent.java
@@ -0,0 +1,66 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.sweepline;
+
+/**
+ * @version 1.7
+ */
+public class SweepLineEvent
+ implements Comparable
+{
+ public static final int INSERT = 1;
+ public static final int DELETE = 2;
+
+ private double xValue;
+ private int eventType;
+ private SweepLineEvent insertEvent; // null if this is an INSERT event
+ private int deleteEventIndex;
+
+ SweepLineInterval sweepInt;
+ public SweepLineEvent(double x, SweepLineEvent insertEvent, SweepLineInterval sweepInt)
+ {
+ xValue = x;
+ this.insertEvent = insertEvent;
+ this.eventType = INSERT;
+ if (insertEvent != null)
+ eventType = DELETE;
+ this.sweepInt = sweepInt;
+ }
+
+ public boolean isInsert() { return insertEvent == null; }
+ public boolean isDelete() { return insertEvent != null; }
+ public SweepLineEvent getInsertEvent() { return insertEvent; }
+ public int getDeleteEventIndex() { return deleteEventIndex; }
+ public void setDeleteEventIndex(int deleteEventIndex) { this.deleteEventIndex = deleteEventIndex; }
+
+ SweepLineInterval getInterval() { return sweepInt; }
+
+ /**
+ * ProjectionEvents are ordered first by their x-value, and then by their eventType.
+ * It is important that Insert events are sorted before Delete events, so that
+ * items whose Insert and Delete events occur at the same x-value will be
+ * correctly handled.
+ */
+ public int compareTo(Object o) {
+ SweepLineEvent pe = (SweepLineEvent) o;
+ if (xValue < pe.xValue) return -1;
+ if (xValue > pe.xValue) return 1;
+ if (eventType < pe.eventType) return -1;
+ if (eventType > pe.eventType) return 1;
+ return 0;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineIndex.java b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineIndex.java
new file mode 100644
index 0000000..b26d225
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineIndex.java
@@ -0,0 +1,95 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.sweepline;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A sweepline implements a sorted index on a set of intervals.
+ * It is used to compute all overlaps between the interval in the index.
+ *
+ * @version 1.7
+ */
+public class SweepLineIndex {
+
+ List events = new ArrayList();
+ private boolean indexBuilt;
+ // statistics information
+ private int nOverlaps;
+
+ public SweepLineIndex() {
+ }
+
+ public void add(SweepLineInterval sweepInt)
+ {
+ SweepLineEvent insertEvent = new SweepLineEvent(sweepInt.getMin(), null, sweepInt);
+ events.add(insertEvent);
+ events.add(new SweepLineEvent(sweepInt.getMax(), insertEvent, sweepInt));
+ }
+
+ /**
+ * Because Delete Events have a link to their corresponding Insert event,
+ * it is possible to compute exactly the range of events which must be
+ * compared to a given Insert event object.
+ */
+ private void buildIndex()
+ {
+ if (indexBuilt) return;
+ Collections.sort(events);
+ for (int i = 0; i < events.size(); i++ )
+ {
+ SweepLineEvent ev = (SweepLineEvent) events.get(i);
+ if (ev.isDelete()) {
+ ev.getInsertEvent().setDeleteEventIndex(i);
+ }
+ }
+ indexBuilt = true;
+ }
+
+ public void computeOverlaps(SweepLineOverlapAction action)
+ {
+ nOverlaps = 0;
+ buildIndex();
+
+ for (int i = 0; i < events.size(); i++ )
+ {
+ SweepLineEvent ev = (SweepLineEvent) events.get(i);
+ if (ev.isInsert()) {
+ processOverlaps(i, ev.getDeleteEventIndex(), ev.getInterval(), action);
+ }
+ }
+ }
+
+ private void processOverlaps(int start, int end, SweepLineInterval s0, SweepLineOverlapAction action)
+ {
+ /**
+ * Since we might need to test for self-intersections,
+ * include current insert event object in list of event objects to test.
+ * Last index can be skipped, because it must be a Delete event.
+ */
+ for (int i = start; i < end; i++ ) {
+ SweepLineEvent ev = (SweepLineEvent) events.get(i);
+ if (ev.isInsert()) {
+ SweepLineInterval s1 = ev.getInterval();
+ action.overlap(s0, s1);
+ nOverlaps++;
+ }
+ }
+
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineInterval.java b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineInterval.java
new file mode 100644
index 0000000..bb1215b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineInterval.java
@@ -0,0 +1,40 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.sweepline;
+
+/**
+ * @version 1.7
+ */
+public class SweepLineInterval {
+
+ private double min, max;
+ private Object item;
+
+ public SweepLineInterval(double min, double max)
+ {
+ this(min, max, null);
+ }
+
+ public SweepLineInterval(double min, double max, Object item)
+ {
+ this.min = min < max ? min : max;
+ this.max = max > min ? max : min;
+ this.item = item;
+ }
+
+ public double getMin() { return min; }
+ public double getMax() { return max; }
+ public Object getItem() { return item; }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineOverlapAction.java b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineOverlapAction.java
new file mode 100644
index 0000000..85621bd
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/SweepLineOverlapAction.java
@@ -0,0 +1,25 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.sweepline;
+
+/**
+ * An action taken when a {@link SweepLineIndex} detects that two
+ * {@link SweepLineInterval}s overlap
+ *
+ * @version 1.7
+ */
+public interface SweepLineOverlapAction {
+
+ void overlap(SweepLineInterval s0, SweepLineInterval s1);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/index/sweepline/package.html b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/package.html
new file mode 100644
index 0000000..381c0f5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/index/sweepline/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes which implement a sweepline algorithm for scanning geometric data structures.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/ByteArrayInStream.java b/modules/core/src/main/java/org/locationtech/jts/io/ByteArrayInStream.java
new file mode 100644
index 0000000..a5dda2e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/ByteArrayInStream.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+/**
+ * Allows an array of bytes to be used as an {@link InStream}.
+ * To optimize memory usage, instances can be reused
+ * with different byte arrays.
+ */
+public class ByteArrayInStream
+ implements InStream
+{
+ /*
+ * Implementation improvement suggested by Andrea Aime - Dec 15 2007
+ */
+
+ private byte[] buffer;
+ private int position;
+
+ /**
+ * Creates a new stream based on the given buffer.
+ *
+ * @param buffer the bytes to read
+ */
+ public ByteArrayInStream(final byte[] buffer) {
+ setBytes(buffer);
+ }
+
+ /**
+ * Sets this stream to read from the given buffer
+ *
+ * @param buffer the bytes to read
+ */
+ public void setBytes(final byte[] buffer) {
+ this.buffer = buffer;
+ this.position = 0;
+ }
+
+ /**
+ * Reads up to <tt>buf.length</tt> bytes from the stream
+ * into the given byte buffer.
+ *
+ * @param buf the buffer to place the read bytes into
+ */
+ public void read(final byte[] buf) {
+ int numToRead = buf.length;
+ // don't try and copy past the end of the input
+ if ((position + numToRead) > buffer.length) {
+ numToRead = buffer.length - position;
+ System.arraycopy(buffer, position, buf, 0, numToRead);
+ // zero out the unread bytes
+ for (int i = numToRead; i < buf.length; i++) {
+ buf[i] = 0;
+ }
+ }
+ else {
+ System.arraycopy(buffer, position, buf, 0, numToRead);
+ }
+ position += numToRead;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/ByteOrderDataInStream.java b/modules/core/src/main/java/org/locationtech/jts/io/ByteOrderDataInStream.java
new file mode 100644
index 0000000..32d4393
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/ByteOrderDataInStream.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+
+/**
+ * Allows reading a stream of Java primitive datatypes from an underlying
+ * {@link InStream},
+ * with the representation being in either common byte ordering.
+ */
+public class ByteOrderDataInStream
+{
+ private int byteOrder = ByteOrderValues.BIG_ENDIAN;
+ private InStream stream;
+ // buffers to hold primitive datatypes
+ private byte[] buf1 = new byte[1];
+ private byte[] buf4 = new byte[4];
+ private byte[] buf8 = new byte[8];
+
+ public ByteOrderDataInStream()
+ {
+ this.stream = null;
+ }
+
+ public ByteOrderDataInStream(InStream stream)
+ {
+ this.stream = stream;
+ }
+
+ /**
+ * Allows a single ByteOrderDataInStream to be reused
+ * on multiple InStreams.
+ *
+ * @param stream
+ */
+ public void setInStream(InStream stream)
+ {
+ this.stream = stream;
+ }
+ public void setOrder(int byteOrder)
+ {
+ this.byteOrder = byteOrder;
+ }
+
+ /**
+ * Reads a byte value
+ *
+ * @return the byte read
+ */
+ public byte readByte()
+ throws IOException
+ {
+ stream.read(buf1);
+ return buf1[0];
+ }
+
+ public int readInt()
+ throws IOException
+ {
+ stream.read(buf4);
+ return ByteOrderValues.getInt(buf4, byteOrder);
+ }
+ public long readLong()
+ throws IOException
+ {
+ stream.read(buf8);
+ return ByteOrderValues.getLong(buf8, byteOrder);
+ }
+
+ public double readDouble()
+ throws IOException
+ {
+ stream.read(buf8);
+ return ByteOrderValues.getDouble(buf8, byteOrder);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/ByteOrderValues.java b/modules/core/src/main/java/org/locationtech/jts/io/ByteOrderValues.java
new file mode 100644
index 0000000..9e786e8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/ByteOrderValues.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+/**
+ * Methods to read and write primitive Java datatypes from/to byte
+ * sequences, allowing the byte order to be specified
+ * <p>
+ * Similar to the standard Java <code>ByteBuffer</code> class.
+ */
+public class ByteOrderValues
+{
+ public static final int BIG_ENDIAN = 1;
+ public static final int LITTLE_ENDIAN = 2;
+
+ public static int getInt(byte[] buf, int byteOrder)
+ {
+ if (byteOrder == BIG_ENDIAN) {
+ return ( (buf[0] & 0xff) << 24)
+ | ( (buf[1] & 0xff) << 16)
+ | ( (buf[2] & 0xff) << 8)
+ | ( (buf[3] & 0xff) );
+ }
+ else {// LITTLE_ENDIAN
+ return ( (buf[3] & 0xff) << 24)
+ | ( (buf[2] & 0xff) << 16)
+ | ( (buf[1] & 0xff) << 8)
+ | ( (buf[0] & 0xff) );
+ }
+ }
+
+ public static void putInt(int intValue, byte[] buf, int byteOrder)
+ {
+ if (byteOrder == BIG_ENDIAN) {
+ buf[0] = (byte)(intValue >> 24);
+ buf[1] = (byte)(intValue >> 16);
+ buf[2] = (byte)(intValue >> 8);
+ buf[3] = (byte) intValue;
+ }
+ else {// LITTLE_ENDIAN
+ buf[0] = (byte) intValue;
+ buf[1] = (byte)(intValue >> 8);
+ buf[2] = (byte)(intValue >> 16);
+ buf[3] = (byte)(intValue >> 24);
+ }
+ }
+ public static long getLong(byte[] buf, int byteOrder)
+ {
+ if (byteOrder == BIG_ENDIAN) {
+ return
+ (long) (buf[0] & 0xff) << 56
+ | (long) (buf[1] & 0xff) << 48
+ | (long) (buf[2] & 0xff) << 40
+ | (long) (buf[3] & 0xff) << 32
+ | (long) (buf[4] & 0xff) << 24
+ | (long) (buf[5] & 0xff) << 16
+ | (long) (buf[6] & 0xff) << 8
+ | (long) (buf[7] & 0xff);
+ }
+ else {// LITTLE_ENDIAN
+ return
+ (long) (buf[7] & 0xff) << 56
+ | (long) (buf[6] & 0xff) << 48
+ | (long) (buf[5] & 0xff) << 40
+ | (long) (buf[4] & 0xff) << 32
+ | (long) (buf[3] & 0xff) << 24
+ | (long) (buf[2] & 0xff) << 16
+ | (long) (buf[1] & 0xff) << 8
+ | (long) (buf[0] & 0xff);
+ }
+ }
+
+ public static void putLong(long longValue, byte[] buf, int byteOrder)
+ {
+ if (byteOrder == BIG_ENDIAN) {
+ buf[0] = (byte)(longValue >> 56);
+ buf[1] = (byte)(longValue >> 48);
+ buf[2] = (byte)(longValue >> 40);
+ buf[3] = (byte)(longValue >> 32);
+ buf[4] = (byte)(longValue >> 24);
+ buf[5] = (byte)(longValue >> 16);
+ buf[6] = (byte)(longValue >> 8);
+ buf[7] = (byte) longValue;
+ }
+ else { // LITTLE_ENDIAN
+ buf[0] = (byte) longValue;
+ buf[1] = (byte)(longValue >> 8);
+ buf[2] = (byte)(longValue >> 16);
+ buf[3] = (byte)(longValue >> 24);
+ buf[4] = (byte)(longValue >> 32);
+ buf[5] = (byte)(longValue >> 40);
+ buf[6] = (byte)(longValue >> 48);
+ buf[7] = (byte)(longValue >> 56);
+ }
+ }
+
+ public static double getDouble(byte[] buf, int byteOrder)
+ {
+ long longVal = getLong(buf, byteOrder);
+ return Double.longBitsToDouble(longVal);
+ }
+
+ public static void putDouble(double doubleValue, byte[] buf, int byteOrder)
+ {
+ long longVal = Double.doubleToLongBits(doubleValue);
+ putLong(longVal, buf, byteOrder);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/InStream.java b/modules/core/src/main/java/org/locationtech/jts/io/InStream.java
new file mode 100644
index 0000000..7119cf4
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/InStream.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+
+/**
+ * A interface for classes providing an input stream of bytes.
+ * This interface is similar to the Java <code>InputStream</code>,
+ * but with a narrower interface to make it easier to implement.
+ *
+ */
+public interface InStream
+{
+ /**
+ * Reads <code>buf.length</code> bytes from the input stream
+ * and stores them in the supplied buffer.
+ *
+ * @param buf the buffer to receive the bytes
+ *
+ * @throws IOException if an I/O error occurs
+ */
+ void read(byte[] buf) throws IOException;
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/InputStreamInStream.java b/modules/core/src/main/java/org/locationtech/jts/io/InputStreamInStream.java
new file mode 100644
index 0000000..f968a89
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/InputStreamInStream.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * An adapter to allow an {@link InputStream} to be used as an {@link InStream}
+ */
+public class InputStreamInStream
+ implements InStream
+{
+ private InputStream is;
+
+ public InputStreamInStream(InputStream is)
+ {
+ this.is = is;
+ }
+
+ public void read(byte[] buf) throws IOException
+ {
+ is.read(buf);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/OutStream.java b/modules/core/src/main/java/org/locationtech/jts/io/OutStream.java
new file mode 100644
index 0000000..1b8f902
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/OutStream.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+
+/**
+ * A interface for classes providing an output stream of bytes.
+ * This interface is similar to the Java <code>OutputStream</code>,
+ * but with a narrower interface to make it easier to implement.
+ */
+public interface OutStream
+{
+ void write(byte[] buf, int len) throws IOException;
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/OutputStreamOutStream.java b/modules/core/src/main/java/org/locationtech/jts/io/OutputStreamOutStream.java
new file mode 100644
index 0000000..0babfbc
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/OutputStreamOutStream.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * An adapter to allow an {@link OutputStream} to be used as an {@link OutStream}
+ */
+public class OutputStreamOutStream
+ implements OutStream
+{
+ private OutputStream os;
+
+ public OutputStreamOutStream(OutputStream os)
+ {
+ this.os = os;
+ }
+ public void write(byte[] buf, int len) throws IOException
+ {
+ os.write(buf, 0, len);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/ParseException.java b/modules/core/src/main/java/org/locationtech/jts/io/ParseException.java
new file mode 100644
index 0000000..b01998e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/ParseException.java
@@ -0,0 +1,54 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+/**
+ * Thrown by a <code>WKTReader</code> when a parsing problem occurs.
+ *
+ *@version 1.7
+ */
+public class ParseException extends Exception {
+
+ /**
+ * Creates a <code>ParseException</code> with the given detail message.
+ *
+ *@param message a description of this <code>ParseException</code>
+ */
+ public ParseException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a <code>ParseException</code> with <code>e</code>s detail message.
+ *
+ *@param e an exception that occurred while a <code>WKTReader</code> was
+ * parsing a Well-known Text string
+ */
+ public ParseException(Exception e) {
+ this(e.toString(), e);
+ }
+
+ /**
+ * Creates a <code>ParseException</code> with <code>e</code>s detail message.
+ *
+ *@param message a description of this <code>ParseException</code>
+ *@param e a throwable that occurred while a com.vividsolutions.jts.io reader was
+ * parsing a string representation
+ */
+ public ParseException(String message, Throwable e) {
+ super(message, e);
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/WKBConstants.java b/modules/core/src/main/java/org/locationtech/jts/io/WKBConstants.java
new file mode 100644
index 0000000..e1489cb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/WKBConstants.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+/**
+ * Constant values used by the WKB format
+ */
+public interface WKBConstants {
+ int wkbXDR = 0;
+ int wkbNDR = 1;
+
+ int wkbPoint = 1;
+ int wkbLineString = 2;
+ int wkbPolygon = 3;
+ int wkbMultiPoint = 4;
+ int wkbMultiLineString = 5;
+ int wkbMultiPolygon = 6;
+ int wkbGeometryCollection = 7;
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/WKBHexFileReader.java b/modules/core/src/main/java/org/locationtech/jts/io/WKBHexFileReader.java
new file mode 100644
index 0000000..dd9a328
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/WKBHexFileReader.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.io;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StreamTokenizer;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Reads a sequence of {@link Geometry}s in WKBHex format
+ * from a text file.
+ * Each WKBHex geometry must be on a single line
+ * The geometries in the file may be separated by any amount
+ * of whitespace and newlines.
+ *
+ * @author Martin Davis
+ *
+ */
+public class WKBHexFileReader
+{
+ private File file = null;
+ private Reader reader;
+ private WKBReader wkbReader;
+ private int count = 0;
+ private int limit = -1;
+ private int offset = 0;
+
+ /**
+ * Creates a new <tt>WKBHexFileReader</tt> given the <tt>File</tt> to read from
+ * and a <tt>WKTReader</tt> to use to parse the geometries.
+ *
+ * @param file the <tt>File</tt> to read from
+ * @param wkbReader the geometry reader to use
+ */
+ public WKBHexFileReader(File file, WKBReader wkbReader)
+ {
+ this.file = file;
+ this.wkbReader = wkbReader;
+ }
+
+ /**
+ * Creates a new <tt>WKBHexFileReader</tt>, given the name of the file to read from.
+ *
+ * @param filename the name of the file to read from
+ * @param wkbReader the geometry reader to use
+ */
+ public WKBHexFileReader(String filename, WKBReader wkbReader)
+ {
+ this(new File(filename), wkbReader);
+ }
+
+ /**
+ * Creates a new <tt>WKBHexFileReader</tt>, given a {@link Reader} to read from.
+ *
+ * @param reader the reader to read from
+ * @param wkbReader the geometry reader to use
+ */
+ public WKBHexFileReader(Reader reader, WKBReader wkbReader)
+ {
+ this.reader = reader;
+ this.wkbReader = wkbReader;
+ }
+
+ /**
+ * Sets the maximum number of geometries to read.
+ *
+ * @param limit the maximum number of geometries to read
+ */
+ public void setLimit(int limit)
+ {
+ this.limit = limit;
+ }
+
+ /**
+ * Sets the number of geometries to skip before storing.
+ *
+ * @param offset the number of geometries to skip
+ */
+ public void setOffset(int offset)
+ {
+ this.offset = offset;
+ }
+
+ /**
+ * Reads a sequence of geometries.
+ * If an offset is specified, geometries read up to the offset count are skipped.
+ * If a limit is specified, no more than <tt>limit</tt> geometries are read.
+ *
+ * @return the list of geometries read
+ * @throws IOException if an I/O exception was encountered
+ * @throws ParseException if an error occurred reading a geometry
+ */
+ public List read()
+ throws IOException, ParseException
+ {
+ // do this here so that constructors don't throw exceptions
+ if (file != null)
+ reader = new FileReader(file);
+
+ count = 0;
+ try {
+ BufferedReader bufferedReader = new BufferedReader(reader);
+ try {
+ return read(bufferedReader);
+ } finally {
+ bufferedReader.close();
+ }
+ } finally {
+ reader.close();
+ }
+ }
+
+ private List read(BufferedReader bufferedReader) throws IOException,
+ ParseException {
+ List geoms = new ArrayList();
+ while (! isAtEndOfFile(bufferedReader) && ! isAtLimit(geoms)) {
+ String line = bufferedReader.readLine().trim();
+ if (line.length() == 0)
+ continue;
+ Geometry g = wkbReader.read(WKBReader.hexToBytes(line));
+ if (count >= offset)
+ geoms.add(g);
+ count++;
+ }
+ return geoms;
+ }
+
+ private boolean isAtLimit(List geoms)
+ {
+ if (limit < 0) return false;
+ if (geoms.size() < limit) return false;
+ return true;
+ }
+
+ private static final int MAX_LOOKAHEAD = 1000;
+
+ /**
+ * Tests if reader is at EOF.
+ */
+ private boolean isAtEndOfFile(BufferedReader bufferedReader)
+ throws IOException
+ {
+ bufferedReader.mark(MAX_LOOKAHEAD);
+
+ StreamTokenizer tokenizer = new StreamTokenizer(bufferedReader);
+ int type = tokenizer.nextToken();
+
+ if (type == StreamTokenizer.TT_EOF) {
+ return true;
+ }
+ bufferedReader.reset();
+ return false;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/WKBReader.java b/modules/core/src/main/java/org/locationtech/jts/io/WKBReader.java
new file mode 100644
index 0000000..32708c2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/WKBReader.java
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
+import org.locationtech.jts.geom.CoordinateSequences;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+
+/**
+ * Reads a {@link Geometry}from a byte stream in Well-Known Binary format.
+ * Supports use of an {@link InStream}, which allows easy use
+ * with arbitrary byte stream sources.
+ * <p>
+ * This class reads the format describe in {@link WKBWriter}.
+ * It also partially handles
+ * the <b>Extended WKB</b> format used by PostGIS,
+ * by parsing and storing SRID values.
+ * The reader repairs structurally-invalid input
+ * (specifically, LineStrings and LinearRings which contain
+ * too few points have vertices added,
+ * and non-closed rings are closed).
+ * <p>
+ * This class is designed to support reuse of a single instance to read multiple
+ * geometries. This class is not thread-safe; each thread should create its own
+ * instance.
+ * <p>
+ * As of version 1.15, the reader can read geometries following OGC 06-103r4
+ * speification used by Spatialite/Geopackage.
+ * <p>
+ * The difference between PostGIS EWKB format and the new OGC specification is
+ * that Z and M coordinates are detected with a bit mask on the higher byte in
+ * the former case (0x80 for Z and 0x40 for M) while new OGC specification use
+ * specif int ranges for 2D gemetries, Z geometries (2D code+1000), M geometries
+ * (2D code+2000) and ZM geometries (2D code+3000).
+ * <p>
+ * Note that the {@link WKBWriter} is not changed and still write PostGIS WKB
+ * geometries
+ * @see WKBWriter for a formal format specification
+ */
+public class WKBReader
+{
+ /**
+ * Converts a hexadecimal string to a byte array.
+ * The hexadecimal digit symbols are case-insensitive.
+ *
+ * @param hex a string containing hex digits
+ * @return an array of bytes with the value of the hex string
+ */
+ public static byte[] hexToBytes(String hex)
+ {
+ int byteLen = hex.length() / 2;
+ byte[] bytes = new byte[byteLen];
+
+ for (int i = 0; i < hex.length() / 2; i++) {
+ int i2 = 2 * i;
+ if (i2 + 1 > hex.length())
+ throw new IllegalArgumentException("Hex string has odd length");
+
+ int nib1 = hexToInt(hex.charAt(i2));
+ int nib0 = hexToInt(hex.charAt(i2 + 1));
+ byte b = (byte) ((nib1 << 4) + (byte) nib0);
+ bytes[i] = b;
+ }
+ return bytes;
+ }
+
+ private static int hexToInt(char hex)
+ {
+ int nib = Character.digit(hex, 16);
+ if (nib < 0)
+ throw new IllegalArgumentException("Invalid hex digit: '" + hex + "'");
+ return nib;
+ }
+
+ private static final String INVALID_GEOM_TYPE_MSG
+ = "Invalid geometry type encountered in ";
+
+ private GeometryFactory factory;
+ private CoordinateSequenceFactory csFactory;
+ private PrecisionModel precisionModel;
+ // default dimension - will be set on read
+ private int inputDimension = 2;
+ private boolean hasSRID = false;
+ private int SRID = 0;
+ /**
+ * true if structurally invalid input should be reported rather than repaired.
+ * At some point this could be made client-controllable.
+ */
+ private boolean isStrict = false;
+ private ByteOrderDataInStream dis = new ByteOrderDataInStream();
+ private double[] ordValues;
+
+ public WKBReader() {
+ this(new GeometryFactory());
+ }
+
+ public WKBReader(GeometryFactory geometryFactory) {
+ this.factory = geometryFactory;
+ precisionModel = factory.getPrecisionModel();
+ csFactory = factory.getCoordinateSequenceFactory();
+ }
+
+ /**
+ * Reads a single {@link Geometry} in WKB format from a byte array.
+ *
+ * @param bytes the byte array to read from
+ * @return the geometry read
+ * @throws ParseException if the WKB is ill-formed
+ */
+ public Geometry read(byte[] bytes) throws ParseException
+ {
+ // possibly reuse the ByteArrayInStream?
+ // don't throw IOExceptions, since we are not doing any I/O
+ try {
+ return read(new ByteArrayInStream(bytes));
+ }
+ catch (IOException ex) {
+ throw new RuntimeException("Unexpected IOException caught: " + ex.getMessage());
+ }
+ }
+
+ /**
+ * Reads a {@link Geometry} in binary WKB format from an {@link InStream}.
+ *
+ * @param is the stream to read from
+ * @return the Geometry read
+ * @throws IOException if the underlying stream creates an error
+ * @throws ParseException if the WKB is ill-formed
+ */
+ public Geometry read(InStream is)
+ throws IOException, ParseException
+ {
+ dis.setInStream(is);
+ Geometry g = readGeometry();
+ return g;
+ }
+
+ private Geometry readGeometry()
+ throws IOException, ParseException
+ {
+
+ // determine byte order
+ byte byteOrderWKB = dis.readByte();
+
+ // always set byte order, since it may change from geometry to geometry
+ if(byteOrderWKB == WKBConstants.wkbNDR)
+ {
+ dis.setOrder(ByteOrderValues.LITTLE_ENDIAN);
+ }
+ else if(byteOrderWKB == WKBConstants.wkbXDR)
+ {
+ dis.setOrder(ByteOrderValues.BIG_ENDIAN);
+ }
+ else if(isStrict)
+ {
+ throw new ParseException("Unknown geometry byte order (not NDR or XDR): " + byteOrderWKB);
+ }
+ //if not strict and not XDR or NDR, then we just use the dis default set at the
+ //start of the geometry (if a multi-geometry). This allows WBKReader to work
+ //with Spatialite native BLOB WKB, as well as other WKB variants that might just
+ //specify endian-ness at the start of the multigeometry.
+
+
+ int typeInt = dis.readInt();
+ // Adds %1000 to make it compatible with OGC 06-103r4
+ int geometryType = (typeInt & 0xffff)%1000;
+
+ // handle 3D and 4D WKB geometries
+ // geometries with Z coordinates have the 0x80 flag (postgis EWKB)
+ // or are in the 1000 range (Z) or in the 3000 range (ZM) of geometry type (OGC 06-103r4)
+ boolean hasZ = ((typeInt & 0x80000000) != 0 || (typeInt & 0xffff)/1000 == 1 || (typeInt & 0xffff)/1000 == 3);
+ // geometries with M coordinates have the 0x40 flag (postgis EWKB)
+ // or are in the 1000 range (M) or in the 3000 range (ZM) of geometry type (OGC 06-103r4)
+ boolean hasM = ((typeInt & 0x40000000) != 0 || (typeInt & 0xffff)/1000 == 2 || (typeInt & 0xffff)/1000 == 3);
+ //System.out.println(typeInt + " - " + geometryType + " - hasZ:" + hasZ);
+ inputDimension = 2 + (hasZ?1:0) + (hasM?1:0);
+
+ // determine if SRIDs are present
+ hasSRID = (typeInt & 0x20000000) != 0;
+ int SRID = 0;
+ if (hasSRID) {
+ SRID = dis.readInt();
+ }
+
+ // only allocate ordValues buffer if necessary
+ if (ordValues == null || ordValues.length < inputDimension)
+ ordValues = new double[inputDimension];
+
+ Geometry geom = null;
+ switch (geometryType) {
+ case WKBConstants.wkbPoint :
+ geom = readPoint();
+ break;
+ case WKBConstants.wkbLineString :
+ geom = readLineString();
+ break;
+ case WKBConstants.wkbPolygon :
+ geom = readPolygon();
+ break;
+ case WKBConstants.wkbMultiPoint :
+ geom = readMultiPoint();
+ break;
+ case WKBConstants.wkbMultiLineString :
+ geom = readMultiLineString();
+ break;
+ case WKBConstants.wkbMultiPolygon :
+ geom = readMultiPolygon();
+ break;
+ case WKBConstants.wkbGeometryCollection :
+ geom = readGeometryCollection();
+ break;
+ default:
+ throw new ParseException("Unknown WKB type " + geometryType);
+ }
+ setSRID(geom, SRID);
+ return geom;
+ }
+
+ /**
+ * Sets the SRID, if it was specified in the WKB
+ *
+ * @param g the geometry to update
+ * @return the geometry with an updated SRID value, if required
+ */
+ private Geometry setSRID(Geometry g, int SRID)
+ {
+ if (SRID != 0)
+ g.setSRID(SRID);
+ return g;
+ }
+
+ private Point readPoint() throws IOException
+ {
+ CoordinateSequence pts = readCoordinateSequence(1);
+ return factory.createPoint(pts);
+ }
+
+ private LineString readLineString() throws IOException
+ {
+ int size = dis.readInt();
+ CoordinateSequence pts = readCoordinateSequenceLineString(size);
+ return factory.createLineString(pts);
+ }
+
+ private LinearRing readLinearRing() throws IOException
+ {
+ int size = dis.readInt();
+ CoordinateSequence pts = readCoordinateSequenceRing(size);
+ return factory.createLinearRing(pts);
+ }
+
+ private Polygon readPolygon() throws IOException
+ {
+ int numRings = dis.readInt();
+ LinearRing[] holes = null;
+ if (numRings > 1)
+ holes = new LinearRing[numRings - 1];
+
+ LinearRing shell = readLinearRing();
+ for (int i = 0; i < numRings - 1; i++) {
+ holes[i] = readLinearRing();
+ }
+ return factory.createPolygon(shell, holes);
+ }
+
+ private MultiPoint readMultiPoint() throws IOException, ParseException
+ {
+ int numGeom = dis.readInt();
+ Point[] geoms = new Point[numGeom];
+ for (int i = 0; i < numGeom; i++) {
+ Geometry g = readGeometry();
+ if (! (g instanceof Point))
+ throw new ParseException(INVALID_GEOM_TYPE_MSG + "MultiPoint");
+ geoms[i] = (Point) g;
+ }
+ return factory.createMultiPoint(geoms);
+ }
+
+ private MultiLineString readMultiLineString() throws IOException, ParseException
+ {
+ int numGeom = dis.readInt();
+ LineString[] geoms = new LineString[numGeom];
+ for (int i = 0; i < numGeom; i++) {
+ Geometry g = readGeometry();
+ if (! (g instanceof LineString))
+ throw new ParseException(INVALID_GEOM_TYPE_MSG + "MultiLineString");
+ geoms[i] = (LineString) g;
+ }
+ return factory.createMultiLineString(geoms);
+ }
+
+ private MultiPolygon readMultiPolygon() throws IOException, ParseException
+ {
+ int numGeom = dis.readInt();
+ Polygon[] geoms = new Polygon[numGeom];
+
+ for (int i = 0; i < numGeom; i++) {
+ Geometry g = readGeometry();
+ if (! (g instanceof Polygon))
+ throw new ParseException(INVALID_GEOM_TYPE_MSG + "MultiPolygon");
+ geoms[i] = (Polygon) g;
+ }
+ return factory.createMultiPolygon(geoms);
+ }
+
+ private GeometryCollection readGeometryCollection() throws IOException, ParseException
+ {
+ int numGeom = dis.readInt();
+ Geometry[] geoms = new Geometry[numGeom];
+ for (int i = 0; i < numGeom; i++) {
+ geoms[i] = readGeometry();
+ }
+ return factory.createGeometryCollection(geoms);
+ }
+
+ private CoordinateSequence readCoordinateSequence(int size) throws IOException
+ {
+ CoordinateSequence seq = csFactory.create(size, inputDimension);
+ int targetDim = seq.getDimension();
+ if (targetDim > inputDimension)
+ targetDim = inputDimension;
+ for (int i = 0; i < size; i++) {
+ readCoordinate();
+ for (int j = 0; j < targetDim; j++) {
+ seq.setOrdinate(i, j, ordValues[j]);
+ }
+ }
+ return seq;
+ }
+
+ private CoordinateSequence readCoordinateSequenceLineString(int size) throws IOException
+ {
+ CoordinateSequence seq = readCoordinateSequence(size);
+ if (isStrict) return seq;
+ if (seq.size() == 0 || seq.size() >= 2) return seq;
+ return CoordinateSequences.extend(csFactory, seq, 2);
+ }
+
+ private CoordinateSequence readCoordinateSequenceRing(int size) throws IOException
+ {
+ CoordinateSequence seq = readCoordinateSequence(size);
+ if (isStrict) return seq;
+ if (CoordinateSequences.isRing(seq)) return seq;
+ return CoordinateSequences.ensureValidRing(csFactory, seq);
+ }
+
+ /**
+ * Reads a coordinate value with the specified dimensionality.
+ * Makes the X and Y ordinates precise according to the precision model
+ * in use.
+ */
+ private void readCoordinate() throws IOException
+ {
+ for (int i = 0; i < inputDimension; i++) {
+ if (i <= 1) {
+ ordValues[i] = precisionModel.makePrecise(dis.readDouble());
+ }
+ else {
+ ordValues[i] = dis.readDouble();
+ }
+
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/WKBWriter.java b/modules/core/src/main/java/org/locationtech/jts/io/WKBWriter.java
new file mode 100644
index 0000000..4d16ca8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/WKBWriter.java
@@ -0,0 +1,427 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Writes a {@link Geometry} into Well-Known Binary format.
+ * Supports use of an {@link OutStream}, which allows easy use
+ * with arbitrary byte stream sinks.
+ * <p>
+ * The WKB format is specified in the
+ * OGC <A HREF="http://www.opengis.org/techno/specs.htm"><i>Simple Features for SQL</i></a>
+ * specification.
+ * This implementation also supports the <b>Extended WKB</b>
+ * standard. Extended WKB allows writing 3-dimensional coordinates
+ * and including the geometry SRID value.
+ * The presence of 3D coordinates is signified
+ * by setting the high bit of the <tt>wkbType</tt> word.
+ * The presence of an SRID is signified
+ * by setting the third bit of the <tt>wkbType</tt> word.
+ * EWKB format is upward compatible with the original SFS WKB format.
+ * <p>
+ * Empty Points cannot be represented in WKB; an
+ * {@link IllegalArgumentException} will be thrown if one is
+ * written.
+ * <p>
+ * The WKB specification does not support representing {@link LinearRing}s;
+ * they will be written as {@link LineString}s.
+ * <p>
+ * This class is designed to support reuse of a single instance to read multiple
+ * geometries. This class is not thread-safe; each thread should create its own
+ * instance.
+ *
+ * <h3>Syntax</h3>
+ * The following syntax specification describes the version of Well-Known Binary
+ * supported by JTS.
+ * <p>
+ * <i>The specification uses a syntax language similar to that used in
+ * the C language. Bitfields are specified from hi-order to lo-order bits.</i>
+ * <p>
+ * <blockquote><pre>
+ *
+ * <b>byte</b> = 1 byte
+ * <b>uint32</b> = 32 bit unsigned integer (4 bytes)
+ * <b>double</b> = double precision number (8 bytes)
+ *
+ * abstract Point { }
+ *
+ * Point2D extends Point {
+ * <b>double</b> x;
+ * <b>double</b> y;
+ * }
+ *
+ * Point3D extends Point {
+ * <b>double</b> x;
+ * <b>double</b> y;
+ * <b>double</b> z;
+ * }
+ *
+ * LinearRing {
+ * <b>uint32</b> numPoints;
+ * Point points[numPoints];
+ * }
+ *
+ * enum wkbGeometryType {
+ * wkbPoint = 1,
+ * wkbLineString = 2,
+ * wkbPolygon = 3,
+ * wkbMultiPoint = 4,
+ * wkbMultiLineString = 5,
+ * wkbMultiPolygon = 6,
+ * wkbGeometryCollection = 7
+ * }
+ *
+ * enum byteOrder {
+ * wkbXDR = 0, // Big Endian
+ * wkbNDR = 1 // Little Endian
+ * }
+ *
+ * WKBType {
+ * <b>uint32</b> wkbGeometryType : 8; // values from enum wkbGeometryType
+ * }
+ *
+ * EWKBType {
+ * <b>uint32</b> is3D : 1; // 0 = 2D, 1 = 3D
+ * <b>uint32</b> noData1 : 1;
+ * <b>uint32</b> hasSRID : 1; // 0, no, 1 = yes
+ * <b>uint32</b> noData2 : 21;
+ * <b>uint32</b> wkbGeometryType : 8; // values from enum wkbGeometryType
+ * }
+ *
+ * abstract WKBGeometry {
+ * <b>byte</b> byteOrder; // values from enum byteOrder
+ * EWKBType wkbType
+ * [ <b>uint32</b> srid; ] // only if hasSRID = yes
+ * }
+ *
+ * WKBPoint extends WKBGeometry {
+ * Point point;
+ * }
+ *
+ * WKBLineString extends WKBGeometry {
+ * <b>uint32</b> numCoords;
+ * Point points[numCoords];
+ * }
+ *
+ * WKBPolygon extends WKBGeometry {
+ * <b>uint32</b> numRings;
+ * LinearRing rings[numRings];
+ * }
+ *
+ * WKBMultiPoint extends WKBGeometry {
+ * <b>uint32</b> numElems;
+ * WKBPoint elems[numElems];
+ * }
+ *
+ * WKBMultiLineString extends WKBGeometry {
+ * <b>uint32</b> numElems;
+ * WKBLineString elems[numElems];
+ * }
+ *
+ * wkbMultiPolygon extends WKBGeometry {
+ * <b>uint32</b> numElems;
+ * WKBPolygon elems[numElems];
+ * }
+ *
+ * WKBGeometryCollection extends WKBGeometry {
+ * <b>uint32</b> numElems;
+ * WKBGeometry elems[numElems];
+ * }
+ *
+ * </pre></blockquote>
+ * @see WKBReader
+ */
+public class WKBWriter
+{
+ /**
+ * Converts a byte array to a hexadecimal string.
+ *
+ * @param bytes
+ * @return a string of hexadecimal digits
+ *
+ * @deprecated
+ */
+ public static String bytesToHex(byte[] bytes)
+ {
+ return toHex(bytes);
+ }
+
+ /**
+ * Converts a byte array to a hexadecimal string.
+ *
+ * @param bytes a byte array
+ * @return a string of hexadecimal digits
+ */
+ public static String toHex(byte[] bytes)
+ {
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < bytes.length; i++) {
+ byte b = bytes[i];
+ buf.append(toHexDigit((b >> 4) & 0x0F));
+ buf.append(toHexDigit(b & 0x0F));
+ }
+ return buf.toString();
+ }
+
+ private static char toHexDigit(int n)
+ {
+ if (n < 0 || n > 15)
+ throw new IllegalArgumentException("Nibble value out of range: " + n);
+ if (n <= 9)
+ return (char) ('0' + n);
+ return (char) ('A' + (n - 10));
+ }
+
+ private int outputDimension = 2;
+ private int byteOrder;
+ private boolean includeSRID = false;
+ private ByteArrayOutputStream byteArrayOS = new ByteArrayOutputStream();
+ private OutStream byteArrayOutStream = new OutputStreamOutStream(byteArrayOS);
+ // holds output data values
+ private byte[] buf = new byte[8];
+
+ /**
+ * Creates a writer that writes {@link Geometry}s with
+ * output dimension = 2 and BIG_ENDIAN byte order
+ */
+ public WKBWriter() {
+ this(2, ByteOrderValues.BIG_ENDIAN);
+ }
+
+ /**
+ * Creates a writer that writes {@link Geometry}s with
+ * the given dimension (2 or 3) for output coordinates
+ * and {@link ByteOrderValues#BIG_ENDIAN} byte order.
+ * If the input geometry has a small coordinate dimension,
+ * coordinates will be padded with {@link Coordinate#NULL_ORDINATE}.
+ *
+ * @param outputDimension the coordinate dimension to output (2 or 3)
+ */
+ public WKBWriter(int outputDimension) {
+ this(outputDimension, ByteOrderValues.BIG_ENDIAN);
+ }
+
+ /**
+ * Creates a writer that writes {@link Geometry}s with
+ * the given dimension (2 or 3) for output coordinates
+ * and {@link ByteOrderValues#BIG_ENDIAN} byte order. This constructor also
+ * takes a flag to control whether srid information will be
+ * written.
+ * If the input geometry has a smaller coordinate dimension,
+ * coordinates will be padded with {@link Coordinate#NULL_ORDINATE}.
+ *
+ * @param outputDimension the coordinate dimension to output (2 or 3)
+ * @param includeSRID indicates whether SRID should be written
+ */
+ public WKBWriter(int outputDimension, boolean includeSRID) {
+ this(outputDimension, ByteOrderValues.BIG_ENDIAN, includeSRID);
+ }
+
+ /**
+ * Creates a writer that writes {@link Geometry}s with
+ * the given dimension (2 or 3) for output coordinates
+ * and byte order
+ * If the input geometry has a small coordinate dimension,
+ * coordinates will be padded with {@link Coordinate#NULL_ORDINATE}.
+ *
+ * @param outputDimension the coordinate dimension to output (2 or 3)
+ * @param byteOrder the byte ordering to use
+ */
+ public WKBWriter(int outputDimension, int byteOrder) {
+ this(outputDimension, byteOrder, false);
+ }
+
+ /**
+ * Creates a writer that writes {@link Geometry}s with
+ * the given dimension (2 or 3) for output coordinates
+ * and byte order. This constructor also takes a flag to
+ * control whether srid information will be written.
+ * If the input geometry has a small coordinate dimension,
+ * coordinates will be padded with {@link Coordinate#NULL_ORDINATE}.
+ *
+ * @param outputDimension the coordinate dimension to output (2 or 3)
+ * @param byteOrder the byte ordering to use
+ * @param includeSRID indicates whether SRID should be written
+ */
+ public WKBWriter(int outputDimension, int byteOrder, boolean includeSRID) {
+ this.outputDimension = outputDimension;
+ this.byteOrder = byteOrder;
+ this.includeSRID = includeSRID;
+
+ if (outputDimension < 2 || outputDimension > 3)
+ throw new IllegalArgumentException("Output dimension must be 2 or 3");
+ }
+
+ /**
+ * Writes a {@link Geometry} into a byte array.
+ *
+ * @param geom the geometry to write
+ * @return the byte array containing the WKB
+ */
+ public byte[] write(Geometry geom)
+ {
+ try {
+ byteArrayOS.reset();
+ write(geom, byteArrayOutStream);
+ }
+ catch (IOException ex) {
+ throw new RuntimeException("Unexpected IO exception: " + ex.getMessage());
+ }
+ return byteArrayOS.toByteArray();
+ }
+
+ /**
+ * Writes a {@link Geometry} to an {@link OutStream}.
+ *
+ * @param geom the geometry to write
+ * @param os the out stream to write to
+ * @throws IOException if an I/O error occurs
+ */
+ public void write(Geometry geom, OutStream os) throws IOException
+ {
+ if (geom instanceof Point)
+ writePoint((Point) geom, os);
+ // LinearRings will be written as LineStrings
+ else if (geom instanceof LineString)
+ writeLineString((LineString) geom, os);
+ else if (geom instanceof Polygon)
+ writePolygon((Polygon) geom, os);
+ else if (geom instanceof MultiPoint)
+ writeGeometryCollection(WKBConstants.wkbMultiPoint,
+ (MultiPoint) geom, os);
+ else if (geom instanceof MultiLineString)
+ writeGeometryCollection(WKBConstants.wkbMultiLineString,
+ (MultiLineString) geom, os);
+ else if (geom instanceof MultiPolygon)
+ writeGeometryCollection(WKBConstants.wkbMultiPolygon,
+ (MultiPolygon) geom, os);
+ else if (geom instanceof GeometryCollection)
+ writeGeometryCollection(WKBConstants.wkbGeometryCollection,
+ (GeometryCollection) geom, os);
+ else {
+ Assert.shouldNeverReachHere("Unknown Geometry type");
+ }
+ }
+
+ private void writePoint(Point pt, OutStream os) throws IOException
+ {
+ if (pt.getCoordinateSequence().size() == 0)
+ throw new IllegalArgumentException("Empty Points cannot be represented in WKB");
+ writeByteOrder(os);
+ writeGeometryType(WKBConstants.wkbPoint, pt, os);
+ writeCoordinateSequence(pt.getCoordinateSequence(), false, os);
+ }
+
+ private void writeLineString(LineString line, OutStream os)
+ throws IOException
+ {
+ writeByteOrder(os);
+ writeGeometryType(WKBConstants.wkbLineString, line, os);
+ writeCoordinateSequence(line.getCoordinateSequence(), true, os);
+ }
+
+ private void writePolygon(Polygon poly, OutStream os) throws IOException
+ {
+ writeByteOrder(os);
+ writeGeometryType(WKBConstants.wkbPolygon, poly, os);
+ writeInt(poly.getNumInteriorRing() + 1, os);
+ writeCoordinateSequence(poly.getExteriorRing().getCoordinateSequence(), true, os);
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ writeCoordinateSequence(poly.getInteriorRingN(i).getCoordinateSequence(), true,
+ os);
+ }
+ }
+
+ private void writeGeometryCollection(int geometryType, GeometryCollection gc,
+ OutStream os) throws IOException
+ {
+ writeByteOrder(os);
+ writeGeometryType(geometryType, gc, os);
+ writeInt(gc.getNumGeometries(), os);
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ write(gc.getGeometryN(i), os);
+ }
+ }
+
+ private void writeByteOrder(OutStream os) throws IOException
+ {
+ if (byteOrder == ByteOrderValues.LITTLE_ENDIAN)
+ buf[0] = WKBConstants.wkbNDR;
+ else
+ buf[0] = WKBConstants.wkbXDR;
+ os.write(buf, 1);
+ }
+
+ private void writeGeometryType(int geometryType, Geometry g, OutStream os)
+ throws IOException
+ {
+ int flag3D = (outputDimension == 3) ? 0x80000000 : 0;
+ int typeInt = geometryType | flag3D;
+ typeInt |= includeSRID ? 0x20000000 : 0;
+ writeInt(typeInt, os);
+ if (includeSRID) {
+ writeInt(g.getSRID(), os);
+ }
+ }
+
+ private void writeInt(int intValue, OutStream os) throws IOException
+ {
+ ByteOrderValues.putInt(intValue, buf, byteOrder);
+ os.write(buf, 4);
+ }
+
+ private void writeCoordinateSequence(CoordinateSequence seq, boolean writeSize, OutStream os)
+ throws IOException
+ {
+ if (writeSize)
+ writeInt(seq.size(), os);
+
+ for (int i = 0; i < seq.size(); i++) {
+ writeCoordinate(seq, i, os);
+ }
+ }
+
+ private void writeCoordinate(CoordinateSequence seq, int index, OutStream os)
+ throws IOException
+ {
+ ByteOrderValues.putDouble(seq.getX(index), buf, byteOrder);
+ os.write(buf, 8);
+ ByteOrderValues.putDouble(seq.getY(index), buf, byteOrder);
+ os.write(buf, 8);
+
+ // only write 3rd dim if caller has requested it for this writer
+ if (outputDimension >= 3) {
+ // if 3rd dim is requested, only write it if the CoordinateSequence provides it
+ double ordVal = Coordinate.NULL_ORDINATE;
+ if (seq.getDimension() >= 3)
+ ordVal = seq.getOrdinate(index, 2);
+ ByteOrderValues.putDouble(ordVal, buf, byteOrder);
+ os.write(buf, 8);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/WKTFileReader.java b/modules/core/src/main/java/org/locationtech/jts/io/WKTFileReader.java
new file mode 100644
index 0000000..b595f47
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/WKTFileReader.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.io;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StreamTokenizer;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Reads a sequence of {@link Geometry}s in WKT format
+ * from a text file.
+ * The geometries in the file may be separated by any amount
+ * of whitespace and newlines.
+ *
+ * @author Martin Davis
+ *
+ */
+public class WKTFileReader
+{
+ private File file = null;
+ private Reader reader;
+// private Reader fileReader = new FileReader(file);
+ private WKTReader wktReader;
+ private int count = 0;
+ private int limit = -1;
+ private int offset = 0;
+
+ /**
+ * Creates a new <tt>WKTFileReader</tt> given the <tt>File</tt> to read from
+ * and a <tt>WKTReader</tt> to use to parse the geometries.
+ *
+ * @param file the <tt>File</tt> to read from
+ * @param wktReader the geometry reader to use
+ */
+ public WKTFileReader(File file, WKTReader wktReader)
+ {
+ this.file = file;
+ this.wktReader = wktReader;
+ }
+
+ /**
+ * Creates a new <tt>WKTFileReader</tt>, given the name of the file to read from.
+ *
+ * @param filename the name of the file to read from
+ * @param wktReader the geometry reader to use
+ */
+ public WKTFileReader(String filename, WKTReader wktReader)
+ {
+ this(new File(filename), wktReader);
+ }
+
+ /**
+ * Creates a new <tt>WKTFileReader</tt>, given a {@link Reader} to read from.
+ *
+ * @param reader the reader to read from
+ * @param wktReader the geometry reader to use
+ */
+ public WKTFileReader(Reader reader, WKTReader wktReader)
+ {
+ this.reader = reader;
+ this.wktReader = wktReader;
+ }
+
+ /**
+ * Sets the maximum number of geometries to read.
+ *
+ * @param limit the maximum number of geometries to read
+ */
+ public void setLimit(int limit)
+ {
+ this.limit = limit;
+ }
+
+ /**
+ * Sets the number of geometries to skip before storing.
+ *
+ * @param offset the number of geometries to skip
+ */
+ public void setOffset(int offset)
+ {
+ this.offset = offset;
+ }
+
+ /**
+ * Reads a sequence of geometries.
+ * If an offset is specified, geometries read up to the offset count are skipped.
+ * If a limit is specified, no more than <tt>limit</tt> geometries are read.
+ *
+ * @return the list of geometries read
+ * @throws IOException if an I/O exception was encountered
+ * @throws ParseException if an error occurred reading a geometry
+ */
+ public List read()
+ throws IOException, ParseException
+ {
+ // do this here so that constructors don't throw exceptions
+ if (file != null)
+ reader = new FileReader(file);
+
+ count = 0;
+ try {
+ BufferedReader bufferedReader = new BufferedReader(reader);
+ try {
+ return read(bufferedReader);
+ } finally {
+ bufferedReader.close();
+ }
+ } finally {
+ reader.close();
+ }
+ }
+
+ private List read(BufferedReader bufferedReader) throws IOException,
+ ParseException {
+ List geoms = new ArrayList();
+ while (! isAtEndOfFile(bufferedReader) && ! isAtLimit(geoms)) {
+ Geometry g = wktReader.read(bufferedReader);
+ if (count >= offset)
+ geoms.add(g);
+ count++;
+ }
+ return geoms;
+ }
+
+ private boolean isAtLimit(List geoms)
+ {
+ if (limit < 0) return false;
+ if (geoms.size() < limit) return false;
+ return true;
+ }
+
+ private static final int MAX_LOOKAHEAD = 1000;
+
+ /**
+ * Tests if reader is at EOF.
+ */
+ private boolean isAtEndOfFile(BufferedReader bufferedReader)
+ throws IOException
+ {
+ bufferedReader.mark(MAX_LOOKAHEAD);
+
+ StreamTokenizer tokenizer = new StreamTokenizer(bufferedReader);
+ int type = tokenizer.nextToken();
+
+ if (type == StreamTokenizer.TT_EOF) {
+ return true;
+ }
+ bufferedReader.reset();
+ return false;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/WKTReader.java b/modules/core/src/main/java/org/locationtech/jts/io/WKTReader.java
new file mode 100644
index 0000000..8d71442
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/WKTReader.java
@@ -0,0 +1,755 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StreamTokenizer;
+import java.io.StringReader;
+import java.util.ArrayList;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jts.util.AssertionFailedException;
+
+/**
+ * Converts a geometry in Well-Known Text format to a {@link Geometry}.
+ * <p>
+ * <code>WKTReader</code> supports
+ * extracting <code>Geometry</code> objects from either {@link Reader}s or
+ * {@link String}s. This allows it to function as a parser to read <code>Geometry</code>
+ * objects from text blocks embedded in other data formats (e.g. XML). <P>
+ * <p>
+ * A <code>WKTReader</code> is parameterized by a <code>GeometryFactory</code>,
+ * to allow it to create <code>Geometry</code> objects of the appropriate
+ * implementation. In particular, the <code>GeometryFactory</code>
+ * determines the <code>PrecisionModel</code> and <code>SRID</code> that is
+ * used. <P>
+ *
+ * The <code>WKTReader</code> converts all input numbers to the precise
+ * internal representation.
+ *
+ * <h3>Notes:</h3>
+ * <ul>
+ * <li>Keywords are case-insensitive.
+ * <li>The reader supports non-standard "LINEARRING" tags.
+ * <li>The reader uses <tt>Double.parseDouble</tt> to perform the conversion of ASCII
+ * numbers to floating point. This means it supports the Java
+ * syntax for floating point literals (including scientific notation).
+ * </ul>
+ *
+ * <h3>Syntax</h3>
+ * The following syntax specification describes the version of Well-Known Text
+ * supported by JTS.
+ * (The specification uses a syntax language similar to that used in
+ * the C and Java language specifications.)
+ * <p>
+ * As of version 1.15, JTS can read (but not write) WKT Strings including Z, M or ZM
+ * in the name of the geometry type (ex. POINT Z, LINESTRINGZM).
+ * Note that it only makes the reader more flexible, but JTS could already read
+ * 3D coordinates from WKT String and still can't read 4D coordinates.
+ *
+ * <blockquote><pre>
+ * <i>WKTGeometry:</i> one of<i>
+ *
+ * WKTPoint WKTLineString WKTLinearRing WKTPolygon
+ * WKTMultiPoint WKTMultiLineString WKTMultiPolygon
+ * WKTGeometryCollection</i>
+ *
+ * <i>WKTPoint:</i> <b>POINT</b><i>[Dimension]</i> <b>( </b><i>Coordinate</i> <b>)</b>
+ *
+ * <i>WKTLineString:</i> <b>LINESTRING</b><i>[Dimension]</i> <i>CoordinateSequence</i>
+ *
+ * <i>WKTLinearRing:</i> <b>LINEARRING</b><i>[Dimension]</i> <i>CoordinateSequence</i>
+ *
+ * <i>WKTPolygon:</i> <b>POLYGON</b><i>[Dimension]</i> <i>CoordinateSequenceList</i>
+ *
+ * <i>WKTMultiPoint:</i> <b>MULTIPOINT</b><i>[Dimension]</i> <i>CoordinateSingletonList</i>
+ *
+ * <i>WKTMultiLineString:</i> <b>MULTILINESTRING</b><i>[Dimension]</i> <i>CoordinateSequenceList</i>
+ *
+ * <i>WKTMultiPolygon:</i>
+ * <b>MULTIPOLYGON</b><i>[Dimension]</i> <b>(</b> <i>CoordinateSequenceList {</i> , <i>CoordinateSequenceList }</i> <b>)</b>
+ *
+ * <i>WKTGeometryCollection: </i>
+ * <b>GEOMETRYCOLLECTION</b><i>[Dimension]</i> <b> (</b> <i>WKTGeometry {</i> , <i>WKTGeometry }</i> <b>)</b>
+ *
+ * <i>CoordinateSingletonList:</i>
+ * <b>(</b> <i>CoordinateSingleton {</i> <b>,</b> <i>CoordinateSingleton }</i> <b>)</b>
+ * | <b>EMPTY</b>
+ *
+ * <i>CoordinateSingleton:</i>
+ * <b>(</b> <i>Coordinate</i> <b>)</b>
+ * | <b>EMPTY</b>
+ *
+ * <i>CoordinateSequenceList:</i>
+ * <b>(</b> <i>CoordinateSequence {</i> <b>,</b> <i>CoordinateSequence }</i> <b>)</b>
+ * | <b>EMPTY</b>
+ *
+ * <i>CoordinateSequence:</i>
+ * <b>(</b> <i>Coordinate {</i> , <i>Coordinate }</i> <b>)</b>
+ * | <b>EMPTY</b>
+ *
+ * <i>Coordinate:
+ * Number Number Number<sub>opt</sub></i>
+ *
+ * <i>Number:</i> A Java-style floating-point number (including <tt>NaN</tt>, with arbitrary case)
+ *
+ * <i>Dimension:</i>
+ * <b>Z</b>|<b> Z</b>|<b>M</b>|<b> M</b>|<b>ZM</b>|<b> ZM</b>
+ *
+ * </pre></blockquote>
+ *
+ *
+ *@version 1.7
+ * @see WKTWriter
+ */
+public class WKTReader
+{
+ private static final String EMPTY = "EMPTY";
+ private static final String COMMA = ",";
+ private static final String L_PAREN = "(";
+ private static final String R_PAREN = ")";
+ private static final String NAN_SYMBOL = "NaN";
+
+ private GeometryFactory geometryFactory;
+ private PrecisionModel precisionModel;
+ private StreamTokenizer tokenizer;
+ // Not yet used (useful if we want to read Z, M and ZM WKT)
+ private boolean z;
+ private boolean m;
+
+ /**
+ * Creates a reader that creates objects using the default {@link GeometryFactory}.
+ */
+ public WKTReader() {
+ this(new GeometryFactory());
+ }
+
+ /**
+ * Creates a reader that creates objects using the given
+ * {@link GeometryFactory}.
+ *
+ *@param geometryFactory the factory used to create <code>Geometry</code>s.
+ */
+ public WKTReader(GeometryFactory geometryFactory) {
+ this.geometryFactory = geometryFactory;
+ precisionModel = geometryFactory.getPrecisionModel();
+ }
+
+ /**
+ * Reads a Well-Known Text representation of a {@link Geometry}
+ * from a {@link String}.
+ *
+ * @param wellKnownText
+ * one or more <Geometry Tagged Text> strings (see the OpenGIS
+ * Simple Features Specification) separated by whitespace
+ * @return a <code>Geometry</code> specified by <code>wellKnownText</code>
+ * @throws ParseException
+ * if a parsing problem occurs
+ */
+ public Geometry read(String wellKnownText) throws ParseException {
+ StringReader reader = new StringReader(wellKnownText);
+ try {
+ return read(reader);
+ }
+ finally {
+ reader.close();
+ }
+ }
+
+ /**
+ * Reads a Well-Known Text representation of a {@link Geometry}
+ * from a {@link Reader}.
+ *
+ *@param reader a Reader which will return a <Geometry Tagged Text>
+ * string (see the OpenGIS Simple Features Specification)
+ *@return a <code>Geometry</code> read from <code>reader</code>
+ *@throws ParseException if a parsing problem occurs
+ */
+ public Geometry read(Reader reader) throws ParseException {
+ tokenizer = new StreamTokenizer(reader);
+ // set tokenizer to NOT parse numbers
+ tokenizer.resetSyntax();
+ tokenizer.wordChars('a', 'z');
+ tokenizer.wordChars('A', 'Z');
+ tokenizer.wordChars(128 + 32, 255);
+ tokenizer.wordChars('0', '9');
+ tokenizer.wordChars('-', '-');
+ tokenizer.wordChars('+', '+');
+ tokenizer.wordChars('.', '.');
+ tokenizer.whitespaceChars(0, ' ');
+ tokenizer.commentChar('#');
+ z = false;
+ m = false;
+
+ try {
+ return readGeometryTaggedText();
+ }
+ catch (IOException e) {
+ throw new ParseException(e.toString());
+ }
+ }
+
+ /**
+ * Returns the next array of <code>Coordinate</code>s in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next element returned by the stream should be L_PAREN (the
+ * beginning of "(x1 y1, x2 y2, ..., xn yn)") or EMPTY.
+ *@return the next array of <code>Coordinate</code>s in the
+ * stream, or an empty array if EMPTY is the next element returned by
+ * the stream.
+ *@throws IOException if an I/O error occurs
+ *@throws ParseException if an unexpected token was encountered
+ */
+ private Coordinate[] getCoordinates() throws IOException, ParseException {
+ String nextToken = getNextEmptyOrOpener();
+ if (nextToken.equals(EMPTY)) {
+ return new Coordinate[] {};
+ }
+ ArrayList coordinates = new ArrayList();
+ coordinates.add(getPreciseCoordinate());
+ nextToken = getNextCloserOrComma();
+ while (nextToken.equals(COMMA)) {
+ coordinates.add(getPreciseCoordinate());
+ nextToken = getNextCloserOrComma();
+ }
+ Coordinate[] array = new Coordinate[coordinates.size()];
+ return (Coordinate[]) coordinates.toArray(array);
+ }
+
+ private Coordinate[] getCoordinatesNoLeftParen() throws IOException, ParseException {
+ String nextToken = null;
+ ArrayList coordinates = new ArrayList();
+ coordinates.add(getPreciseCoordinate());
+ nextToken = getNextCloserOrComma();
+ while (nextToken.equals(COMMA)) {
+ coordinates.add(getPreciseCoordinate());
+ nextToken = getNextCloserOrComma();
+ }
+ Coordinate[] array = new Coordinate[coordinates.size()];
+ return (Coordinate[]) coordinates.toArray(array);
+ }
+
+ private Coordinate getPreciseCoordinate()
+ throws IOException, ParseException
+ {
+ Coordinate coord = new Coordinate();
+ coord.x = getNextNumber();
+ coord.y = getNextNumber();
+ if (isNumberNext()) {
+ coord.z = getNextNumber();
+ }
+ if (isNumberNext()) {
+ getNextNumber(); // ignore M value
+ }
+ precisionModel.makePrecise(coord);
+ return coord;
+ }
+
+ private boolean isNumberNext() throws IOException {
+ int type = tokenizer.nextToken();
+ tokenizer.pushBack();
+ return type == StreamTokenizer.TT_WORD;
+ }
+
+ /**
+ * Parses the next number in the stream.
+ * Numbers with exponents are handled.
+ * <tt>NaN</tt> values are handled correctly, and
+ * the case of the "NaN" symbol is not significant.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next token must be a number.
+ *@return the next number in the stream
+ *@throws ParseException if the next token is not a valid number
+ *@throws IOException if an I/O error occurs
+ */
+ private double getNextNumber() throws IOException,
+ ParseException {
+ int type = tokenizer.nextToken();
+ switch (type) {
+ case StreamTokenizer.TT_WORD:
+ {
+ if (tokenizer.sval.equalsIgnoreCase(NAN_SYMBOL)) {
+ return Double.NaN;
+ }
+ else {
+ try {
+ return Double.parseDouble(tokenizer.sval);
+ }
+ catch (NumberFormatException ex) {
+ parseErrorWithLine("Invalid number: " + tokenizer.sval);
+ }
+ }
+ }
+ }
+ parseErrorExpected("number");
+ return 0.0;
+ }
+ /**
+ * Returns the next EMPTY or L_PAREN in the stream as uppercase text.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next token must be EMPTY or L_PAREN.
+ *@return the next EMPTY or L_PAREN in the stream as uppercase
+ * text.
+ *@throws ParseException if the next token is not EMPTY or L_PAREN
+ *@throws IOException if an I/O error occurs
+ */
+ private String getNextEmptyOrOpener() throws IOException, ParseException {
+ String nextWord = getNextWord();
+ if (nextWord.equalsIgnoreCase("Z")) {
+ z = true;
+ nextWord = getNextWord();
+ }
+ else if (nextWord.equalsIgnoreCase("M")) {
+ m = true;
+ nextWord = getNextWord();
+ }
+ else if (nextWord.equalsIgnoreCase("ZM")) {
+ z = true;
+ m = true;
+ nextWord = getNextWord();
+ }
+ if (nextWord.equals(EMPTY) || nextWord.equals(L_PAREN)) {
+ return nextWord;
+ }
+ parseErrorExpected(EMPTY + " or " + L_PAREN);
+ return null;
+ }
+
+ /**
+ * Returns the next R_PAREN or COMMA in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next token must be R_PAREN or COMMA.
+ *@return the next R_PAREN or COMMA in the stream
+ *@throws ParseException if the next token is not R_PAREN or COMMA
+ *@throws IOException if an I/O error occurs
+ */
+ private String getNextCloserOrComma() throws IOException, ParseException {
+ String nextWord = getNextWord();
+ if (nextWord.equals(COMMA) || nextWord.equals(R_PAREN)) {
+ return nextWord;
+ }
+ parseErrorExpected(COMMA + " or " + R_PAREN);
+ return null;
+ }
+
+ /**
+ * Returns the next R_PAREN in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next token must be R_PAREN.
+ *@return the next R_PAREN in the stream
+ *@throws ParseException if the next token is not R_PAREN
+ *@throws IOException if an I/O error occurs
+ */
+ private String getNextCloser() throws IOException, ParseException {
+ String nextWord = getNextWord();
+ if (nextWord.equals(R_PAREN)) {
+ return nextWord;
+ }
+ parseErrorExpected(R_PAREN);
+ return null;
+ }
+
+ /**
+ * Returns the next word in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next token must be a word.
+ *@return the next word in the stream as uppercase text
+ *@throws ParseException if the next token is not a word
+ *@throws IOException if an I/O error occurs
+ */
+ private String getNextWord() throws IOException, ParseException {
+ int type = tokenizer.nextToken();
+ switch (type) {
+ case StreamTokenizer.TT_WORD:
+
+ String word = tokenizer.sval;
+ if (word.equalsIgnoreCase(EMPTY))
+ return EMPTY;
+ return word;
+
+ case '(': return L_PAREN;
+ case ')': return R_PAREN;
+ case ',': return COMMA;
+ }
+ parseErrorExpected("word");
+ return null;
+ }
+
+ /**
+ * Returns the next word in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next token must be a word.
+ *@return the next word in the stream as uppercase text
+ *@throws ParseException if the next token is not a word
+ *@throws IOException if an I/O error occurs
+ */
+ private String lookaheadWord() throws IOException, ParseException {
+ String nextWord = getNextWord();
+ tokenizer.pushBack();
+ return nextWord;
+ }
+
+ /**
+ * Throws a formatted ParseException reporting that the current token
+ * was unexpected.
+ *
+ * @param expected a description of what was expected
+ * @throws ParseException
+ * @throws AssertionFailedException if an invalid token is encountered
+ */
+ private void parseErrorExpected(String expected)
+ throws ParseException
+ {
+ // throws Asserts for tokens that should never be seen
+ if (tokenizer.ttype == StreamTokenizer.TT_NUMBER)
+ Assert.shouldNeverReachHere("Unexpected NUMBER token");
+ if (tokenizer.ttype == StreamTokenizer.TT_EOL)
+ Assert.shouldNeverReachHere("Unexpected EOL token");
+
+ String tokenStr = tokenString();
+ parseErrorWithLine("Expected " + expected + " but found " + tokenStr);
+ }
+
+ private void parseErrorWithLine(String msg)
+ throws ParseException
+ {
+ throw new ParseException(msg + " (line " + tokenizer.lineno() + ")");
+ }
+
+ /**
+ * Gets a description of the current token
+ *
+ * @return a description of the current token
+ */
+ private String tokenString()
+ {
+ switch (tokenizer.ttype) {
+ case StreamTokenizer.TT_NUMBER:
+ return "<NUMBER>";
+ case StreamTokenizer.TT_EOL:
+ return "End-of-Line";
+ case StreamTokenizer.TT_EOF: return "End-of-Stream";
+ case StreamTokenizer.TT_WORD: return "'" + tokenizer.sval + "'";
+ }
+ return "'" + (char) tokenizer.ttype + "'";
+ }
+
+ /**
+ * Creates a <code>Geometry</code> using the next token in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <Geometry Tagged Text>.
+ *@return a <code>Geometry</code> specified by the next token
+ * in the stream
+ *@throws ParseException if the coordinates used to create a <code>Polygon</code>
+ * shell and holes do not form closed linestrings, or if an unexpected
+ * token was encountered
+ *@throws IOException if an I/O error occurs
+ */
+ private Geometry readGeometryTaggedText() throws IOException, ParseException {
+ String type;
+
+ try{
+ type = getNextWord().toUpperCase();
+ if (type.endsWith("Z")) z = true;
+ if (type.endsWith("M")) m = true;
+ }catch(IOException e){
+ return null;
+ }catch(ParseException e){
+ return null;
+ }
+
+ if (type.startsWith("POINT")) {
+ return readPointText();
+ }
+ else if (type.startsWith("LINESTRING")) {
+ return readLineStringText();
+ }
+ else if (type.startsWith("LINEARRING")) {
+ return readLinearRingText();
+ }
+ else if (type.startsWith("POLYGON")) {
+ return readPolygonText();
+ }
+ else if (type.startsWith("MULTIPOINT")) {
+ return readMultiPointText();
+ }
+ else if (type.startsWith("MULTILINESTRING")) {
+ return readMultiLineStringText();
+ }
+ else if (type.startsWith("MULTIPOLYGON")) {
+ return readMultiPolygonText();
+ }
+ else if (type.startsWith("GEOMETRYCOLLECTION")) {
+ return readGeometryCollectionText();
+ }
+ parseErrorWithLine("Unknown geometry type: " + type);
+ // should never reach here
+ return null;
+ }
+
+ /**
+ * Creates a <code>Point</code> using the next token in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <Point Text>.
+ *@return a <code>Point</code> specified by the next token in
+ * the stream
+ *@throws IOException if an I/O error occurs
+ *@throws ParseException if an unexpected token was encountered
+ */
+ private Point readPointText() throws IOException, ParseException {
+ String nextToken = getNextEmptyOrOpener();
+ if (nextToken.equals(EMPTY)) {
+ return geometryFactory.createPoint();
+ }
+ Point point = geometryFactory.createPoint(getPreciseCoordinate());
+ getNextCloser();
+ return point;
+ }
+
+ /**
+ * Creates a <code>LineString</code> using the next token in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <LineString Text>.
+ *@return a <code>LineString</code> specified by the next
+ * token in the stream
+ *@throws IOException if an I/O error occurs
+ *@throws ParseException if an unexpected token was encountered
+ */
+ private LineString readLineStringText() throws IOException, ParseException {
+ return geometryFactory.createLineString(getCoordinates());
+ }
+
+ /**
+ * Creates a <code>LinearRing</code> using the next token in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <LineString Text>.
+ *@return a <code>LinearRing</code> specified by the next
+ * token in the stream
+ *@throws IOException if an I/O error occurs
+ *@throws ParseException if the coordinates used to create the <code>LinearRing</code>
+ * do not form a closed linestring, or if an unexpected token was
+ * encountered
+ */
+ private LinearRing readLinearRingText()
+ throws IOException, ParseException
+ {
+ return geometryFactory.createLinearRing(getCoordinates());
+ }
+
+ /*
+ private MultiPoint OLDreadMultiPointText() throws IOException, ParseException {
+ return geometryFactory.createMultiPoint(toPoints(getCoordinates()));
+ }
+ */
+
+ private static final boolean ALLOW_OLD_JTS_MULTIPOINT_SYNTAX = true;
+
+ /**
+ * Creates a <code>MultiPoint</code> using the next tokens in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <MultiPoint Text>.
+ *@return a <code>MultiPoint</code> specified by the next
+ * token in the stream
+ *@throws IOException if an I/O error occurs
+ *@throws ParseException if an unexpected token was encountered
+ */
+ private MultiPoint readMultiPointText() throws IOException, ParseException
+ {
+ String nextToken = getNextEmptyOrOpener();
+ if (nextToken.equals(EMPTY)) {
+ return geometryFactory.createMultiPoint(new Point[0]);
+ }
+
+ // check for old-style JTS syntax and parse it if present
+ // MD 2009-02-21 - this is only provided for backwards compatibility for a few versions
+ if (ALLOW_OLD_JTS_MULTIPOINT_SYNTAX) {
+ String nextWord = lookaheadWord();
+ if (nextWord != L_PAREN) {
+ return geometryFactory.createMultiPoint(toPoints(getCoordinatesNoLeftParen()));
+ }
+ }
+
+ ArrayList points = new ArrayList();
+ Point point = readPointText();
+ points.add(point);
+ nextToken = getNextCloserOrComma();
+ while (nextToken.equals(COMMA)) {
+ point = readPointText();
+ points.add(point);
+ nextToken = getNextCloserOrComma();
+ }
+ Point[] array = new Point[points.size()];
+ return geometryFactory.createMultiPoint((Point[]) points.toArray(array));
+ }
+
+ /**
+ * Creates an array of <code>Point</code>s having the given <code>Coordinate</code>
+ * s.
+ *
+ *@param coordinates the <code>Coordinate</code>s with which to create the
+ * <code>Point</code>s
+ *@return <code>Point</code>s created using this <code>WKTReader</code>
+ * s <code>GeometryFactory</code>
+ */
+ private Point[] toPoints(Coordinate[] coordinates) {
+ ArrayList points = new ArrayList();
+ for (int i = 0; i < coordinates.length; i++) {
+ points.add(geometryFactory.createPoint(coordinates[i]));
+ }
+ return (Point[]) points.toArray(new Point[]{});
+ }
+
+ /**
+ * Creates a <code>Polygon</code> using the next token in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <Polygon Text>.
+ *@return a <code>Polygon</code> specified by the next token
+ * in the stream
+ *@throws ParseException if the coordinates used to create the <code>Polygon</code>
+ * shell and holes do not form closed linestrings, or if an unexpected
+ * token was encountered.
+ *@throws IOException if an I/O error occurs
+ */
+ private Polygon readPolygonText() throws IOException, ParseException {
+ String nextToken = getNextEmptyOrOpener();
+ if (nextToken.equals(EMPTY)) {
+ return geometryFactory.createPolygon(geometryFactory.createLinearRing(
+ new Coordinate[]{}), new LinearRing[]{});
+ }
+ ArrayList holes = new ArrayList();
+ LinearRing shell = readLinearRingText();
+ nextToken = getNextCloserOrComma();
+ while (nextToken.equals(COMMA)) {
+ LinearRing hole = readLinearRingText();
+ holes.add(hole);
+ nextToken = getNextCloserOrComma();
+ }
+ LinearRing[] array = new LinearRing[holes.size()];
+ return geometryFactory.createPolygon(shell, (LinearRing[]) holes.toArray(array));
+ }
+
+ /**
+ * Creates a <code>MultiLineString</code> using the next token in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <MultiLineString Text>.
+ *@return a <code>MultiLineString</code> specified by the
+ * next token in the stream
+ *@throws IOException if an I/O error occurs
+ *@throws ParseException if an unexpected token was encountered
+ */
+ private org.locationtech.jts.geom.MultiLineString readMultiLineStringText() throws IOException, ParseException {
+ String nextToken = getNextEmptyOrOpener();
+ if (nextToken.equals(EMPTY)) {
+ return geometryFactory.createMultiLineString(new LineString[]{});
+ }
+ ArrayList lineStrings = new ArrayList();
+ LineString lineString = readLineStringText();
+ lineStrings.add(lineString);
+ nextToken = getNextCloserOrComma();
+ while (nextToken.equals(COMMA)) {
+ lineString = readLineStringText();
+ lineStrings.add(lineString);
+ nextToken = getNextCloserOrComma();
+ }
+ LineString[] array = new LineString[lineStrings.size()];
+ return geometryFactory.createMultiLineString((LineString[]) lineStrings.toArray(array));
+ }
+
+ /**
+ * Creates a <code>MultiPolygon</code> using the next token in the stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <MultiPolygon Text>.
+ *@return a <code>MultiPolygon</code> specified by the next
+ * token in the stream, or if if the coordinates used to create the
+ * <code>Polygon</code> shells and holes do not form closed linestrings.
+ *@throws IOException if an I/O error occurs
+ *@throws ParseException if an unexpected token was encountered
+ */
+ private MultiPolygon readMultiPolygonText() throws IOException, ParseException {
+ String nextToken = getNextEmptyOrOpener();
+ if (nextToken.equals(EMPTY)) {
+ return geometryFactory.createMultiPolygon();
+ }
+ ArrayList polygons = new ArrayList();
+ Polygon polygon = readPolygonText();
+ polygons.add(polygon);
+ nextToken = getNextCloserOrComma();
+ while (nextToken.equals(COMMA)) {
+ polygon = readPolygonText();
+ polygons.add(polygon);
+ nextToken = getNextCloserOrComma();
+ }
+ Polygon[] array = new Polygon[polygons.size()];
+ return geometryFactory.createMultiPolygon((Polygon[]) polygons.toArray(array));
+ }
+
+ /**
+ * Creates a <code>GeometryCollection</code> using the next token in the
+ * stream.
+ *
+ *@param tokenizer tokenizer over a stream of text in Well-known Text
+ * format. The next tokens must form a <GeometryCollection Text>.
+ *@return a <code>GeometryCollection</code> specified by the
+ * next token in the stream
+ *@throws ParseException if the coordinates used to create a <code>Polygon</code>
+ * shell and holes do not form closed linestrings, or if an unexpected
+ * token was encountered
+ *@throws IOException if an I/O error occurs
+ */
+ private GeometryCollection readGeometryCollectionText() throws IOException, ParseException {
+ String nextToken = getNextEmptyOrOpener();
+ if (nextToken.equals(EMPTY)) {
+ return geometryFactory.createGeometryCollection(new Geometry[]{});
+ }
+ ArrayList geometries = new ArrayList();
+ Geometry geometry = readGeometryTaggedText();
+ geometries.add(geometry);
+ nextToken = getNextCloserOrComma();
+ while (nextToken.equals(COMMA)) {
+ geometry = readGeometryTaggedText();
+ geometries.add(geometry);
+ nextToken = getNextCloserOrComma();
+ }
+ Geometry[] array = new Geometry[geometries.size()];
+ return geometryFactory.createGeometryCollection((Geometry[]) geometries.toArray(array));
+ }
+
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/WKTWriter.java b/modules/core/src/main/java/org/locationtech/jts/io/WKTWriter.java
new file mode 100644
index 0000000..2cff844
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/WKTWriter.java
@@ -0,0 +1,770 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Writes the Well-Known Text representation of a {@link Geometry}.
+ * The Well-Known Text format is defined in the
+ * OGC <A HREF="http://www.opengis.org/techno/specs.htm">
+ * <i>Simple Features Specification for SQL</i></A>.
+ * See {@link WKTReader} for a formal specification of the format syntax.
+ * <p>
+ * The <code>WKTWriter</code> outputs coordinates rounded to the precision
+ * model. Only the maximum number of decimal places
+ * necessary to represent the ordinates to the required precision will be
+ * output.
+ * <p>
+ * The SFS WKT spec does not define a special tag for {@link LinearRing}s.
+ * Under the spec, rings are output as <code>LINESTRING</code>s.
+ * In order to allow precisely specifying constructed geometries,
+ * JTS also supports a non-standard <code>LINEARRING</code> tag which is used
+ * to output LinearRings.
+ *
+ * @version 1.7
+ * @see WKTReader
+ */
+public class WKTWriter
+{
+ /**
+ * Generates the WKT for a <tt>POINT</tt>
+ * specified by a {@link Coordinate}.
+ *
+ * @param p0 the point coordinate
+ *
+ * @return the WKT
+ */
+ public static String toPoint(Coordinate p0)
+ {
+ return "POINT ( " + p0.x + " " + p0.y + " )";
+ }
+
+ /**
+ * Generates the WKT for a <tt>LINESTRING</tt>
+ * specified by a {@link CoordinateSequence}.
+ *
+ * @param seq the sequence to write
+ *
+ * @return the WKT string
+ */
+ public static String toLineString(CoordinateSequence seq)
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("LINESTRING ");
+ if (seq.size() == 0)
+ buf.append(" EMPTY");
+ else {
+ buf.append("(");
+ for (int i = 0; i < seq.size(); i++) {
+ if (i > 0)
+ buf.append(", ");
+ buf.append(seq.getX(i) + " " + seq.getY(i));
+ }
+ buf.append(")");
+ }
+ return buf.toString();
+ }
+
+ /**
+ * Generates the WKT for a <tt>LINESTRING</tt>
+ * specified by a {@link CoordinateSequence}.
+ *
+ * @param coord the sequence to write
+ *
+ * @return the WKT string
+ */
+ public static String toLineString(Coordinate[] coord)
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("LINESTRING ");
+ if (coord.length == 0)
+ buf.append(" EMPTY");
+ else {
+ buf.append("(");
+ for (int i = 0; i < coord.length; i++) {
+ if (i > 0)
+ buf.append(", ");
+ buf.append(coord[i].x + " " + coord[i].y );
+ }
+ buf.append(")");
+ }
+ return buf.toString();
+ }
+
+ /**
+ * Generates the WKT for a <tt>LINESTRING</tt>
+ * specified by two {@link Coordinate}s.
+ *
+ * @param p0 the first coordinate
+ * @param p1 the second coordinate
+ *
+ * @return the WKT
+ */
+ public static String toLineString(Coordinate p0, Coordinate p1)
+ {
+ return "LINESTRING ( " + p0.x + " " + p0.y + ", " + p1.x + " " + p1.y + " )";
+ }
+
+ private static final int INDENT = 2;
+
+ /**
+ * Creates the <code>DecimalFormat</code> used to write <code>double</code>s
+ * with a sufficient number of decimal places.
+ *
+ *@param precisionModel the <code>PrecisionModel</code> used to determine
+ * the number of decimal places to write.
+ *@return a <code>DecimalFormat</code> that write <code>double</code>
+ * s without scientific notation.
+ */
+ private static DecimalFormat createFormatter(PrecisionModel precisionModel) {
+ // the default number of decimal places is 16, which is sufficient
+ // to accommodate the maximum precision of a double.
+ int decimalPlaces = precisionModel.getMaximumSignificantDigits();
+ // specify decimal separator explicitly to avoid problems in other locales
+ DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+ symbols.setDecimalSeparator('.');
+ String fmtString = "0" + (decimalPlaces > 0 ? "." : "")
+ + stringOfChar('#', decimalPlaces);
+ return new DecimalFormat(fmtString, symbols);
+ }
+
+ /**
+ * Returns a <code>String</code> of repeated characters.
+ *
+ *@param ch the character to repeat
+ *@param count the number of times to repeat the character
+ *@return a <code>String</code> of characters
+ */
+ public static String stringOfChar(char ch, int count) {
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < count; i++) {
+ buf.append(ch);
+ }
+ return buf.toString();
+ }
+
+ private int outputDimension = 2;
+ private DecimalFormat formatter;
+ private boolean isFormatted = false;
+ private boolean useFormatting = false;
+ private int level = 0;
+ private int coordsPerLine = -1;
+ private String indentTabStr = " ";
+
+ /**
+ * Creates a new WKTWriter with default settings
+ */
+ public WKTWriter()
+ {
+ }
+
+ /**
+ * Creates a writer that writes {@link Geometry}s with
+ * the given output dimension (2 or 3).
+ * If the specified output dimension is 3, the Z value
+ * of coordinates will be written if it is present
+ * (i.e. if it is not <code>Double.NaN</code>).
+ *
+ * @param outputDimension the coordinate dimension to output (2 or 3)
+ */
+ public WKTWriter(int outputDimension) {
+ this.outputDimension = outputDimension;
+
+ if (outputDimension < 2 || outputDimension > 3)
+ throw new IllegalArgumentException("Invalid output dimension (must be 2 or 3)");
+ }
+
+ /**
+ * Sets whether the output will be formatted.
+ *
+ * @param isFormatted true if the output is to be formatted
+ */
+ public void setFormatted(boolean isFormatted)
+ {
+ this.isFormatted = isFormatted;
+ }
+
+ /**
+ * Sets the maximum number of coordinates per line
+ * written in formatted output.
+ * If the provided coordinate number is <= 0,
+ * coordinates will be written all on one line.
+ *
+ * @param coordsPerLine the number of coordinates per line to output.
+ */
+ public void setMaxCoordinatesPerLine(int coordsPerLine)
+ {
+ this.coordsPerLine = coordsPerLine;
+ }
+
+ /**
+ * Sets the tab size to use for indenting.
+ *
+ * @param size the number of spaces to use as the tab string
+ * @throws IllegalArgumentException if the size is non-positive
+ */
+ public void setTab(int size)
+ {
+ if(size <= 0)
+ throw new IllegalArgumentException("Tab count must be positive");
+ this.indentTabStr = stringOfChar(' ', size);
+ }
+
+ /**
+ * Converts a <code>Geometry</code> to its Well-known Text representation.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ *@return a <Geometry Tagged Text> string (see the OpenGIS Simple
+ * Features Specification)
+ */
+ public String write(Geometry geometry)
+ {
+ Writer sw = new StringWriter();
+ try {
+ writeFormatted(geometry, isFormatted, sw);
+ }
+ catch (IOException ex) {
+ Assert.shouldNeverReachHere();
+ }
+ return sw.toString();
+ }
+
+ /**
+ * Converts a <code>Geometry</code> to its Well-known Text representation.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ */
+ public void write(Geometry geometry, Writer writer)
+ throws IOException
+ {
+ writeFormatted(geometry, false, writer);
+ }
+
+ /**
+ * Same as <code>write</code>, but with newlines and spaces to make the
+ * well-known text more readable.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ *@return a <Geometry Tagged Text> string (see the OpenGIS Simple
+ * Features Specification), with newlines and spaces
+ */
+ public String writeFormatted(Geometry geometry)
+ {
+ Writer sw = new StringWriter();
+ try {
+ writeFormatted(geometry, true, sw);
+ }
+ catch (IOException ex) {
+ Assert.shouldNeverReachHere();
+ }
+ return sw.toString();
+ }
+ /**
+ * Same as <code>write</code>, but with newlines and spaces to make the
+ * well-known text more readable.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ */
+ public void writeFormatted(Geometry geometry, Writer writer)
+ throws IOException
+ {
+ writeFormatted(geometry, true, writer);
+ }
+ /**
+ * Converts a <code>Geometry</code> to its Well-known Text representation.
+ *
+ *@param geometry a <code>Geometry</code> to process
+ */
+ private void writeFormatted(Geometry geometry, boolean useFormatting, Writer writer)
+ throws IOException
+ {
+ this.useFormatting = useFormatting;
+ formatter = createFormatter(geometry.getPrecisionModel());
+ appendGeometryTaggedText(geometry, 0, writer);
+ }
+
+
+ /**
+ * Converts a <code>Geometry</code> to <Geometry Tagged Text> format,
+ * then appends it to the writer.
+ *
+ *@param geometry the <code>Geometry</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendGeometryTaggedText(Geometry geometry, int level, Writer writer)
+ throws IOException
+ {
+ indent(level, writer);
+
+ if (geometry instanceof Point) {
+ Point point = (Point) geometry;
+ appendPointTaggedText(point.getCoordinate(), level, writer, point.getPrecisionModel());
+ }
+ else if (geometry instanceof LinearRing) {
+ appendLinearRingTaggedText((LinearRing) geometry, level, writer);
+ }
+ else if (geometry instanceof LineString) {
+ appendLineStringTaggedText((LineString) geometry, level, writer);
+ }
+ else if (geometry instanceof Polygon) {
+ appendPolygonTaggedText((Polygon) geometry, level, writer);
+ }
+ else if (geometry instanceof MultiPoint) {
+ appendMultiPointTaggedText((MultiPoint) geometry, level, writer);
+ }
+ else if (geometry instanceof MultiLineString) {
+ appendMultiLineStringTaggedText((MultiLineString) geometry, level, writer);
+ }
+ else if (geometry instanceof MultiPolygon) {
+ appendMultiPolygonTaggedText((MultiPolygon) geometry, level, writer);
+ }
+ else if (geometry instanceof GeometryCollection) {
+ appendGeometryCollectionTaggedText((GeometryCollection) geometry, level, writer);
+ }
+ else {
+ Assert.shouldNeverReachHere("Unsupported Geometry implementation:"
+ + geometry.getClass());
+ }
+ }
+
+ /**
+ * Converts a <code>Coordinate</code> to <Point Tagged Text> format,
+ * then appends it to the writer.
+ *
+ *@param coordinate the <code>Coordinate</code> to process
+ *@param writer the output writer to append to
+ *@param precisionModel the <code>PrecisionModel</code> to use to convert
+ * from a precise coordinate to an external coordinate
+ */
+ private void appendPointTaggedText(Coordinate coordinate, int level, Writer writer,
+ PrecisionModel precisionModel)
+ throws IOException
+ {
+ writer.write("POINT ");
+ appendPointText(coordinate, level, writer, precisionModel);
+ }
+
+ /**
+ * Converts a <code>LineString</code> to <LineString Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param lineString the <code>LineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendLineStringTaggedText(LineString lineString, int level, Writer writer)
+ throws IOException
+ {
+ writer.write("LINESTRING ");
+ appendLineStringText(lineString, level, false, writer);
+ }
+
+ /**
+ * Converts a <code>LinearRing</code> to <LinearRing Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param linearRing the <code>LinearRing</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendLinearRingTaggedText(LinearRing linearRing, int level, Writer writer)
+ throws IOException
+ {
+ writer.write("LINEARRING ");
+ appendLineStringText(linearRing, level, false, writer);
+ }
+
+ /**
+ * Converts a <code>Polygon</code> to <Polygon Tagged Text> format,
+ * then appends it to the writer.
+ *
+ *@param polygon the <code>Polygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendPolygonTaggedText(Polygon polygon, int level, Writer writer)
+ throws IOException
+ {
+ writer.write("POLYGON ");
+ appendPolygonText(polygon, level, false, writer);
+ }
+
+ /**
+ * Converts a <code>MultiPoint</code> to <MultiPoint Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param multipoint the <code>MultiPoint</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPointTaggedText(MultiPoint multipoint, int level, Writer writer)
+ throws IOException
+ {
+ writer.write("MULTIPOINT ");
+ appendMultiPointText(multipoint, level, writer);
+ }
+
+ /**
+ * Converts a <code>MultiLineString</code> to <MultiLineString Tagged
+ * Text> format, then appends it to the writer.
+ *
+ *@param multiLineString the <code>MultiLineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiLineStringTaggedText(MultiLineString multiLineString, int level,
+ Writer writer)
+ throws IOException
+ {
+ writer.write("MULTILINESTRING ");
+ appendMultiLineStringText(multiLineString, level, false, writer);
+ }
+
+ /**
+ * Converts a <code>MultiPolygon</code> to <MultiPolygon Tagged Text>
+ * format, then appends it to the writer.
+ *
+ *@param multiPolygon the <code>MultiPolygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPolygonTaggedText(MultiPolygon multiPolygon, int level, Writer writer)
+ throws IOException
+ {
+ writer.write("MULTIPOLYGON ");
+ appendMultiPolygonText(multiPolygon, level, writer);
+ }
+
+ /**
+ * Converts a <code>GeometryCollection</code> to <GeometryCollection
+ * Tagged Text> format, then appends it to the writer.
+ *
+ *@param geometryCollection the <code>GeometryCollection</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendGeometryCollectionTaggedText(GeometryCollection geometryCollection, int level,
+ Writer writer)
+ throws IOException
+ {
+ writer.write("GEOMETRYCOLLECTION ");
+ appendGeometryCollectionText(geometryCollection, level, writer);
+ }
+
+ /**
+ * Converts a <code>Coordinate</code> to <Point Text> format, then
+ * appends it to the writer.
+ *
+ *@param coordinate the <code>Coordinate</code> to process
+ *@param writer the output writer to append to
+ *@param precisionModel the <code>PrecisionModel</code> to use to convert
+ * from a precise coordinate to an external coordinate
+ */
+ private void appendPointText(Coordinate coordinate, int level, Writer writer,
+ PrecisionModel precisionModel)
+ throws IOException
+ {
+ if (coordinate == null) {
+ writer.write("EMPTY");
+ }
+ else {
+ writer.write("(");
+ appendCoordinate(coordinate, writer);
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Appends the i'th coordinate from the sequence to the writer
+ *
+ * @param seq the <code>CoordinateSequence</code> to process
+ * @param i the index of the coordinate to write
+ * @param writer the output writer to append to
+ */
+ private void appendCoordinate(CoordinateSequence seq, int i, Writer writer)
+ throws IOException
+ {
+ writer.write(writeNumber(seq.getX(i)) + " " + writeNumber(seq.getY(i)));
+ if (outputDimension >= 3 && seq.getDimension() >= 3) {
+ double z = seq.getOrdinate(i, 3);
+ if (! Double.isNaN(z)) {
+ writer.write(" ");
+ writer.write(writeNumber(z));
+ }
+ }
+ }
+
+ /**
+ * Converts a <code>Coordinate</code> to <code><Point></code> format,
+ * then appends it to the writer.
+ *
+ *@param coordinate the <code>Coordinate</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendCoordinate(Coordinate coordinate, Writer writer)
+ throws IOException
+ {
+ writer.write(writeNumber(coordinate.x) + " " + writeNumber(coordinate.y));
+ if (outputDimension >= 3 && ! Double.isNaN(coordinate.z)) {
+ writer.write(" ");
+ writer.write(writeNumber(coordinate.z));
+ }
+ }
+
+ /**
+ * Converts a <code>double</code> to a <code>String</code>, not in scientific
+ * notation.
+ *
+ *@param d the <code>double</code> to convert
+ *@return the <code>double</code> as a <code>String</code>, not in
+ * scientific notation
+ */
+ private String writeNumber(double d) {
+ return formatter.format(d);
+ }
+
+ /**
+ * Converts a <code>LineString</code> to <LineString Text> format, then
+ * appends it to the writer.
+ *
+ *@param lineString the <code>LineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendSequenceText(CoordinateSequence seq, int level, boolean doIndent, Writer writer)
+ throws IOException
+ {
+ if (seq.size() == 0) {
+ writer.write("EMPTY");
+ }
+ else {
+ if (doIndent) indent(level, writer);
+ writer.write("(");
+ for (int i = 0; i < seq.size(); i++) {
+ if (i > 0) {
+ writer.write(", ");
+ if (coordsPerLine > 0
+ && i % coordsPerLine == 0) {
+ indent(level + 1, writer);
+ }
+ }
+ appendCoordinate(seq, i, writer);
+ }
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Converts a <code>LineString</code> to <LineString Text> format, then
+ * appends it to the writer.
+ *
+ *@param lineString the <code>LineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendLineStringText(LineString lineString, int level, boolean doIndent, Writer writer)
+ throws IOException
+ {
+ if (lineString.isEmpty()) {
+ writer.write("EMPTY");
+ }
+ else {
+ if (doIndent) indent(level, writer);
+ writer.write("(");
+ for (int i = 0; i < lineString.getNumPoints(); i++) {
+ if (i > 0) {
+ writer.write(", ");
+ if (coordsPerLine > 0
+ && i % coordsPerLine == 0) {
+ indent(level + 1, writer);
+ }
+ }
+ appendCoordinate(lineString.getCoordinateN(i), writer);
+ }
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Converts a <code>Polygon</code> to <Polygon Text> format, then
+ * appends it to the writer.
+ *
+ *@param polygon the <code>Polygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendPolygonText(Polygon polygon, int level, boolean indentFirst, Writer writer)
+ throws IOException
+ {
+ if (polygon.isEmpty()) {
+ writer.write("EMPTY");
+ }
+ else {
+ if (indentFirst) indent(level, writer);
+ writer.write("(");
+ appendLineStringText(polygon.getExteriorRing(), level, false, writer);
+ for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
+ writer.write(", ");
+ appendLineStringText(polygon.getInteriorRingN(i), level + 1, true, writer);
+ }
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Converts a <code>MultiPoint</code> to <MultiPoint Text> format, then
+ * appends it to the writer.
+ *
+ *@param multiPoint the <code>MultiPoint</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPointText(MultiPoint multiPoint, int level, Writer writer)
+ throws IOException
+ {
+ if (multiPoint.isEmpty()) {
+ writer.write("EMPTY");
+ }
+ else {
+ writer.write("(");
+ for (int i = 0; i < multiPoint.getNumGeometries(); i++) {
+ if (i > 0) {
+ writer.write(", ");
+ indentCoords(i, level + 1, writer);
+ }
+ writer.write("(");
+ appendCoordinate(((Point) multiPoint.getGeometryN(i)).getCoordinate(), writer);
+ writer.write(")");
+ }
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Converts a <code>MultiLineString</code> to <MultiLineString Text>
+ * format, then appends it to the writer.
+ *
+ *@param multiLineString the <code>MultiLineString</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiLineStringText(MultiLineString multiLineString, int level, boolean indentFirst,
+ Writer writer)
+ throws IOException
+ {
+ if (multiLineString.isEmpty()) {
+ writer.write("EMPTY");
+ }
+ else {
+ int level2 = level;
+ boolean doIndent = indentFirst;
+ writer.write("(");
+ for (int i = 0; i < multiLineString.getNumGeometries(); i++) {
+ if (i > 0) {
+ writer.write(", ");
+ level2 = level + 1;
+ doIndent = true;
+ }
+ appendLineStringText((LineString) multiLineString.getGeometryN(i), level2, doIndent, writer);
+ }
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Converts a <code>MultiPolygon</code> to <MultiPolygon Text> format,
+ * then appends it to the writer.
+ *
+ *@param multiPolygon the <code>MultiPolygon</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendMultiPolygonText(MultiPolygon multiPolygon, int level, Writer writer)
+ throws IOException
+ {
+ if (multiPolygon.isEmpty()) {
+ writer.write("EMPTY");
+ }
+ else {
+ int level2 = level;
+ boolean doIndent = false;
+ writer.write("(");
+ for (int i = 0; i < multiPolygon.getNumGeometries(); i++) {
+ if (i > 0) {
+ writer.write(", ");
+ level2 = level + 1;
+ doIndent = true;
+ }
+ appendPolygonText((Polygon) multiPolygon.getGeometryN(i), level2, doIndent, writer);
+ }
+ writer.write(")");
+ }
+ }
+
+ /**
+ * Converts a <code>GeometryCollection</code> to <GeometryCollectionText>
+ * format, then appends it to the writer.
+ *
+ *@param geometryCollection the <code>GeometryCollection</code> to process
+ *@param writer the output writer to append to
+ */
+ private void appendGeometryCollectionText(GeometryCollection geometryCollection, int level,
+ Writer writer)
+ throws IOException
+ {
+ if (geometryCollection.isEmpty()) {
+ writer.write("EMPTY");
+ }
+ else {
+ int level2 = level;
+ writer.write("(");
+ for (int i = 0; i < geometryCollection.getNumGeometries(); i++) {
+ if (i > 0) {
+ writer.write(", ");
+ level2 = level + 1;
+ }
+ appendGeometryTaggedText(geometryCollection.getGeometryN(i), level2, writer);
+ }
+ writer.write(")");
+ }
+ }
+
+ private void indentCoords(int coordIndex, int level, Writer writer)
+ throws IOException
+ {
+ if (coordsPerLine <= 0
+ || coordIndex % coordsPerLine != 0)
+ return;
+ indent(level, writer);
+ }
+
+ private void indent(int level, Writer writer)
+ throws IOException
+ {
+ if (! useFormatting || level <= 0)
+ return;
+ writer.write("\n");
+ for (int i = 0; i < level; i++) {
+ writer.write(indentTabStr);
+ }
+ }
+
+
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLConstants.java b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLConstants.java
new file mode 100644
index 0000000..7ef26ad
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLConstants.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+/**
+ * Various constant strings associated with GML format.
+ */
+final public class GMLConstants{
+
+ // Namespace constants
+ public static final String GML_NAMESPACE = "http://www.opengis.net/gml";
+ public static final String GML_PREFIX = "gml";
+
+ // Source Coordinate System
+ public static final String GML_ATTR_SRSNAME = "srsName";
+
+ // GML associative types
+ public static final String GML_GEOMETRY_MEMBER = "geometryMember";
+ public static final String GML_POINT_MEMBER = "pointMember";
+ public static final String GML_POLYGON_MEMBER = "polygonMember";
+ public static final String GML_LINESTRING_MEMBER = "lineStringMember";
+ public static final String GML_OUTER_BOUNDARY_IS = "outerBoundaryIs";
+ public static final String GML_INNER_BOUNDARY_IS = "innerBoundaryIs";
+
+ // Primitive Geometries
+ public static final String GML_POINT = "Point";
+ public static final String GML_LINESTRING = "LineString";
+ public static final String GML_LINEARRING = "LinearRing";
+ public static final String GML_POLYGON = "Polygon";
+ public static final String GML_BOX = "Box";
+
+ // Aggregate Geometries
+ public static final String GML_MULTI_GEOMETRY = "MultiGeometry";
+ public static final String GML_MULTI_POINT = "MultiPoint";
+ public static final String GML_MULTI_LINESTRING = "MultiLineString";
+ public static final String GML_MULTI_POLYGON = "MultiPolygon";
+
+ // Coordinates
+ public static final String GML_COORDINATES = "coordinates";
+ public static final String GML_COORD = "coord";
+ public static final String GML_COORD_X = "X";
+ public static final String GML_COORD_Y = "Y";
+ public static final String GML_COORD_Z = "Z";
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLHandler.java b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLHandler.java
new file mode 100644
index 0000000..1c73179
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLHandler.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Stack;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.gml2.GeometryStrategies.ParseStrategy;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.DefaultHandler;
+
+
+/**
+ * A SAX {@link DefaultHandler} which builds {@link Geometry}s
+ * from GML2-formatted geometries.
+ * An XML parser can delegate SAX events to this handler
+ * to parse and building Geometrys.
+ * <p>
+ * This handler currently ignores both namespaces and prefixes.
+ *
+ * Hints:
+ * <ul>
+ * <li>If your parent handler is a DefaultHandler register the parent handler to receive the errors and locator calls.
+ * <li>Use {@link GeometryStrategies#findStrategy(String, String)} to help check for applicability
+ * </ul>
+ *
+ * @see DefaultHandler
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class GMLHandler extends DefaultHandler {
+
+ /**
+ * This class is intended to log the SAX activity within a given element until its termination.
+ * At this time, a new object of value is created and passed to the parent.
+ * An object of value is typically either java.lang.* or a JTS Geometry
+ * This class is not intended for use outside this distribution,
+ * and may change in subsequent versions.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+ static class Handler {
+ protected Attributes attrs = null;
+
+ protected ParseStrategy strategy;
+
+ /**
+ * @param strategy
+ * @param attributes Nullable
+ */
+ public Handler(ParseStrategy strategy, Attributes attributes) {
+ if (attributes != null)
+ this.attrs = new AttributesImpl(attributes);
+ this.strategy = strategy;
+ }
+
+ protected StringBuffer text = null;
+
+ /**
+ * Caches text for the future
+ * @param str
+ */
+ public void addText(String str) {
+ if (text == null)
+ text = new StringBuffer();
+ text.append(str);
+ }
+
+ protected List children = null;
+
+ /**
+ * Store param for the future
+ *
+ * @param obj
+ */
+ public void keep(Object obj) {
+ if (children == null)
+ children = new LinkedList();
+ children.add(obj);
+
+ }
+
+ /**
+ * @param gf GeometryFactory
+ * @return Parsed Object
+ * @throws SAXException
+ */
+ public Object create(GeometryFactory gf) throws SAXException {
+ return strategy.parse(this, gf);
+ }
+ }
+
+ private Stack stack = new Stack();
+
+ private ErrorHandler delegate = null;
+
+ private GeometryFactory gf = null;
+
+ /**
+ * Creates a new handler.
+ * Allows the user to specify a delegate object for error / warning messages.
+ * If the delegate also implements ContentHandler then the document Locator will be passed on.
+ *
+ * @param gf Geometry Factory
+ * @param delegate Nullable
+ *
+ * @see ErrorHandler
+ * @see ContentHandler
+ * @see ContentHandler#setDocumentLocator(org.xml.sax.Locator)
+ * @see org.xml.sax.Locator
+ *
+ */
+ public GMLHandler(GeometryFactory gf, ErrorHandler delegate) {
+ this.delegate = delegate;
+ this.gf = gf;
+ stack.push(new Handler(null, null));
+ }
+
+ /**
+ * Tests whether this handler has completed parsing
+ * a geometry.
+ * If this is the case, {@link #getGeometry()} can be called
+ * to get the value of the parsed geometry.
+ *
+ * @return if the parsing of the geometry is complete
+ */
+ public boolean isGeometryComplete()
+ {
+ if (stack.size() > 1)
+ return false;
+ // top level node on stack needs to have at least one child
+ Handler h = (Handler) stack.peek();
+ if (h.children.size() < 1)
+ return false;
+ return true;
+
+ }
+
+ /**
+ * Gets the geometry parsed by this handler.
+ * This method should only be called AFTER the parser has completed execution
+ *
+ * @return the parsed Geometry, or a GeometryCollection if more than one geometry was parsed
+ * @throws IllegalStateException if called before the parse is complete
+ */
+ public Geometry getGeometry() {
+ if (stack.size() == 1) {
+ Handler h = (Handler) stack.peek();
+ if (h.children.size() == 1)
+ return (Geometry) h.children.get(0);
+ return gf.createGeometryCollection(
+ (Geometry[]) h.children.toArray(new Geometry[stack.size()]));
+ }
+ throw new IllegalStateException(
+ "Parse did not complete as expected, there are " + stack.size()
+ + " elements on the Stack");
+ }
+
+ //////////////////////////////////////////////
+ // Parsing Methods
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
+ */
+ public void characters(char[] ch, int start, int length) throws SAXException {
+ if (!stack.isEmpty())
+ ((Handler) stack.peek()).addText(new String(ch, start, length));
+ }
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#ignorableWhitespace(char[], int, int)
+ */
+ public void ignorableWhitespace(char[] ch, int start, int length)
+ throws SAXException {
+ if (!stack.isEmpty())
+ ((Handler) stack.peek()).addText(" ");
+ }
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
+ */
+ public void endElement(String uri, String localName, String qName)
+ throws SAXException {
+ Handler thisAction = (Handler) stack.pop();
+ ((Handler) stack.peek()).keep(thisAction.create(gf));
+ }
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+ */
+ public void startElement(String uri, String localName, String qName,
+ Attributes attributes) throws SAXException {
+ // create a handler
+ ParseStrategy ps = GeometryStrategies.findStrategy(uri, localName);
+ if (ps == null) {
+ String qn = qName.substring(qName.indexOf(':') + 1, qName.length());
+ ps = GeometryStrategies.findStrategy(null, qn);
+ }
+ Handler h = new Handler(ps, attributes);
+ // and add it to the stack
+ stack.push(h);
+ }
+
+ //////////////////////////////////////////////
+ // Logging Methods
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#setDocumentLocator(org.xml.sax.Locator)
+ */
+ public void setDocumentLocator(Locator locator) {
+ this.locator = locator;
+ if (delegate != null && delegate instanceof ContentHandler)
+ ((ContentHandler) delegate).setDocumentLocator(locator);
+
+ }
+
+ private Locator locator = null;
+
+ protected Locator getDocumentLocator() {
+ return locator;
+ }
+
+ //////////////////////////////////////////////
+ // ERROR Methods
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#fatalError(org.xml.sax.SAXParseException)
+ */
+ public void fatalError(SAXParseException e) throws SAXException {
+ if (delegate != null)
+ delegate.fatalError(e);
+ else
+ super.fatalError(e);
+ }
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#error(org.xml.sax.SAXParseException)
+ */
+ public void error(SAXParseException e) throws SAXException {
+ if (delegate != null)
+ delegate.error(e);
+ else
+ super.error(e);
+ }
+
+ /**
+ * @see org.xml.sax.helpers.DefaultHandler#warning(org.xml.sax.SAXParseException)
+ */
+ public void warning(SAXParseException e) throws SAXException {
+ if (delegate != null)
+ delegate.warning(e);
+ else
+ super.warning(e);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLReader.java b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLReader.java
new file mode 100644
index 0000000..5a99bb8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLReader.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+
+/**
+ * Reads a GML2 geometry from an XML fragment into a {@link Geometry}.
+ * <p>
+ * An example of the GML2 format handled is:
+ * <pre>
+ * <LineString>
+ * <coordinates>
+ * 24824.045318333192,38536.15071012041
+ * 26157.378651666528,37567.42733944659 26666.666,36000.0
+ * 26157.378651666528,34432.57266055341
+ * 24824.045318333192,33463.84928987959
+ * 23175.954681666804,33463.84928987959
+ * 21842.621348333472,34432.57266055341 21333.333,36000.0
+ * 21842.621348333472,37567.42733944659
+ * 23175.954681666808,38536.15071012041
+ * </coordinates>
+ * </LineString>
+ * </pre>
+ *
+ * The reader ignores namespace prefixes,
+ * and disables both the validation and namespace options on the <tt>SAXParser</tt>.
+ * This class requires the presence of a SAX Parser available via the
+ * {@link javax.xml.parsers.SAXParserFactory#newInstance()}
+ * method.
+ * <p>
+ * A specification of the GML XML format
+ * can be found at the OGC web site: <a href='http://www.opengeospatial.org/'>http://www.opengeospatial.org/</a>.
+ * <p>
+ * It is the caller's responsibility to ensure that the supplied {@link PrecisionModel}
+ * matches the precision of the incoming data.
+ * If a lower precision for the data is required, a subsequent
+ * process must be run on the data to reduce its precision.
+ * <p>
+ * To parse and build geometry directly from a SAX stream, see {@link GMLHandler}.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ *
+ * @see GMLHandler
+ */
+public class GMLReader
+{
+
+ /**
+ * Reads a GML2 Geometry from a <tt>String</tt> into a single {@link Geometry}
+ *
+ * If a collection of geometries is found, a {@link GeometryCollection} is returned.
+ *
+ * @param gml The GML String to parse
+ * @param geometryFactory When null, a default will be used.
+ * @return the resulting JTS Geometry
+ *
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ *
+ * @see #read(Reader, GeometryFactory)
+ */
+ public Geometry read(String gml, GeometryFactory geometryFactory) throws SAXException, IOException, ParserConfigurationException{
+ return read(new StringReader(gml),geometryFactory);
+ }
+
+ /**
+ * Reads a GML2 Geometry from a {@link Reader} into a single {@link Geometry}
+ *
+ * If a collection of Geometries is found, a {@link GeometryCollection} is returned.
+ *
+ * @param reader The input source
+ * @param geometryFactory When null, a default will be used.
+ * @return The resulting JTS Geometry
+ * @throws SAXException
+ * @throws IOException
+ */
+ public Geometry read(Reader reader, GeometryFactory geometryFactory) throws SAXException, IOException, ParserConfigurationException{
+ SAXParserFactory fact = SAXParserFactory.newInstance();
+
+ fact.setNamespaceAware(false);
+ fact.setValidating(false);
+
+ SAXParser parser = fact.newSAXParser();
+
+ if(geometryFactory == null)
+ geometryFactory = new GeometryFactory();
+
+ GMLHandler gh = new GMLHandler(geometryFactory,null);
+ parser.parse(new InputSource(reader), (DefaultHandler)gh);
+
+ return gh.getGeometry();
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLWriter.java b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLWriter.java
new file mode 100644
index 0000000..be41101
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLWriter.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * Writes {@link Geometry}s as XML fragments in GML2 format.
+ * Allows specifying the XML prefix, namespace and srsName
+ * of the emitted GML.
+ * Also allows adding custom root elements
+ * to support GML extensions such as KML.
+ * With appropriate settings for prefix (none) and custom root elements
+ * this class can be used to write out geometry in KML format.
+ * <p>
+ * An example of the output that can be generated is:
+ *
+ * <pre>
+ * <gml:LineString xmlns:gml='http://www.opengis.net/gml' srsName='foo'>
+ * <gml:coordinates>
+ * 6.03,8.17 7.697,6.959 8.333,5.0 7.697,3.041 6.03,1.83 3.97,1.83 2.303,3.041 1.667,5.0 2.303,6.959 3.97,8.17
+ * </gml:coordinates>
+ * </gml:LineString>
+ * </pre>
+ *
+ * <p>
+ * This class does not rely on any external XML libraries.
+ *
+ * @author David Zwiers, Vivid Solutions
+ * @author Martin Davis
+ */
+public class GMLWriter {
+ private final String INDENT = " ";
+
+ private int startingIndentIndex = 0;
+
+ private int maxCoordinatesPerLine = 10;
+
+ private boolean emitNamespace = false;
+
+ private boolean isRootTag = false;
+
+ private String prefix = GMLConstants.GML_PREFIX;
+ private String namespace = GMLConstants.GML_NAMESPACE;
+ private String srsName = null;
+
+ private String[] customElements = null;
+
+ /**
+ * Creates a writer which outputs GML with default settings.
+ * The defaults are:
+ * <ul>
+ * <li>the namespace prefix is <tt>gml:</tt>
+ * <li>no namespace prefix declaration is written
+ * <li>no <tt>srsName</tt> attribute is written
+ * </ul>
+ */
+ public GMLWriter() {
+ }
+
+ /**
+ * Creates a writer which may emit the GML namespace prefix
+ * declaration in the geometry root element.
+ *
+ * @param emitNamespace true if the GML namespace prefix declaration should be written
+ * in the geometry root element
+ */
+ public GMLWriter(boolean emitNamespace) {
+ this.setNamespace(emitNamespace);
+ }
+
+ /**
+ * Specifies the namespace prefix to write on each GML tag.
+ * A null or blank prefix may be used to indicate no prefix.
+ * <p>
+ * The default is to write <tt>gml:</tt> as the namespace prefix.
+ *
+ * @param prefix the namespace prefix to use (<tt>null</tt> or blank if none)
+ */
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ /**
+ * Sets the value of the <tt>srsName</tt> attribute
+ * to be written into the root geometry tag.
+ * If the value is <tt>null</tt> or blank no srsName attribute will be written.
+ * The provided value must be a valid XML attribute value
+ * - it will not be XML-escaped.
+ * <p>
+ * The default is not to write the <tt>srsName</tt> attribute.
+ *
+ * @param srsName the srsName attribute value
+ */
+ public void setSrsName(String srsName) {
+ this.srsName = srsName;
+ }
+
+ /**
+ * Determines whether a GML namespace declaration will be written in the
+ * opening tag of geometries. Useful in XML-aware environments which
+ * parse the geometries before use, such as XSLT.
+ *
+ * @param emitNamespace true if the GML namespace prefix declaration
+ * should be written in the root geometry element
+ */
+ public void setNamespace(boolean emitNamespace) {
+ this.emitNamespace = emitNamespace;
+ }
+
+ /**
+ * Specifies a list of custom elements
+ * which are written after the opening tag
+ * of the root element.
+ * The text contained in the string sequence should form valid XML markup.
+ * The specified strings are written one per line immediately after
+ * the root geometry tag line.
+ * <p>
+ * For instance, this is useful for adding KML-specific geometry parameters
+ * such as <tt><extrude></tt>
+ *
+ * @param customElements a list of the custom element strings, or null if none
+ */
+ public void setCustomElements(String[] customElements) {
+ this.customElements = customElements;
+ }
+
+ /**
+ * Sets the starting column index for pretty printing
+ *
+ * @param indent
+ */
+ public void setStartingIndentIndex(int indent) {
+ if (indent < 0)
+ indent = 0;
+ startingIndentIndex = indent;
+ }
+
+ /**
+ * Sets the number of coordinates printed per line.
+ *
+ * @param num
+ */
+ public void setMaxCoordinatesPerLine(int num) {
+ if (num < 1)
+ throw new IndexOutOfBoundsException(
+ "Invalid coordinate count per line, must be > 0");
+ maxCoordinatesPerLine = num;
+ }
+
+ /**
+ * Writes a {@link Geometry} in GML2 format to a String.
+ *
+ * @param geom
+ * @return String GML2 Encoded Geometry
+ */
+ public String write(Geometry geom)
+ {
+ StringWriter writer = new StringWriter();
+ try {
+ write(geom, writer);
+ }
+ catch (IOException ex) {
+ Assert.shouldNeverReachHere();
+ }
+ return writer.toString();
+ }
+
+ /**
+ * Writes a {@link Geometry} in GML2 format into a {@link Writer}.
+ *
+ * @param geom Geometry to encode
+ * @param writer Stream to encode to.
+ * @throws IOException
+ */
+ public void write(Geometry geom, Writer writer) throws IOException {
+ write(geom, writer, startingIndentIndex);
+ }
+
+ private void write(Geometry geom, Writer writer, int level)
+ throws IOException
+ {
+ isRootTag = true;
+ if (geom instanceof Point) {
+ writePoint((Point) geom, writer, level);
+ } else if (geom instanceof LineString) {
+ writeLineString((LineString) geom, writer, level);
+ } else if (geom instanceof Polygon) {
+ writePolygon((Polygon) geom, writer, level);
+ } else if (geom instanceof MultiPoint) {
+ writeMultiPoint((MultiPoint) geom, writer, level);
+ } else if (geom instanceof MultiLineString) {
+ writeMultiLineString((MultiLineString) geom, writer, level);
+ } else if (geom instanceof MultiPolygon) {
+ writeMultiPolygon((MultiPolygon) geom, writer, level);
+ } else if (geom instanceof GeometryCollection) {
+ writeGeometryCollection((GeometryCollection) geom, writer,
+ startingIndentIndex);
+ } else {
+ throw new IllegalArgumentException("Unhandled geometry type: "
+ + geom.getGeometryType());
+ }
+ writer.flush();
+ }
+
+ // <gml:Point><gml:coordinates>1195156.78946687,382069.533723461</gml:coordinates></gml:Point>
+ private void writePoint(Point p, Writer writer, int level) throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_POINT, p, writer);
+
+ write(new Coordinate[] { p.getCoordinate() }, writer, level + 1);
+
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_POINT, writer);
+ }
+
+ //<gml:LineString><gml:coordinates>1195123.37289257,381985.763974674 1195120.22369473,381964.660533343 1195118.14929823,381942.597718511</gml:coordinates></gml:LineString>
+ private void writeLineString(LineString ls, Writer writer, int level)
+ throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_LINESTRING, ls, writer);
+
+ write(ls.getCoordinates(), writer, level + 1);
+
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_LINESTRING, writer);
+ }
+
+ //<gml:LinearRing><gml:coordinates>1226890.26761027,1466433.47430292 1226880.59239079,1466427.03208053...></coordinates></gml:LinearRing>
+ private void writeLinearRing(LinearRing lr, Writer writer, int level)
+ throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_LINEARRING, lr, writer);
+
+ write(lr.getCoordinates(), writer, level + 1);
+
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_LINEARRING, writer);
+ }
+
+ private void writePolygon(Polygon p, Writer writer, int level)
+ throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_POLYGON, p, writer);
+
+ startLine(level + 1, writer);
+ startGeomTag(GMLConstants.GML_OUTER_BOUNDARY_IS, null, writer);
+
+ writeLinearRing((LinearRing) p.getExteriorRing(), writer, level + 2);
+
+ startLine(level + 1, writer);
+ endGeomTag(GMLConstants.GML_OUTER_BOUNDARY_IS, writer);
+
+ for (int t = 0; t < p.getNumInteriorRing(); t++) {
+ startLine(level + 1, writer);
+ startGeomTag(GMLConstants.GML_INNER_BOUNDARY_IS, null, writer);
+
+ writeLinearRing((LinearRing) p.getInteriorRingN(t), writer, level + 2);
+
+ startLine(level + 1, writer);
+ endGeomTag(GMLConstants.GML_INNER_BOUNDARY_IS, writer);
+ }
+
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_POLYGON, writer);
+ }
+
+ private void writeMultiPoint(MultiPoint mp, Writer writer, int level)
+ throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_MULTI_POINT, mp, writer);
+
+ for (int t = 0; t < mp.getNumGeometries(); t++) {
+ startLine(level + 1, writer);
+ startGeomTag(GMLConstants.GML_POINT_MEMBER, null, writer);
+
+ writePoint((Point) mp.getGeometryN(t), writer, level + 2);
+
+ startLine(level + 1, writer);
+ endGeomTag(GMLConstants.GML_POINT_MEMBER, writer);
+ }
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_MULTI_POINT, writer);
+ }
+
+ private void writeMultiLineString(MultiLineString mls, Writer writer,
+ int level) throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_MULTI_LINESTRING, mls, writer);
+
+ for (int t = 0; t < mls.getNumGeometries(); t++) {
+ startLine(level + 1, writer);
+ startGeomTag(GMLConstants.GML_LINESTRING_MEMBER, null, writer);
+
+ writeLineString((LineString) mls.getGeometryN(t), writer, level + 2);
+
+ startLine(level + 1, writer);
+ endGeomTag(GMLConstants.GML_LINESTRING_MEMBER, writer);
+ }
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_MULTI_LINESTRING, writer);
+ }
+
+ private void writeMultiPolygon(MultiPolygon mp, Writer writer, int level)
+ throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_MULTI_POLYGON, mp, writer);
+
+ for (int t = 0; t < mp.getNumGeometries(); t++) {
+ startLine(level + 1, writer);
+ startGeomTag(GMLConstants.GML_POLYGON_MEMBER, null, writer);
+
+ writePolygon((Polygon) mp.getGeometryN(t), writer, level + 2);
+
+ startLine(level + 1, writer);
+ endGeomTag(GMLConstants.GML_POLYGON_MEMBER, writer);
+ }
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_MULTI_POLYGON, writer);
+ }
+
+ private void writeGeometryCollection(GeometryCollection gc, Writer writer,
+ int level) throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_MULTI_GEOMETRY, gc, writer);
+
+ for (int t = 0; t < gc.getNumGeometries(); t++) {
+ startLine(level + 1, writer);
+ startGeomTag(GMLConstants.GML_GEOMETRY_MEMBER, null, writer);
+
+ write(gc.getGeometryN(t), writer, level + 2);
+
+ startLine(level + 1, writer);
+ endGeomTag(GMLConstants.GML_GEOMETRY_MEMBER, writer);
+ }
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_MULTI_GEOMETRY, writer);
+ }
+
+ private static final String coordinateSeparator = ",";
+
+ private static final String tupleSeparator = " ";
+
+ /**
+ * Takes a list of coordinates and converts it to GML.<br>
+ * 2d and 3d aware.
+ *
+ * @param coords array of coordinates
+ * @throws IOException
+ */
+ private void write(Coordinate[] coords, Writer writer, int level)
+ throws IOException {
+ startLine(level, writer);
+ startGeomTag(GMLConstants.GML_COORDINATES, null, writer);
+
+ int dim = 2;
+
+ if (coords.length > 0) {
+ if (!(Double.isNaN(coords[0].z)))
+ dim = 3;
+ }
+
+ boolean isNewLine = true;
+ for (int i = 0; i < coords.length; i++) {
+ if (isNewLine) {
+ startLine(level + 1, writer);
+ isNewLine = false;
+ }
+ if (dim == 2) {
+ writer.write("" + coords[i].x);
+ writer.write(coordinateSeparator);
+ writer.write("" + coords[i].y);
+ } else if (dim == 3) {
+ writer.write("" + coords[i].x);
+ writer.write(coordinateSeparator);
+ writer.write("" + coords[i].y);
+ writer.write(coordinateSeparator);
+ writer.write("" + coords[i].z);
+ }
+ writer.write(tupleSeparator);
+
+ // break output lines to prevent them from getting too long
+ if ((i + 1) % maxCoordinatesPerLine == 0 && i < coords.length - 1) {
+ writer.write("\n");
+ isNewLine = true;
+ }
+ }
+ if (!isNewLine)
+ writer.write("\n");
+
+ startLine(level, writer);
+ endGeomTag(GMLConstants.GML_COORDINATES, writer);
+ }
+
+ private void startLine(int level, Writer writer) throws IOException {
+ for (int i = 0; i < level; i++)
+ writer.write(INDENT);
+ }
+
+ private void startGeomTag(String geometryName, Geometry g, Writer writer)
+ throws IOException {
+ writer.write("<"
+ + ((prefix == null || "".equals(prefix)) ? "" : prefix + ":"));
+ writer.write(geometryName);
+ writeAttributes(g, writer);
+ writer.write(">\n");
+ writeCustomElements(g, writer);
+ isRootTag = false;
+ }
+
+ private void writeAttributes(Geometry geom, Writer writer) throws IOException {
+ if (geom == null)
+ return;
+ if (! isRootTag)
+ return;
+
+ if (emitNamespace) {
+ writer.write(" xmlns"
+ + ((prefix == null || "".equals(prefix)) ? "" : ":"+prefix )
+ + "='" + namespace + "'");
+ }
+ if (srsName != null && srsName.length() > 0) {
+ writer.write(" " + GMLConstants.GML_ATTR_SRSNAME + "='" + srsName + "'");
+ // MD - obsoleted
+// writer.write(geom.getSRID() + "");
+ }
+ }
+
+ private void writeCustomElements(Geometry geom, Writer writer) throws IOException {
+ if (geom == null) return;
+ if (! isRootTag) return;
+ if (customElements == null) return;
+
+ for (int i = 0; i < customElements.length; i++) {
+ writer.write(customElements[i]);
+ writer.write("\n");
+ }
+ }
+
+ private void endGeomTag(String geometryName, Writer writer)
+ throws IOException {
+ writer.write("</" + prefix());
+ writer.write(geometryName);
+ writer.write(">\n");
+ }
+
+ private String prefix()
+ {
+ if (prefix == null || prefix.length() == 0)
+ return "";
+ return prefix + ":";
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/gml2/GeometryStrategies.java b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GeometryStrategies.java
new file mode 100644
index 0000000..d54977b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GeometryStrategies.java
@@ -0,0 +1,527 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.WeakHashMap;
+import java.util.regex.Pattern;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.io.gml2.GMLHandler.Handler;
+import org.locationtech.jts.util.StringUtil;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Container for GML2 Geometry parsing strategies which can be represented in JTS.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class GeometryStrategies{
+
+ /**
+ * This set of strategies is not expected to be used directly outside of this distribution.
+ *
+ * The implementation of this class are intended to be used as static function points in C. These strategies should be associated with an element when the element begins. The strategy is utilized at the end of the element to create an object of value to the user.
+ *
+ * In this case all the objects are either java.lang.* or JTS Geometry objects
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+ static interface ParseStrategy{
+ /**
+ * @param arg Value to interpret
+ * @param gf GeometryFactory
+ * @return The interpreted value
+ * @throws SAXException
+ */
+ Object parse(Handler arg, GeometryFactory gf) throws SAXException;
+ }
+
+ private static HashMap strategies = loadStrategies();
+ private static HashMap loadStrategies(){
+ HashMap strats = new HashMap();
+
+ // point
+ strats.put(GMLConstants.GML_POINT.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()!=1)
+ throw new SAXException("Cannot create a point without exactly one coordinate");
+
+ int srid = getSrid(arg.attrs,gf.getSRID());
+
+ Object c = arg.children.get(0);
+ Point p = null;
+ if(c instanceof Coordinate){
+ p = gf.createPoint((Coordinate)c);
+ }else{
+ p = gf.createPoint((CoordinateSequence)c);
+ }
+ if(p.getSRID()!=srid)
+ p.setSRID(srid);
+
+ return p;
+ }
+ });
+
+ // linestring
+ strats.put(GMLConstants.GML_LINESTRING.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1)
+ throw new SAXException("Cannot create a linestring without atleast two coordinates or one coordinate sequence");
+
+ int srid = getSrid(arg.attrs,gf.getSRID());
+
+ LineString ls = null;
+ if(arg.children.size() == 1){
+ // coord set
+ try{
+ CoordinateSequence cs = (CoordinateSequence) arg.children.get(0);
+ ls = gf.createLineString(cs);
+ }catch(ClassCastException e){
+ throw new SAXException("Cannot create a linestring without atleast two coordinates or one coordinate sequence",e);
+ }
+ }else{
+ try{
+ Coordinate[] coords = (Coordinate[]) arg.children.toArray(new Coordinate[arg.children.size()]);
+ ls = gf.createLineString(coords);
+ }catch(ClassCastException e){
+ throw new SAXException("Cannot create a linestring without atleast two coordinates or one coordinate sequence",e);
+ }
+ }
+
+ if(ls.getSRID()!=srid)
+ ls.setSRID(srid);
+
+ return ls;
+ }
+ });
+
+ // linearring
+ strats.put(GMLConstants.GML_LINEARRING.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()!=1 && arg.children.size()<4)
+ throw new SAXException("Cannot create a linear ring without atleast four coordinates or one coordinate sequence");
+
+ int srid = getSrid(arg.attrs,gf.getSRID());
+
+ LinearRing ls = null;
+ if(arg.children.size() == 1){
+ // coord set
+ try{
+ CoordinateSequence cs = (CoordinateSequence) arg.children.get(0);
+ ls = gf.createLinearRing(cs);
+ }catch(ClassCastException e){
+ throw new SAXException("Cannot create a linear ring without atleast four coordinates or one coordinate sequence",e);
+ }
+ }else{
+ try{
+ Coordinate[] coords = (Coordinate[]) arg.children.toArray(new Coordinate[arg.children.size()]);
+ ls = gf.createLinearRing(coords);
+ }catch(ClassCastException e){
+ throw new SAXException("Cannot create a linear ring without atleast four coordinates or one coordinate sequence",e);
+ }
+ }
+
+ if(ls.getSRID()!=srid)
+ ls.setSRID(srid);
+
+ return ls;
+ }
+ });
+
+ // polygon
+ strats.put(GMLConstants.GML_POLYGON.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1)
+ throw new SAXException("Cannot create a polygon without atleast one linear ring");
+
+ int srid = getSrid(arg.attrs,gf.getSRID());
+
+ LinearRing outer = (LinearRing) arg.children.get(0); // will be the first
+ List t = arg.children.size()>1?arg.children.subList(1,arg.children.size()):null;
+ LinearRing[] inner = t==null?null:(LinearRing[]) t.toArray(new LinearRing[t.size()]);
+
+ Polygon p = gf.createPolygon(outer,inner);
+
+ if(p.getSRID()!=srid)
+ p.setSRID(srid);
+
+ return p;
+ }
+ });
+
+ // box
+ strats.put(GMLConstants.GML_BOX.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1 || arg.children.size()>2)
+ throw new SAXException("Cannot create a box without either two coords or one coordinate sequence");
+
+// int srid = getSrid(arg.attrs,gf.getSRID());
+
+ Envelope box = null;
+ if(arg.children.size() == 1){
+ CoordinateSequence cs = (CoordinateSequence) arg.children.get(0);
+ box = cs.expandEnvelope(new Envelope());
+ }else{
+ box = new Envelope((Coordinate)arg.children.get(0),(Coordinate)arg.children.get(1));
+ }
+
+ return box;
+ }
+ });
+
+ // multi-point
+ strats.put(GMLConstants.GML_MULTI_POINT.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1)
+ throw new SAXException("Cannot create a multi-point without atleast one point");
+
+ int srid = getSrid(arg.attrs,gf.getSRID());
+
+ Point[] pts = (Point[]) arg.children.toArray(new Point[arg.children.size()]);
+
+ MultiPoint mp = gf.createMultiPoint(pts);
+
+ if(mp.getSRID()!=srid)
+ mp.setSRID(srid);
+
+ return mp;
+ }
+ });
+
+ // multi-linestring
+ strats.put(GMLConstants.GML_MULTI_LINESTRING.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1)
+ throw new SAXException("Cannot create a multi-linestring without atleast one linestring");
+
+ int srid = getSrid(arg.attrs,gf.getSRID());
+
+ LineString[] lns = (LineString[]) arg.children.toArray(new LineString[arg.children.size()]);
+
+ MultiLineString mp = gf.createMultiLineString(lns);
+
+ if(mp.getSRID()!=srid)
+ mp.setSRID(srid);
+
+ return mp;
+ }
+ });
+
+ // multi-poly
+ strats.put(GMLConstants.GML_MULTI_POLYGON.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1)
+ throw new SAXException("Cannot create a multi-polygon without atleast one polygon");
+
+ int srid = getSrid(arg.attrs,gf.getSRID());
+
+ Polygon[] plys = (Polygon[]) arg.children.toArray(new Polygon[arg.children.size()]);
+
+ MultiPolygon mp = gf.createMultiPolygon(plys);
+
+ if(mp.getSRID()!=srid)
+ mp.setSRID(srid);
+
+ return mp;
+ }
+ });
+
+ // multi-geom
+ strats.put(GMLConstants.GML_MULTI_GEOMETRY.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1)
+ throw new SAXException("Cannot create a multi-polygon without atleast one geometry");
+
+ Geometry[] geoms = (Geometry[]) arg.children.toArray(new Geometry[arg.children.size()]);
+
+ GeometryCollection gc = gf.createGeometryCollection(geoms);
+
+ return gc;
+ }
+ });
+
+ // coordinates
+ strats.put(GMLConstants.GML_COORDINATES.toLowerCase(),new ParseStrategy(){
+
+ private WeakHashMap patterns = new WeakHashMap();
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.text == null || "".equals(arg.text))
+ throw new SAXException("Cannot create a coordinate sequence without text to parse");
+
+ String decimal = ".";
+ String coordSeperator = ",";
+ String toupleSeperator = " ";
+
+ // get overides from coordinates
+ if(arg.attrs.getIndex("decimal")>=0)
+ decimal = arg.attrs.getValue("decimal");
+ else if(arg.attrs.getIndex(GMLConstants.GML_NAMESPACE,"decimal")>=0)
+ decimal = arg.attrs.getValue(GMLConstants.GML_NAMESPACE,"decimal");
+
+ if(arg.attrs.getIndex("cs")>=0)
+ coordSeperator = arg.attrs.getValue("cs");
+ else if(arg.attrs.getIndex(GMLConstants.GML_NAMESPACE,"cs")>=0)
+ coordSeperator = arg.attrs.getValue(GMLConstants.GML_NAMESPACE,"cs");
+
+ if(arg.attrs.getIndex("ts")>=0)
+ toupleSeperator = arg.attrs.getValue("ts");
+ else if(arg.attrs.getIndex(GMLConstants.GML_NAMESPACE,"ts")>=0)
+ toupleSeperator = arg.attrs.getValue(GMLConstants.GML_NAMESPACE,"ts");
+
+ // now to start parse
+ String t = arg.text.toString();
+ t = t.replaceAll("\\s"," ");
+
+ Pattern ptn = (Pattern) patterns.get(toupleSeperator);
+ if(ptn == null){
+ String ts = new String(toupleSeperator);
+ if(ts.indexOf('\\')>-1){
+ // need to escape it
+ ts = ts.replaceAll("\\","\\\\");
+ }
+ if(ts.indexOf('.')>-1){
+ // need to escape it
+ ts = ts.replaceAll("\\.","\\\\.");
+ }
+ ptn = Pattern.compile(ts);
+ patterns.put(toupleSeperator,ptn);
+ }
+ String[] touples = ptn.split(t.trim());// t.trim().split(toupleSeperator);
+
+ if(touples.length == 0)
+ throw new SAXException("Cannot create a coordinate sequence without a touple to parse");
+
+ // we may have null touples, so calculate the num first
+ int numNonNullTouples = 0;
+ for(int i=0;i<touples.length;i++){
+ if(touples[i] !=null && !"".equals(touples[i].trim())){
+ if(i!=numNonNullTouples){
+ touples[numNonNullTouples] = touples[i]; // always shift left
+ }
+ numNonNullTouples++;
+ }
+ }
+ for(int i=numNonNullTouples;i<touples.length;i++)
+ touples[i] = null;
+
+ // null touples now at end of array
+ if(numNonNullTouples == 0)
+ throw new SAXException("Cannot create a coordinate sequence without a non-null touple to parse");
+
+ int dim = StringUtil.split(touples[0], coordSeperator).length;
+ CoordinateSequence cs = gf.getCoordinateSequenceFactory().create(numNonNullTouples,dim);
+ dim = cs.getDimension(); // max dim
+
+ boolean replaceDec = !".".equals(decimal);
+
+ for(int i=0;i<numNonNullTouples;i++){
+ // for each touple, split, parse, add
+
+ ptn = (Pattern) patterns.get(coordSeperator);
+ if(ptn == null){
+ String ts = new String(coordSeperator);
+ if(ts.indexOf('\\')>-1){
+ // need to escape it
+ ts = ts.replaceAll("\\","\\\\");
+ }
+ if(ts.indexOf('.')>-1){
+ // need to escape it
+ ts = ts.replaceAll("\\.","\\\\.");
+ }
+ ptn = Pattern.compile(ts);
+ patterns.put(coordSeperator,ptn);
+ }
+ String[] coords = ptn.split(touples[i]);// touples[i].split(coordSeperator);
+
+ int dimIndex = 0;
+ for(int j=0;j<coords.length && j<dim;j++){
+ if(coords[j] != null && !"".equals(coords[j].trim())){
+ double ordinate = Double.parseDouble(replaceDec?coords[j].replaceAll(decimal,"."):coords[j]);
+ cs.setOrdinate(i,dimIndex++,ordinate);
+ }
+ }
+ // fill remaining dim
+ for(;dimIndex<dim;)cs.setOrdinate(i,dimIndex++,Double.NaN);
+ }
+
+ return cs;
+ }
+ });
+
+ // coord
+ strats.put(GMLConstants.GML_COORD.toLowerCase(),new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ // one child, either a coord
+ // or a coordinate sequence
+
+ if(arg.children.size()<1)
+ throw new SAXException("Cannot create a coordinate without atleast one axis");
+ if(arg.children.size()>3)
+ throw new SAXException("Cannot create a coordinate with more than 3 axis");
+
+ Double[] axis = (Double[]) arg.children.toArray(new Double[arg.children.size()]);
+ Coordinate c = new Coordinate();
+ c.x = axis[0].doubleValue();
+ if(axis.length>1)
+ c.y = axis[1].doubleValue();
+ if(axis.length>2)
+ c.z = axis[2].doubleValue();
+
+ return c;
+ }
+ });
+
+ ParseStrategy coord_child = new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ if(arg.text == null)
+ return null;
+ return new Double((arg.text.toString()));
+ }
+ };
+
+ // coord-x
+ strats.put(GMLConstants.GML_COORD_X.toLowerCase(),coord_child);
+
+ // coord-y
+ strats.put(GMLConstants.GML_COORD_Y.toLowerCase(),coord_child);
+
+ // coord-z
+ strats.put(GMLConstants.GML_COORD_Z.toLowerCase(),coord_child);
+
+ ParseStrategy member = new ParseStrategy(){
+
+ public Object parse(Handler arg, GeometryFactory gf) throws SAXException {
+ if(arg.children.size()!=1)
+ throw new SAXException("Geometry Members may only contain one geometry.");
+
+ // type checking will occur in the parent geom collection.
+ // may wish to add this in the future
+
+ return arg.children.get(0);
+ }
+ };
+ // outerBoundary - linear ring member
+ strats.put(GMLConstants.GML_OUTER_BOUNDARY_IS.toLowerCase(),member);
+
+ // innerBoundary - linear ring member
+ strats.put(GMLConstants.GML_INNER_BOUNDARY_IS.toLowerCase(),member);
+
+ // point member
+ strats.put(GMLConstants.GML_POINT_MEMBER.toLowerCase(),member);
+
+ // line string member
+ strats.put(GMLConstants.GML_LINESTRING_MEMBER.toLowerCase(),member);
+
+ // polygon member
+ strats.put(GMLConstants.GML_POLYGON_MEMBER.toLowerCase(),member);
+
+ return strats;
+ }
+
+ static int getSrid(Attributes attrs, int defaultValue){
+ String srs = null;
+ if(attrs.getIndex(GMLConstants.GML_ATTR_SRSNAME)>=0)
+ srs = attrs.getValue(GMLConstants.GML_ATTR_SRSNAME);
+ else if(attrs.getIndex(GMLConstants.GML_NAMESPACE,GMLConstants.GML_ATTR_SRSNAME)>=0)
+ srs = attrs.getValue(GMLConstants.GML_NAMESPACE,GMLConstants.GML_ATTR_SRSNAME);
+
+ if(srs != null){
+ srs = srs.trim();
+ if(srs != null && !"".equals(srs)){
+ try{
+ return Integer.parseInt(srs);
+ }catch(NumberFormatException e){
+ // rip out the end, uri's are used here sometimes
+ int index = srs.lastIndexOf('#');
+ if(index > -1)
+ srs = srs.substring(index);
+ try{
+ return Integer.parseInt(srs);
+ }catch(NumberFormatException e2){
+ // ignore
+ }
+ }
+ }
+ }
+
+ return defaultValue;
+ }
+
+ /**
+ * @param uri Not currently used, included for future work
+ * @param localName Used to look up an appropriate parse strategy
+ * @return The ParseStrategy which should be employed
+ *
+ * @see ParseStrategy
+ */
+ public static ParseStrategy findStrategy(String uri,String localName){
+ return localName == null?null:(ParseStrategy) strategies.get(localName.toLowerCase());
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/gml2/package.html b/modules/core/src/main/java/org/locationtech/jts/io/gml2/package.html
new file mode 100644
index 0000000..5b271fe
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/gml2/package.html
@@ -0,0 +1,6 @@
+<html>
+ <head><title>JTS IO: Java Topology Suite IO Library</title></head>
+ <body>
+ Classes to read and write the GML2 geometry format.
+ </body>
+</html>
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/kml/KMLWriter.java b/modules/core/src/main/java/org/locationtech/jts/io/kml/KMLWriter.java
new file mode 100644
index 0000000..4f9c15b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/kml/KMLWriter.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.io.kml;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.StringUtil;
+
+
+/**
+ * Writes a formatted string containing the KML representation of a JTS
+ * {@link Geometry}.
+ * The output is KML fragments which
+ * can be substituted wherever the KML <i>Geometry</i> abstract element can be used.
+ * <p>
+ * Output elements are indented to provide a
+ * nicely-formatted representation.
+ * An output line prefix and maximum
+ * number of coordinates per line can be specified.
+ * <p>
+ * The Z ordinate value output can be forced to be a specific value.
+ * The <code>extrude</code> and <code>altitudeMode</code> modes can be set.
+ * If set, the corresponding sub-elements will be output.
+ */
+public class KMLWriter
+{
+ /**
+ * The KML standard value <code>clampToGround</code> for use in {@link #setAltitudeMode(String)}.
+ */
+ public static String ALTITUDE_MODE_CLAMPTOGROUND = "clampToGround ";
+ /**
+ * The KML standard value <code>relativeToGround</code> for use in {@link #setAltitudeMode(String)}.
+ */
+ public static String ALTITUDE_MODE_RELATIVETOGROUND = "relativeToGround ";
+ /**
+ * The KML standard value <code>absolute</code> for use in {@link #setAltitudeMode(String)}.
+ */
+ public static String ALTITUDE_MODE_ABSOLUTE = "absolute";
+
+ /**
+ * Writes a Geometry as KML to a string, using
+ * a specified Z value.
+ *
+ * @param geometry the geometry to write
+ * @param z the Z value to use
+ * @return a string containing the KML geometry representation
+ */
+ public static String writeGeometry(Geometry geometry, double z) {
+ KMLWriter writer = new KMLWriter();
+ writer.setZ(z);
+ return writer.write(geometry);
+ }
+
+ /**
+ * Writes a Geometry as KML to a string, using
+ * a specified Z value, precision, extrude flag,
+ * and altitude mode code.
+ *
+ * @param geometry the geometry to write
+ * @param z the Z value to use
+ * @param precision the maximum number of decimal places to write
+ * @param extrude the extrude flag to write
+ * @param altitudeMode the altitude model code to write
+ * @return a string containing the KML geometry representation
+ */
+ public static String writeGeometry(Geometry geometry, double z, int precision,
+ boolean extrude, String altitudeMode) {
+ KMLWriter writer = new KMLWriter();
+ writer.setZ(z);
+ writer.setPrecision(precision);
+ writer.setExtrude(extrude);
+ writer.setAltitudeMode(altitudeMode);
+ return writer.write(geometry);
+ }
+
+ private final int INDENT_SIZE = 2;
+ private static final String COORDINATE_SEPARATOR = ",";
+ private static final String TUPLE_SEPARATOR = " ";
+
+ private String linePrefix = null;
+ private int maxCoordinatesPerLine = 5;
+ private double zVal = Double.NaN;
+ private boolean extrude = false;
+ private boolean tesselate;
+ private String altitudeMode = null;
+ private DecimalFormat numberFormatter = null;
+
+ /**
+ * Creates a new writer.
+ */
+ public KMLWriter() {
+ }
+
+ /**
+ * Sets a tag string which is prefixed to every emitted text line.
+ * This can be used to indent the geometry text in a containing document.
+ *
+ * @param linePrefix the tag string
+ */
+ public void setLinePrefix(String linePrefix) {
+ this.linePrefix = linePrefix;
+ }
+
+ /**
+ * Sets the maximum number of coordinates to output per line.
+ *
+ * @param maxCoordinatesPerLine the maximum number of coordinates to output
+ */
+ public void setMaximumCoordinatesPerLine(int maxCoordinatesPerLine) {
+ if (maxCoordinatesPerLine <= 0) {
+ maxCoordinatesPerLine = 1;
+ return;
+ }
+ this.maxCoordinatesPerLine = maxCoordinatesPerLine;
+ }
+
+ /**
+ * Sets the Z value to be output for all coordinates.
+ * This overrides any Z value present in the Geometry coordinates.
+ *
+ * @param zVal the Z value to output
+ */
+ public void setZ(double zVal) {
+ this.zVal = zVal;
+ }
+
+ /**
+ * Sets the flag to be output in the <code>extrude</code> element.
+ *
+ * @param extrude the extrude flag to output
+ */
+ public void setExtrude(boolean extrude) {
+ this.extrude = extrude;
+ }
+
+ /**
+ * Sets the flag to be output in the <code>tesselate</code> element.
+ *
+ * @param tesselate the tesselate flag to output
+ */
+ public void setTesselate(boolean tesselate) {
+ this.tesselate = tesselate;
+ }
+
+ /**
+ * Sets the value output in the <code>altitudeMode</code> element.
+ *
+ * @param altitudeMode string representing the altitude mode
+ */
+ public void setAltitudeMode(String altitudeMode) {
+ this.altitudeMode = altitudeMode;
+ }
+
+ /**
+ * Sets the maximum number of decimal places to output in ordinate values.
+ * Useful for limiting output size.
+ *
+ * @param precision the number of decimal places to output
+ */
+ public void setPrecision(int precision) {
+ //this.precision = precision;
+ if (precision >= 0)
+ numberFormatter = createFormatter(precision);
+ }
+
+ /**
+ * Writes a {@link Geometry} in KML format as a string.
+ *
+ * @param geom the geometry to write
+ * @return a string containing the KML geometry representation
+ */
+ public String write(Geometry geom) {
+ StringBuffer buf = new StringBuffer();
+ write(geom, buf);
+ return buf.toString();
+ }
+
+ /**
+ * Writes the KML representation of a {@link Geometry} to a {@link Writer}.
+ *
+ * @param geometry the geometry to write
+ * @param writer the Writer to write to
+ * @throws IOException if an I/O error occurred
+ */
+ public void write(Geometry geometry, Writer writer) throws IOException {
+ writer.write(write(geometry));
+ }
+
+ /**
+ * Appends the KML representation of a {@link Geometry} to a {@link StringBuffer}.
+ *
+ * @param geometry the geometry to write
+ * @param buf the buffer to write into
+ */
+ public void write(Geometry geometry, StringBuffer buf) {
+ writeGeometry(geometry, 0, buf);
+ }
+
+ private void writeGeometry(Geometry g, int level, StringBuffer buf) {
+ String attributes = "";
+ if (g instanceof Point) {
+ writePoint((Point) g, attributes, level, buf);
+ } else if (g instanceof LinearRing) {
+ writeLinearRing((LinearRing) g, attributes, true, level, buf);
+ } else if (g instanceof LineString) {
+ writeLineString((LineString) g, attributes, level, buf);
+ } else if (g instanceof Polygon) {
+ writePolygon((Polygon) g, attributes, level, buf);
+ } else if (g instanceof GeometryCollection) {
+ writeGeometryCollection((GeometryCollection) g, attributes, level, buf);
+ }
+ else
+ throw new IllegalArgumentException("Geometry type not supported: " + g.getGeometryType());
+ }
+
+ private void startLine(String text, int level, StringBuffer buf) {
+ if (linePrefix != null)
+ buf.append(linePrefix);
+ buf.append(StringUtil.spaces(INDENT_SIZE * level));
+ buf.append(text);
+ }
+
+ private String geometryTag(String geometryName, String attributes) {
+ StringBuffer buf = new StringBuffer();
+ buf.append("<");
+ buf.append(geometryName);
+ if (attributes != null && attributes.length() > 0) {
+ buf.append(" ");
+ buf.append(attributes);
+ }
+ buf.append(">");
+ return buf.toString();
+ }
+
+ private void writeModifiers(int level, StringBuffer buf)
+ {
+ if (extrude) {
+ startLine("<extrude>1</extrude>\n", level, buf);
+ }
+ if (tesselate) {
+ startLine("<tesselate>1</tesselate>\n", level, buf);
+ }
+ if (altitudeMode != null) {
+ startLine("<altitudeMode>" + altitudeMode + "</altitudeMode>\n", level, buf);
+ }
+ }
+
+ private void writePoint(Point p, String attributes, int level,
+ StringBuffer buf) {
+ // <Point><coordinates>...</coordinates></Point>
+ startLine(geometryTag("Point", attributes) + "\n", level, buf);
+ writeModifiers(level, buf);
+ write(new Coordinate[] { p.getCoordinate() }, level + 1, buf);
+ startLine("</Point>\n", level, buf);
+ }
+
+ private void writeLineString(LineString ls, String attributes, int level,
+ StringBuffer buf) {
+ // <LineString><coordinates>...</coordinates></LineString>
+ startLine(geometryTag("LineString", attributes) + "\n", level, buf);
+ writeModifiers(level, buf);
+ write(ls.getCoordinates(), level + 1, buf);
+ startLine("</LineString>\n", level, buf);
+ }
+
+ private void writeLinearRing(LinearRing lr, String attributes,
+ boolean writeModifiers, int level,
+ StringBuffer buf) {
+ // <LinearRing><coordinates>...</coordinates></LinearRing>
+ startLine(geometryTag("LinearRing", attributes) + "\n", level, buf);
+ if (writeModifiers) writeModifiers(level, buf);
+ write(lr.getCoordinates(), level + 1, buf);
+ startLine("</LinearRing>\n", level, buf);
+ }
+
+ private void writePolygon(Polygon p, String attributes, int level,
+ StringBuffer buf) {
+ startLine(geometryTag("Polygon", attributes) + "\n", level, buf);
+ writeModifiers(level, buf);
+
+ startLine(" <outerBoundaryIs>\n", level, buf);
+ writeLinearRing((LinearRing) p.getExteriorRing(), null, false, level + 1, buf);
+ startLine(" </outerBoundaryIs>\n", level, buf);
+
+ for (int t = 0; t < p.getNumInteriorRing(); t++) {
+ startLine(" <innerBoundaryIs>\n", level, buf);
+ writeLinearRing((LinearRing) p.getInteriorRingN(t), null, false, level + 1, buf);
+ startLine(" </innerBoundaryIs>\n", level, buf);
+ }
+
+ startLine("</Polygon>\n", level, buf);
+ }
+
+ private void writeGeometryCollection(GeometryCollection gc,
+ String attributes, int level, StringBuffer buf) {
+ startLine("<MultiGeometry>\n", level, buf);
+ for (int t = 0; t < gc.getNumGeometries(); t++) {
+ writeGeometry(gc.getGeometryN(t), level + 1, buf);
+ }
+ startLine("</MultiGeometry>\n", level, buf);
+ }
+
+ /**
+ * Takes a list of coordinates and converts it to KML.<br>
+ * 2d and 3d aware. Terminates the coordinate output with a newline.
+ *
+ * @param cs array of coordinates
+ */
+ private void write(Coordinate[] coords, int level, StringBuffer buf) {
+ startLine("<coordinates>", level, buf);
+
+ boolean isNewLine = false;
+ for (int i = 0; i < coords.length; i++) {
+ if (i > 0) {
+ buf.append(TUPLE_SEPARATOR);
+ }
+
+ if (isNewLine) {
+ startLine(" ", level, buf);
+ isNewLine = false;
+ }
+
+ write(coords[i], buf);
+
+ // break output lines to prevent them from getting too long
+ if ((i + 1) % maxCoordinatesPerLine == 0 && i < coords.length - 1) {
+ buf.append("\n");
+ isNewLine = true;
+ }
+ }
+ buf.append("</coordinates>\n");
+ }
+
+ private void write(Coordinate p, StringBuffer buf) {
+ write(p.x, buf);
+ buf.append(COORDINATE_SEPARATOR);
+ write(p.y, buf);
+
+ double z = p.z;
+ // if altitude was specified directly, use it
+ if (!Double.isNaN(zVal))
+ z = zVal;
+
+ // only write if Z present
+ // MD - is this right? Or should it always be written?
+ if (!Double.isNaN(z)) {
+ buf.append(COORDINATE_SEPARATOR);
+ write(z, buf);
+ }
+ }
+
+ private void write(double num, StringBuffer buf) {
+ if (numberFormatter != null)
+ buf.append(numberFormatter.format(num));
+ else
+ buf.append(num);
+ }
+
+ /**
+ * Creates the <code>DecimalFormat</code> used to write <code>double</code>s
+ * with a sufficient number of decimal places.
+ *
+ * @param precisionModel
+ * the <code>PrecisionModel</code> used to determine the number of
+ * decimal places to write.
+ * @return a <code>DecimalFormat</code> that write <code>double</code> s
+ * without scientific notation.
+ */
+ private static DecimalFormat createFormatter(int precision) {
+ // specify decimal separator explicitly to avoid problems in other locales
+ DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+ symbols.setDecimalSeparator('.');
+ DecimalFormat format = new DecimalFormat("0."
+ + StringUtil.chars('#', precision), symbols);
+ format.setDecimalSeparatorAlwaysShown(false);
+ return format;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/package.html b/modules/core/src/main/java/org/locationtech/jts/io/package.html
new file mode 100644
index 0000000..4df9404
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/io/package.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains the interfaces for converting JTS objects to and from other formats.
+<P>
+The Java Topology Suite (JTS) is a Java API that implements a core set of spatial data operations using an explicit precision model and robust geometric algorithms. JTS is intended to be used in the development of applications that support the validation, cleaning, integration and querying of spatial datasets.
+<P>
+JTS attempts to implement the OpenGIS Simple Features Specification (SFS) as accurately as possible. In some cases the SFS is unclear or omits a specification; in this case JTS attempts to choose a reasonable and consistent alternative. Differences from and elaborations of the SFS are documented in this specification.
+
+<h2>Package Specification</h2>
+
+<ul>
+ <li>Java Topology Suite Technical Specifications
+ <li><A HREF="http://www.opengis.org/techno/specs.htm">
+ OpenGIS Simple Features Specification for SQL</A>
+</ul>
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/ExtractLineByLocation.java b/modules/core/src/main/java/org/locationtech/jts/linearref/ExtractLineByLocation.java
new file mode 100644
index 0000000..7abfd0c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/ExtractLineByLocation.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Extracts the subline of a linear {@link Geometry} between
+ * two {@link LinearLocation}s on the line.
+ */
+class ExtractLineByLocation
+{
+ /**
+ * Computes the subline of a {@link LineString} between
+ * two {@link LinearLocation}s on the line.
+ * If the start location is after the end location,
+ * the computed linear geometry has reverse orientation to the input line.
+ *
+ * @param line the line to use as the baseline
+ * @param start the start location
+ * @param end the end location
+ * @return the extracted subline
+ */
+ public static Geometry extract(Geometry line, LinearLocation start, LinearLocation end)
+ {
+ ExtractLineByLocation ls = new ExtractLineByLocation(line);
+ return ls.extract(start, end);
+ }
+
+ private Geometry line;
+
+ public ExtractLineByLocation(Geometry line) {
+ this.line = line;
+ }
+
+ /**
+ * Extracts a subline of the input.
+ * If <code>end < start</code> the linear geometry computed will be reversed.
+ *
+ * @param start the start location
+ * @param end the end location
+ * @return a linear geometry
+ */
+ public Geometry extract(LinearLocation start, LinearLocation end)
+ {
+ if (end.compareTo(start) < 0) {
+ return reverse(computeLinear(end, start));
+ }
+ return computeLinear(start, end);
+ }
+
+ private Geometry reverse(Geometry linear)
+ {
+ if (linear instanceof LineString)
+ return ((LineString) linear).reverse();
+ if (linear instanceof MultiLineString)
+ return ((MultiLineString) linear).reverse();
+ Assert.shouldNeverReachHere("non-linear geometry encountered");
+ return null;
+ }
+ /**
+ * Assumes input is valid (e.g. start <= end)
+ *
+ * @param start
+ * @param end
+ * @return a linear geometry
+ */
+ private LineString computeLine(LinearLocation start, LinearLocation end)
+ {
+ Coordinate[] coordinates = line.getCoordinates();
+ CoordinateList newCoordinates = new CoordinateList();
+
+ int startSegmentIndex = start.getSegmentIndex();
+ if (start.getSegmentFraction() > 0.0)
+ startSegmentIndex += 1;
+ int lastSegmentIndex = end.getSegmentIndex();
+ if (end.getSegmentFraction() == 1.0)
+ lastSegmentIndex += 1;
+ if (lastSegmentIndex >= coordinates.length)
+ lastSegmentIndex = coordinates.length - 1;
+ // not needed - LinearLocation values should always be correct
+ //Assert.isTrue(end.getSegmentFraction() <= 1.0, "invalid segment fraction value");
+
+ if (! start.isVertex())
+ newCoordinates.add(start.getCoordinate(line));
+ for (int i = startSegmentIndex; i <= lastSegmentIndex; i++) {
+ newCoordinates.add(coordinates[i]);
+ }
+ if (! end.isVertex())
+ newCoordinates.add(end.getCoordinate(line));
+
+ // ensure there is at least one coordinate in the result
+ if (newCoordinates.size() <= 0)
+ newCoordinates.add(start.getCoordinate(line));
+
+ Coordinate[] newCoordinateArray = newCoordinates.toCoordinateArray();
+ /**
+ * Ensure there is enough coordinates to build a valid line.
+ * Make a 2-point line with duplicate coordinates, if necessary.
+ * There will always be at least one coordinate in the coordList.
+ */
+ if (newCoordinateArray.length <= 1) {
+ newCoordinateArray = new Coordinate[] { newCoordinateArray[0], newCoordinateArray[0]};
+ }
+ return line.getFactory().createLineString(newCoordinateArray);
+ }
+
+ /**
+ * Assumes input is valid (e.g. start <= end)
+ *
+ * @param start
+ * @param end
+ * @return a linear geometry
+ */
+ private Geometry computeLinear(LinearLocation start, LinearLocation end)
+ {
+ LinearGeometryBuilder builder = new LinearGeometryBuilder(line.getFactory());
+ builder.setFixInvalidLines(true);
+
+ if (! start.isVertex())
+ builder.add(start.getCoordinate(line));
+
+ for (LinearIterator it = new LinearIterator(line, start); it.hasNext(); it.next()) {
+ if (end.compareLocationValues(it.getComponentIndex(), it.getVertexIndex(), 0.0)
+ < 0)
+ break;
+
+ Coordinate pt = it.getSegmentStart();
+ builder.add(pt);
+ if (it.isEndOfLine())
+ builder.endLine();
+ }
+ if (! end.isVertex())
+ builder.add(end.getCoordinate(line));
+
+ return builder.getGeometry();
+ }
+
+ /**
+ * Computes a valid and normalized location
+ * compatible with the values in a LinearIterator.
+ * (I.e. segmentFractions of 1.0 are converted to the next highest coordinate index)
+ */
+ /*
+ private LinearLocation normalize(LinearLocation loc)
+ {
+ int componentIndex = loc.getComponentIndex();
+ int segmentIndex = loc.getSegmentIndex();
+ double segmentFraction = loc.getSegmentFraction();
+
+ if (segmentFraction < 0.0) {
+ segmentFraction = 0.0;
+ }
+ if (segmentFraction > 1.0) {
+ segmentFraction = 1.0;
+ }
+
+ if (componentIndex < 0) {
+ componentIndex = 0;
+ segmentIndex = 0;
+ segmentFraction = 0.0;
+ }
+ if (segmentIndex < 0) {
+ segmentIndex = 0;
+ segmentFraction = 0.0;
+ }
+
+ if (segmentFraction == 1.0) {
+ segmentFraction = 0.0;
+ segmentIndex += 1;
+ }
+
+ return new LinearLocation(componentIndex, segmentIndex, segmentFraction);
+ }
+ */
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LengthIndexOfPoint.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LengthIndexOfPoint.java
new file mode 100644
index 0000000..7f8cb63
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LengthIndexOfPoint.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Computes the length index of the point
+ * on a linear {@link Geometry} nearest a given {@link Coordinate}.
+ * The nearest point is not necessarily unique; this class
+ * always computes the nearest point closest to
+ * the start of the geometry.
+ */
+class LengthIndexOfPoint
+{
+ public static double indexOf(Geometry linearGeom, Coordinate inputPt)
+ {
+ LengthIndexOfPoint locater = new LengthIndexOfPoint(linearGeom);
+ return locater.indexOf(inputPt);
+ }
+
+ public static double indexOfAfter(Geometry linearGeom, Coordinate inputPt, double minIndex)
+ {
+ LengthIndexOfPoint locater = new LengthIndexOfPoint(linearGeom);
+ return locater.indexOfAfter(inputPt, minIndex);
+ }
+
+ private Geometry linearGeom;
+
+ public LengthIndexOfPoint(Geometry linearGeom) {
+ this.linearGeom = linearGeom;
+ }
+
+ /**
+ * Find the nearest location along a linear {@link Geometry} to a given point.
+ *
+ * @param inputPt the coordinate to locate
+ * @return the location of the nearest point
+ */
+ public double indexOf(Coordinate inputPt)
+ {
+ return indexOfFromStart(inputPt, -1.0);
+ }
+
+ /**
+ * Finds the nearest index along the linear {@link Geometry}
+ * to a given {@link Coordinate}
+ * after the specified minimum index.
+ * If possible the location returned will be strictly greater than the
+ * <code>minLocation</code>.
+ * If this is not possible, the
+ * value returned will equal <code>minLocation</code>.
+ * (An example where this is not possible is when
+ * minLocation = [end of line] ).
+ *
+ * @param inputPt the coordinate to locate
+ * @param minIndex the minimum location for the point location
+ * @return the location of the nearest point
+ */
+ public double indexOfAfter(Coordinate inputPt, double minIndex)
+ {
+ if (minIndex < 0.0) return indexOf(inputPt);
+
+ // sanity check for minIndex at or past end of line
+ double endIndex = linearGeom.getLength();
+ if (endIndex < minIndex)
+ return endIndex;
+
+ double closestAfter = indexOfFromStart(inputPt, minIndex);
+ /**
+ * Return the minDistanceLocation found.
+ */
+ Assert.isTrue(closestAfter >= minIndex,
+ "computed index is before specified minimum index");
+ return closestAfter;
+ }
+
+ private double indexOfFromStart(Coordinate inputPt, double minIndex)
+ {
+ double minDistance = Double.MAX_VALUE;
+
+ double ptMeasure = minIndex;
+ double segmentStartMeasure = 0.0;
+ LineSegment seg = new LineSegment();
+ LinearIterator it = new LinearIterator(linearGeom);
+ while (it.hasNext()) {
+ if (! it.isEndOfLine()) {
+ seg.p0 = it.getSegmentStart();
+ seg.p1 = it.getSegmentEnd();
+ double segDistance = seg.distance(inputPt);
+ double segMeasureToPt = segmentNearestMeasure(seg, inputPt, segmentStartMeasure);
+ if (segDistance < minDistance
+ && segMeasureToPt > minIndex) {
+ ptMeasure = segMeasureToPt;
+ minDistance = segDistance;
+ }
+ segmentStartMeasure += seg.getLength();
+ }
+ it.next();
+ }
+ return ptMeasure;
+ }
+
+ private double segmentNearestMeasure(LineSegment seg, Coordinate inputPt,
+ double segmentStartMeasure)
+ {
+ // found new minimum, so compute location distance of point
+ double projFactor = seg.projectionFactor(inputPt);
+ if (projFactor <= 0.0)
+ return segmentStartMeasure;
+ if (projFactor <= 1.0)
+ return segmentStartMeasure + projFactor * seg.getLength();
+ // projFactor > 1.0
+ return segmentStartMeasure + seg.getLength();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LengthIndexedLine.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LengthIndexedLine.java
new file mode 100644
index 0000000..90b307f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LengthIndexedLine.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * Supports linear referencing along a linear {@link Geometry}
+ * using the length along the line as the index.
+ * Negative length values are taken as measured in the reverse direction
+ * from the end of the geometry.
+ * Out-of-range index values are handled by clamping
+ * them to the valid range of values.
+ * Non-simple lines (i.e. which loop back to cross or touch
+ * themselves) are supported.
+ */
+public class LengthIndexedLine
+{
+ private Geometry linearGeom;
+
+ /**
+ * Constructs an object which allows a linear {@link Geometry}
+ * to be linearly referenced using length as an index.
+ *
+ * @param linearGeom the linear geometry to reference along
+ */
+ public LengthIndexedLine(Geometry linearGeom) {
+ this.linearGeom = linearGeom;
+ }
+
+ /**
+ * Computes the {@link Coordinate} for the point
+ * on the line at the given index.
+ * If the index is out of range the first or last point on the
+ * line will be returned.
+ * The Z-ordinate of the computed point will be interpolated from
+ * the Z-ordinates of the line segment containing it, if they exist.
+ *
+ * @param index the index of the desired point
+ * @return the Coordinate at the given index
+ */
+ public Coordinate extractPoint(double index)
+ {
+ LinearLocation loc = LengthLocationMap.getLocation(linearGeom, index);
+ return loc.getCoordinate(linearGeom);
+ }
+
+ /**
+ * Computes the {@link Coordinate} for the point
+ * on the line at the given index, offset by the given distance.
+ * If the index is out of range the first or last point on the
+ * line will be returned.
+ * The computed point is offset to the left of the line if the offset distance is
+ * positive, to the right if negative.
+ *
+ * The Z-ordinate of the computed point will be interpolated from
+ * the Z-ordinates of the line segment containing it, if they exist.
+ *
+ * @param index the index of the desired point
+ * @param offsetDistance the distance the point is offset from the segment
+ * (positive is to the left, negative is to the right)
+ * @return the Coordinate at the given index
+ */
+ public Coordinate extractPoint(double index, double offsetDistance)
+ {
+ LinearLocation loc = LengthLocationMap.getLocation(linearGeom, index);
+ LinearLocation locLow = loc.toLowest(linearGeom);
+ return locLow.getSegment(linearGeom).pointAlongOffset(locLow.getSegmentFraction(), offsetDistance);
+ }
+
+ /**
+ * Computes the {@link LineString} for the interval
+ * on the line between the given indices.
+ * If the endIndex lies before the startIndex,
+ * the computed geometry is reversed.
+ *
+ * @param startIndex the index of the start of the interval
+ * @param endIndex the index of the end of the interval
+ * @return the linear interval between the indices
+ */
+ public Geometry extractLine(double startIndex, double endIndex)
+ {
+ LocationIndexedLine lil = new LocationIndexedLine(linearGeom);
+ double startIndex2 = clampIndex(startIndex);
+ double endIndex2 = clampIndex(endIndex);
+ // if extracted line is zero-length, resolve start lower as well to ensure they are equal
+ boolean resolveStartLower = startIndex2 == endIndex2;
+ LinearLocation startLoc = locationOf(startIndex2, resolveStartLower);
+// LinearLocation endLoc = locationOf(endIndex2, true);
+// LinearLocation startLoc = locationOf(startIndex2);
+ LinearLocation endLoc = locationOf(endIndex2);
+ return ExtractLineByLocation.extract(linearGeom, startLoc, endLoc);
+ }
+
+ private LinearLocation locationOf(double index)
+ {
+ return LengthLocationMap.getLocation(linearGeom, index);
+ }
+
+ private LinearLocation locationOf(double index, boolean resolveLower)
+ {
+ return LengthLocationMap.getLocation(linearGeom, index, resolveLower);
+ }
+
+ /**
+ * Computes the minimum index for a point on the line.
+ * If the line is not simple (i.e. loops back on itself)
+ * a single point may have more than one possible index.
+ * In this case, the smallest index is returned.
+ *
+ * The supplied point does not <i>necessarily</i> have to lie precisely
+ * on the line, but if it is far from the line the accuracy and
+ * performance of this function is not guaranteed.
+ * Use {@link #project} to compute a guaranteed result for points
+ * which may be far from the line.
+ *
+ * @param pt a point on the line
+ * @return the minimum index of the point
+ *
+ * @see #project(Coordinate)
+ */
+ public double indexOf(Coordinate pt)
+ {
+ return LengthIndexOfPoint.indexOf(linearGeom, pt);
+ }
+
+ /**
+ * Finds the index for a point on the line
+ * which is greater than the given index.
+ * If no such index exists, returns <tt>minIndex</tt>.
+ * This method can be used to determine all indexes for
+ * a point which occurs more than once on a non-simple line.
+ * It can also be used to disambiguate cases where the given point lies
+ * slightly off the line and is equidistant from two different
+ * points on the line.
+ *
+ * The supplied point does not <i>necessarily</i> have to lie precisely
+ * on the line, but if it is far from the line the accuracy and
+ * performance of this function is not guaranteed.
+ * Use {@link #project} to compute a guaranteed result for points
+ * which may be far from the line.
+ *
+ * @param pt a point on the line
+ * @param minIndex the value the returned index must be greater than
+ * @return the index of the point greater than the given minimum index
+ *
+ * @see #project(Coordinate)
+ */
+ public double indexOfAfter(Coordinate pt, double minIndex)
+ {
+ return LengthIndexOfPoint.indexOfAfter(linearGeom, pt, minIndex);
+ }
+
+ /**
+ * Computes the indices for a subline of the line.
+ * (The subline must <b>conform</b> to the line; that is,
+ * all vertices in the subline (except possibly the first and last)
+ * must be vertices of the line and occur in the same order).
+ *
+ * @param subLine a subLine of the line
+ * @return a pair of indices for the start and end of the subline.
+ */
+ public double[] indicesOf(Geometry subLine)
+ {
+ LinearLocation[] locIndex = LocationIndexOfLine.indicesOf(linearGeom, subLine);
+ double[] index = new double[] {
+ LengthLocationMap.getLength(linearGeom, locIndex[0]),
+ LengthLocationMap.getLength(linearGeom, locIndex[1])
+ };
+ return index;
+ }
+
+
+ /**
+ * Computes the index for the closest point on the line to the given point.
+ * If more than one point has the closest distance the first one along the line
+ * is returned.
+ * (The point does not necessarily have to lie precisely on the line.)
+ *
+ * @param pt a point on the line
+ * @return the index of the point
+ */
+ public double project(Coordinate pt)
+ {
+ return LengthIndexOfPoint.indexOf(linearGeom, pt);
+ }
+
+ /**
+ * Returns the index of the start of the line
+ * @return the start index
+ */
+ public double getStartIndex()
+ {
+ return 0.0;
+ }
+
+ /**
+ * Returns the index of the end of the line
+ * @return the end index
+ */
+ public double getEndIndex()
+ {
+ return linearGeom.getLength();
+ }
+
+ /**
+ * Tests whether an index is in the valid index range for the line.
+ *
+ * @param index the index to test
+ * @return <code>true</code> if the index is in the valid range
+ */
+ public boolean isValidIndex(double index)
+ {
+ return (index >= getStartIndex()
+ && index <= getEndIndex());
+ }
+
+ /**
+ * Computes a valid index for this line
+ * by clamping the given index to the valid range of index values
+ *
+ * @return a valid index value
+ */
+ public double clampIndex(double index)
+ {
+ double posIndex = positiveIndex(index);
+ double startIndex = getStartIndex();
+ if (posIndex < startIndex) return startIndex;
+
+ double endIndex = getEndIndex();
+ if (posIndex > endIndex) return endIndex;
+
+ return posIndex;
+ }
+
+ private double positiveIndex(double index)
+ {
+ if (index >= 0.0) return index;
+ return linearGeom.getLength() + index;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LengthLocationMap.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LengthLocationMap.java
new file mode 100644
index 0000000..c44e715
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LengthLocationMap.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Computes the {@link LinearLocation} for a given length
+ * along a linear {@link Geometry}.
+ * Negative lengths are measured in reverse from end of the linear geometry.
+ * Out-of-range values are clamped.
+ */
+public class LengthLocationMap
+{
+ // TODO: cache computed cumulative length for each vertex
+ // TODO: support user-defined measures
+ // TODO: support measure index for fast mapping to a location
+
+ /**
+ * Computes the {@link LinearLocation} for a
+ * given length along a linear {@link Geometry}.
+ *
+ * @param linearGeom the linear geometry to use
+ * @param length the length index of the location
+ * @return the {@link LinearLocation} for the length
+ */
+ public static LinearLocation getLocation(Geometry linearGeom, double length)
+ {
+ LengthLocationMap locater = new LengthLocationMap(linearGeom);
+ return locater.getLocation(length);
+ }
+
+ /**
+ * Computes the {@link LinearLocation} for a
+ * given length along a linear {@link Geometry},
+ * with control over how the location
+ * is resolved at component endpoints.
+ *
+ * @param linearGeom the linear geometry to use
+ * @param length the length index of the location
+ * @param resolveLower if true lengths are resolved to the lowest possible index
+ * @return the {@link LinearLocation} for the length
+ */
+ public static LinearLocation getLocation(Geometry linearGeom, double length, boolean resolveLower)
+ {
+ LengthLocationMap locater = new LengthLocationMap(linearGeom);
+ return locater.getLocation(length, resolveLower);
+ }
+
+ /**
+ * Computes the length for a given {@link LinearLocation}
+ * on a linear {@link Geometry}.
+ *
+ * @param linearGeom the linear geometry to use
+ * @param loc the {@link LinearLocation} index of the location
+ * @return the length for the {@link LinearLocation}
+ */
+ public static double getLength(Geometry linearGeom, LinearLocation loc)
+ {
+ LengthLocationMap locater = new LengthLocationMap(linearGeom);
+ return locater.getLength(loc);
+ }
+
+ private Geometry linearGeom;
+
+ public LengthLocationMap(Geometry linearGeom)
+ {
+ this.linearGeom = linearGeom;
+ }
+
+ /**
+ * Compute the {@link LinearLocation} corresponding to a length.
+ * Negative lengths are measured in reverse from end of the linear geometry.
+ * Out-of-range values are clamped.
+ * Ambiguous indexes are resolved to the lowest possible location value.
+ *
+ * @param length the length index
+ * @return the corresponding LinearLocation
+ */
+ public LinearLocation getLocation(double length)
+ {
+ return getLocation(length, true);
+ }
+
+ /**
+ * Compute the {@link LinearLocation} corresponding to a length.
+ * Negative lengths are measured in reverse from end of the linear geometry.
+ * Out-of-range values are clamped.
+ * Ambiguous indexes are resolved to the lowest or highest possible location value,
+ * depending on the value of <tt>resolveLower</tt>
+ *
+ * @param length the length index
+ * @return the corresponding LinearLocation
+ */
+ public LinearLocation getLocation(double length, boolean resolveLower)
+ {
+ double forwardLength = length;
+
+ // negative values are measured from end of geometry
+ if (length < 0.0) {
+ double lineLen = linearGeom.getLength();
+ forwardLength = lineLen + length;
+ }
+ LinearLocation loc = getLocationForward(forwardLength);
+ if (resolveLower) {
+ return loc;
+ }
+ return resolveHigher(loc);
+ }
+
+ private LinearLocation getLocationForward(double length)
+ {
+ if (length <= 0.0)
+ return new LinearLocation();
+
+ double totalLength = 0.0;
+
+ LinearIterator it = new LinearIterator(linearGeom);
+ while (it.hasNext()) {
+
+ /**
+ * Special handling is required for the situation when the
+ * length references exactly to a component endpoint.
+ * In this case, the endpoint location of the current component
+ * is returned,
+ * rather than the startpoint location of the next component.
+ * This produces consistent behaviour with the project method.
+ */
+ if (it.isEndOfLine()) {
+ if (totalLength == length) {
+ int compIndex = it.getComponentIndex();
+ int segIndex = it.getVertexIndex();
+ return new LinearLocation(compIndex, segIndex, 0.0);
+ }
+ }
+ else {
+ Coordinate p0 = it.getSegmentStart();
+ Coordinate p1 = it.getSegmentEnd();
+ double segLen = p1.distance(p0);
+ // length falls in this segment
+ if (totalLength + segLen > length) {
+ double frac = (length - totalLength) / segLen;
+ int compIndex = it.getComponentIndex();
+ int segIndex = it.getVertexIndex();
+ return new LinearLocation(compIndex, segIndex, frac);
+ }
+ totalLength += segLen;
+ }
+
+ it.next();
+ }
+ // length is longer than line - return end location
+ return LinearLocation.getEndLocation(linearGeom);
+ }
+
+ private LinearLocation resolveHigher(LinearLocation loc)
+ {
+ if (! loc.isEndpoint(linearGeom))
+ return loc;
+ int compIndex = loc.getComponentIndex();
+ // if last component can't resolve any higher
+ if (compIndex >= linearGeom.getNumGeometries() - 1) return loc;
+
+ do {
+ compIndex++;
+ } while (compIndex < linearGeom.getNumGeometries() - 1
+ && linearGeom.getGeometryN(compIndex).getLength() == 0);
+ // resolve to next higher location
+ return new LinearLocation(compIndex, 0, 0.0);
+ }
+
+ public double getLength(LinearLocation loc)
+ {
+ double totalLength = 0.0;
+
+ LinearIterator it = new LinearIterator(linearGeom);
+ while (it.hasNext()) {
+ if (! it.isEndOfLine()) {
+ Coordinate p0 = it.getSegmentStart();
+ Coordinate p1 = it.getSegmentEnd();
+ double segLen = p1.distance(p0);
+ // length falls in this segment
+ if (loc.getComponentIndex() == it.getComponentIndex()
+ && loc.getSegmentIndex() == it.getVertexIndex()) {
+ return totalLength + segLen * loc.getSegmentFraction();
+ }
+ totalLength += segLen;
+ }
+ it.next();
+ }
+ return totalLength;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LinearGeometryBuilder.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LinearGeometryBuilder.java
new file mode 100644
index 0000000..e4407e2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LinearGeometryBuilder.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+
+/**
+ * Builds a linear geometry ({@link LineString} or {@link MultiLineString})
+ * incrementally (point-by-point).
+ *
+ * @version 1.7
+ */
+public class LinearGeometryBuilder
+{
+ private GeometryFactory geomFact;
+ private List lines = new ArrayList();
+ private CoordinateList coordList = null;
+
+ private boolean ignoreInvalidLines = false;
+ private boolean fixInvalidLines = false;
+
+ private Coordinate lastPt = null;
+
+ public LinearGeometryBuilder(GeometryFactory geomFact) {
+ this.geomFact = geomFact;
+ }
+
+ /**
+ * Allows invalid lines to be ignored rather than causing Exceptions.
+ * An invalid line is one which has only one unique point.
+ *
+ * @param ignoreInvalidLines <code>true</code> if short lines are to be ignored
+ */
+ public void setIgnoreInvalidLines(boolean ignoreInvalidLines)
+ {
+ this.ignoreInvalidLines = ignoreInvalidLines;
+ }
+
+ /**
+ * Allows invalid lines to be ignored rather than causing Exceptions.
+ * An invalid line is one which has only one unique point.
+ *
+ * @param fixInvalidLines <code>true</code> if short lines are to be ignored
+ */
+ public void setFixInvalidLines(boolean fixInvalidLines)
+ {
+ this.fixInvalidLines = fixInvalidLines;
+ }
+
+ /**
+ * Adds a point to the current line.
+ *
+ * @param pt the Coordinate to add
+ */
+ public void add(Coordinate pt)
+ {
+ add(pt, true);
+ }
+
+ /**
+ * Adds a point to the current line.
+ *
+ * @param pt the Coordinate to add
+ */
+ public void add(Coordinate pt, boolean allowRepeatedPoints)
+ {
+ if (coordList == null)
+ coordList = new CoordinateList();
+ coordList.add(pt, allowRepeatedPoints);
+ lastPt = pt;
+ }
+
+ public Coordinate getLastCoordinate() { return lastPt; }
+
+ /**
+ * Terminate the current LineString.
+ */
+ public void endLine()
+ {
+ if (coordList == null) {
+ return;
+ }
+ if (ignoreInvalidLines && coordList.size() < 2) {
+ coordList = null;
+ return;
+ }
+ Coordinate[] rawPts = coordList.toCoordinateArray();
+ Coordinate[] pts = rawPts;
+ if (fixInvalidLines)
+ pts = validCoordinateSequence(rawPts);
+
+ coordList = null;
+ LineString line = null;
+ try {
+ line = geomFact.createLineString(pts);
+ }
+ catch (IllegalArgumentException ex) {
+ // exception is due to too few points in line.
+ // only propagate if not ignoring short lines
+ if (! ignoreInvalidLines)
+ throw ex;
+ }
+
+ if (line != null) lines.add(line);
+ }
+
+ private Coordinate[] validCoordinateSequence(Coordinate[] pts)
+ {
+ if (pts.length >= 2) return pts;
+ Coordinate[] validPts = new Coordinate[] { pts[0], pts[0]};
+ return validPts;
+ }
+
+ public Geometry getGeometry()
+ {
+ // end last line in case it was not done by user
+ endLine();
+ return geomFact.buildGeometry(lines);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LinearIterator.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LinearIterator.java
new file mode 100644
index 0000000..60c8c2e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LinearIterator.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Lineal;
+import org.locationtech.jts.geom.MultiLineString;
+
+/**
+ * An iterator over the components and coordinates of a linear geometry
+ * ({@link LineString}s and {@link MultiLineString}s.
+ *
+ * The standard usage pattern for a {@link LinearIterator} is:
+ *
+ * <pre>
+ * for (LinearIterator it = new LinearIterator(...); it.hasNext(); it.next()) {
+ * ...
+ * int ci = it.getComponentIndex(); // for example
+ * int vi = it.getVertexIndex(); // for example
+ * ...
+ * }
+ * </pre>
+ *
+ * @version 1.7
+ */
+public class LinearIterator
+{
+ private static int segmentEndVertexIndex(LinearLocation loc)
+ {
+ if (loc.getSegmentFraction() > 0.0)
+ return loc.getSegmentIndex() + 1;
+ return loc.getSegmentIndex();
+ }
+
+ private Geometry linearGeom;
+ private final int numLines;
+
+ /**
+ * Invariant: currentLine <> null if the iterator is pointing at a valid coordinate
+ */
+ private LineString currentLine;
+ private int componentIndex = 0;
+ private int vertexIndex = 0;
+
+ /**
+ * Creates an iterator initialized to the start of a linear {@link Geometry}
+ *
+ * @param linear the linear geometry to iterate over
+ * @throws IllegalArgumentException if linearGeom is not lineal
+ */
+ public LinearIterator(Geometry linear) {
+ this(linear, 0, 0);
+ }
+
+ /**
+ * Creates an iterator starting at
+ * a {@link LinearLocation} on a linear {@link Geometry}
+ *
+ * @param linear the linear geometry to iterate over
+ * @param start the location to start at
+ * @throws IllegalArgumentException if linearGeom is not lineal
+ */
+ public LinearIterator(Geometry linear, LinearLocation start) {
+ this(linear, start.getComponentIndex(), segmentEndVertexIndex(start));
+ }
+
+ /**
+ * Creates an iterator starting at
+ * a specified component and vertex in a linear {@link Geometry}
+ *
+ * @param linearGeom the linear geometry to iterate over
+ * @param componentIndex the component to start at
+ * @param vertexIndex the vertex to start at
+ * @throws IllegalArgumentException if linearGeom is not lineal
+ */
+ public LinearIterator(Geometry linearGeom, int componentIndex, int vertexIndex)
+ {
+ if (! (linearGeom instanceof Lineal))
+ throw new IllegalArgumentException("Lineal geometry is required");
+ this.linearGeom = linearGeom;
+ numLines = linearGeom.getNumGeometries();
+ this.componentIndex = componentIndex;
+ this.vertexIndex = vertexIndex;
+ loadCurrentLine();
+ }
+
+ private void loadCurrentLine()
+ {
+ if (componentIndex >= numLines) {
+ currentLine = null;
+ return;
+ }
+ currentLine = (LineString) linearGeom.getGeometryN(componentIndex);
+ }
+
+ /**
+ * Tests whether there are any vertices left to iterator over.
+ * Specifically, hasNext() return <tt>true</tt> if the
+ * current state of the iterator represents a valid location
+ * on the linear geometry.
+ *
+ * @return <code>true</code> if there are more vertices to scan
+ */
+ public boolean hasNext()
+ {
+ if (componentIndex >= numLines) return false;
+ if (componentIndex == numLines - 1
+ && vertexIndex >= currentLine.getNumPoints())
+ return false;
+ return true;
+ }
+
+ /**
+ * Moves the iterator ahead to the next vertex and (possibly) linear component.
+ */
+ public void next()
+ {
+ if (! hasNext()) return;
+
+ vertexIndex++;
+ if (vertexIndex >= currentLine.getNumPoints()) {
+ componentIndex++;
+ loadCurrentLine();
+ vertexIndex = 0;
+ }
+ }
+
+ /**
+ * Checks whether the iterator cursor is pointing to the
+ * endpoint of a component {@link LineString}.
+ *
+ * @return <code>true</code> if the iterator is at an endpoint
+ */
+ public boolean isEndOfLine() {
+ if (componentIndex >= numLines) return false;
+ //LineString currentLine = (LineString) linear.getGeometryN(componentIndex);
+ if (vertexIndex < currentLine.getNumPoints() - 1)
+ return false;
+ return true;
+ }
+
+ /**
+ * The component index of the vertex the iterator is currently at.
+ * @return the current component index
+ */
+ public int getComponentIndex() { return componentIndex; }
+
+ /**
+ * The vertex index of the vertex the iterator is currently at.
+ * @return the current vertex index
+ */
+ public int getVertexIndex() { return vertexIndex; }
+
+ /**
+ * Gets the {@link LineString} component the iterator is current at.
+ * @return a linestring
+ */
+ public LineString getLine() { return currentLine; }
+
+ /**
+ * Gets the first {@link Coordinate} of the current segment.
+ * (the coordinate of the current vertex).
+ * @return a {@link Coordinate}
+ */
+ public Coordinate getSegmentStart() { return currentLine.getCoordinateN(vertexIndex); }
+
+ /**
+ * Gets the second {@link Coordinate} of the current segment.
+ * (the coordinate of the next vertex).
+ * If the iterator is at the end of a line, <code>null</code> is returned.
+ *
+ * @return a {@link Coordinate} or <code>null</code>
+ */
+ public Coordinate getSegmentEnd()
+ {
+ if (vertexIndex < getLine().getNumPoints() - 1)
+ return currentLine.getCoordinateN(vertexIndex + 1);
+ return null;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LinearLocation.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LinearLocation.java
new file mode 100644
index 0000000..66bd60f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LinearLocation.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+
+/**
+ * Represents a location along a {@link LineString} or {@link MultiLineString}.
+ * The referenced geometry is not maintained within
+ * this location, but must be provided for operations which require it.
+ * Various methods are provided to manipulate the location value
+ * and query the geometry it references.
+ */
+public class LinearLocation
+ implements Comparable
+{
+ /**
+ * Gets a location which refers to the end of a linear {@link Geometry}.
+ * @param linear the linear geometry
+ * @return a new <tt>LinearLocation</tt>
+ */
+ public static LinearLocation getEndLocation(Geometry linear)
+ {
+ // assert: linear is LineString or MultiLineString
+ LinearLocation loc = new LinearLocation();
+ loc.setToEnd(linear);
+ return loc;
+ }
+
+ /**
+ * Computes the {@link Coordinate} of a point a given fraction
+ * along the line segment <tt>(p0, p1)</tt>.
+ * If the fraction is greater than 1.0 the last
+ * point of the segment is returned.
+ * If the fraction is less than or equal to 0.0 the first point
+ * of the segment is returned.
+ * The Z ordinate is interpolated from the Z-ordinates of the given points,
+ * if they are specified.
+ *
+ * @param p0 the first point of the line segment
+ * @param p1 the last point of the line segment
+ * @param frac the length to the desired point
+ * @return the <tt>Coordinate</tt> of the desired point
+ */
+ public static Coordinate pointAlongSegmentByFraction(Coordinate p0, Coordinate p1, double frac)
+ {
+ if (frac <= 0.0) return p0;
+ if (frac >= 1.0) return p1;
+
+ double x = (p1.x - p0.x) * frac + p0.x;
+ double y = (p1.y - p0.y) * frac + p0.y;
+ // interpolate Z value. If either input Z is NaN, result z will be NaN as well.
+ double z = (p1.z - p0.z) * frac + p0.z;
+ return new Coordinate(x, y, z);
+ }
+
+ private int componentIndex = 0;
+ private int segmentIndex = 0;
+ private double segmentFraction = 0.0;
+
+ /**
+ * Creates a location referring to the start of a linear geometry
+ */
+ public LinearLocation()
+ {
+ }
+
+ public LinearLocation(int segmentIndex, double segmentFraction) {
+ this(0, segmentIndex, segmentFraction);
+ }
+
+ public LinearLocation(int componentIndex, int segmentIndex, double segmentFraction)
+ {
+ this.componentIndex = componentIndex;
+ this.segmentIndex = segmentIndex;
+ this.segmentFraction = segmentFraction;
+ normalize();
+ }
+
+ private LinearLocation(int componentIndex, int segmentIndex, double segmentFraction, boolean doNormalize)
+ {
+ this.componentIndex = componentIndex;
+ this.segmentIndex = segmentIndex;
+ this.segmentFraction = segmentFraction;
+ if (doNormalize)
+ normalize();
+ }
+
+ /**
+ * Creates a new location equal to a given one.
+ *
+ * @param loc a LinearLocation
+ */
+ public LinearLocation(LinearLocation loc)
+ {
+ this.componentIndex = loc.componentIndex;
+ this.segmentIndex = loc.segmentIndex;
+ this.segmentFraction = loc.segmentFraction;
+ }
+
+ /**
+ * Ensures the individual values are locally valid.
+ * Does <b>not</b> ensure that the indexes are valid for
+ * a particular linear geometry.
+ *
+ * @see clamp
+ */
+ private void normalize()
+ {
+ if (segmentFraction < 0.0) {
+ segmentFraction = 0.0;
+ }
+ if (segmentFraction > 1.0) {
+ segmentFraction = 1.0;
+ }
+
+ if (componentIndex < 0) {
+ componentIndex = 0;
+ segmentIndex = 0;
+ segmentFraction = 0.0;
+ }
+ if (segmentIndex < 0) {
+ segmentIndex = 0;
+ segmentFraction = 0.0;
+ }
+ if (segmentFraction == 1.0) {
+ segmentFraction = 0.0;
+ segmentIndex += 1;
+ }
+ }
+
+
+ /**
+ * Ensures the indexes are valid for a given linear {@link Geometry}.
+ *
+ * @param linear a linear geometry
+ */
+ public void clamp(Geometry linear)
+ {
+ if (componentIndex >= linear.getNumGeometries()) {
+ setToEnd(linear);
+ return;
+ }
+ if (segmentIndex >= linear.getNumPoints()) {
+ LineString line = (LineString) linear.getGeometryN(componentIndex);
+ segmentIndex = line.getNumPoints() - 1;
+ segmentFraction = 1.0;
+ }
+ }
+ /**
+ * Snaps the value of this location to
+ * the nearest vertex on the given linear {@link Geometry},
+ * if the vertex is closer than <tt>minDistance</tt>.
+ *
+ * @param linearGeom a linear geometry
+ * @param minDistance the minimum allowable distance to a vertex
+ */
+ public void snapToVertex(Geometry linearGeom, double minDistance)
+ {
+ if (segmentFraction <= 0.0 || segmentFraction >= 1.0)
+ return;
+ double segLen = getSegmentLength(linearGeom);
+ double lenToStart = segmentFraction * segLen;
+ double lenToEnd = segLen - lenToStart;
+ if (lenToStart <= lenToEnd && lenToStart < minDistance) {
+ segmentFraction = 0.0;
+ }
+ else if (lenToEnd <= lenToStart && lenToEnd < minDistance) {
+ segmentFraction = 1.0;
+ }
+ }
+
+ /**
+ * Gets the length of the segment in the given
+ * Geometry containing this location.
+ *
+ * @param linearGeom a linear geometry
+ * @return the length of the segment
+ */
+ public double getSegmentLength(Geometry linearGeom)
+ {
+ LineString lineComp = (LineString) linearGeom.getGeometryN(componentIndex);
+
+ // ensure segment index is valid
+ int segIndex = segmentIndex;
+ if (segmentIndex >= lineComp.getNumPoints() - 1)
+ segIndex = lineComp.getNumPoints() - 2;
+
+ Coordinate p0 = lineComp.getCoordinateN(segIndex);
+ Coordinate p1 = lineComp.getCoordinateN(segIndex + 1);
+ return p0.distance(p1);
+ }
+
+ /**
+ * Sets the value of this location to
+ * refer to the end of a linear geometry.
+ *
+ * @param linear the linear geometry to use to set the end
+ */
+ public void setToEnd(Geometry linear)
+ {
+ componentIndex = linear.getNumGeometries() - 1;
+ LineString lastLine = (LineString) linear.getGeometryN(componentIndex);
+ segmentIndex = lastLine.getNumPoints() - 1;
+ segmentFraction = 1.0;
+ }
+
+ /**
+ * Gets the component index for this location.
+ *
+ * @return the component index
+ */
+ public int getComponentIndex() { return componentIndex; }
+
+ /**
+ * Gets the segment index for this location
+ *
+ * @return the segment index
+ */
+ public int getSegmentIndex() { return segmentIndex; }
+
+ /**
+ * Gets the segment fraction for this location
+ *
+ * @return the segment fraction
+ */
+ public double getSegmentFraction() { return segmentFraction; }
+
+ /**
+ * Tests whether this location refers to a vertex
+ *
+ * @return true if the location is a vertex
+ */
+ public boolean isVertex()
+ {
+ return segmentFraction <= 0.0 || segmentFraction >= 1.0;
+ }
+
+ /**
+ * Gets the {@link Coordinate} along the
+ * given linear {@link Geometry} which is
+ * referenced by this location.
+ *
+ * @param linearGeom the linear geometry referenced by this location
+ * @return the <tt>Coordinate</tt> at the location
+ */
+ public Coordinate getCoordinate(Geometry linearGeom)
+ {
+ LineString lineComp = (LineString) linearGeom.getGeometryN(componentIndex);
+ Coordinate p0 = lineComp.getCoordinateN(segmentIndex);
+ if (segmentIndex >= lineComp.getNumPoints() - 1)
+ return p0;
+ Coordinate p1 = lineComp.getCoordinateN(segmentIndex + 1);
+ return pointAlongSegmentByFraction(p0, p1, segmentFraction);
+ }
+
+ /**
+ * Gets a {@link LineSegment} representing the segment of the
+ * given linear {@link Geometry} which contains this location.
+ *
+ * @param linearGeom a linear geometry
+ * @return the <tt>LineSegment</tt> containing the location
+ */
+ public LineSegment getSegment(Geometry linearGeom)
+ {
+ LineString lineComp = (LineString) linearGeom.getGeometryN(componentIndex);
+ Coordinate p0 = lineComp.getCoordinateN(segmentIndex);
+ // check for endpoint - return last segment of the line if so
+ if (segmentIndex >= lineComp.getNumPoints() - 1) {
+ Coordinate prev = lineComp.getCoordinateN(lineComp.getNumPoints() - 2);
+ return new LineSegment(prev, p0);
+ }
+ Coordinate p1 = lineComp.getCoordinateN(segmentIndex + 1);
+ return new LineSegment(p0, p1);
+ }
+
+ /**
+ * Tests whether this location refers to a valid
+ * location on the given linear {@link Geometry}.
+ *
+ * @param linearGeom a linear geometry
+ * @return true if this location is valid
+ */
+ public boolean isValid(Geometry linearGeom)
+ {
+ if (componentIndex < 0 || componentIndex >= linearGeom.getNumGeometries())
+ return false;
+
+ LineString lineComp = (LineString) linearGeom.getGeometryN(componentIndex);
+ if (segmentIndex < 0 || segmentIndex > lineComp.getNumPoints())
+ return false;
+ if (segmentIndex == lineComp.getNumPoints() && segmentFraction != 0.0)
+ return false;
+
+ if (segmentFraction < 0.0 || segmentFraction > 1.0)
+ return false;
+ return true;
+ }
+
+ /**
+ * Compares this object with the specified object for order.
+ *
+ *@param o the <code>LineStringLocation</code> with which this <code>Coordinate</code>
+ * is being compared
+ *@return a negative integer, zero, or a positive integer as this <code>LineStringLocation</code>
+ * is less than, equal to, or greater than the specified <code>LineStringLocation</code>
+ */
+ public int compareTo(Object o) {
+ LinearLocation other = (LinearLocation) o;
+ // compare component indices
+ if (componentIndex < other.componentIndex) return -1;
+ if (componentIndex > other.componentIndex) return 1;
+ // compare segments
+ if (segmentIndex < other.segmentIndex) return -1;
+ if (segmentIndex > other.segmentIndex) return 1;
+ // same segment, so compare segment fraction
+ if (segmentFraction < other.segmentFraction) return -1;
+ if (segmentFraction > other.segmentFraction) return 1;
+ // same location
+ return 0;
+ }
+
+ /**
+ * Compares this object with the specified index values for order.
+ *
+ * @param componentIndex1 a component index
+ * @param segmentIndex1 a segment index
+ * @param segmentFraction1 a segment fraction
+ * @return a negative integer, zero, or a positive integer as this <code>LineStringLocation</code>
+ * is less than, equal to, or greater than the specified locationValues
+ */
+ public int compareLocationValues(int componentIndex1, int segmentIndex1, double segmentFraction1) {
+ // compare component indices
+ if (componentIndex < componentIndex1) return -1;
+ if (componentIndex > componentIndex1) return 1;
+ // compare segments
+ if (segmentIndex < segmentIndex1) return -1;
+ if (segmentIndex > segmentIndex1) return 1;
+ // same segment, so compare segment fraction
+ if (segmentFraction < segmentFraction1) return -1;
+ if (segmentFraction > segmentFraction1) return 1;
+ // same location
+ return 0;
+ }
+
+ /**
+ * Compares two sets of location values for order.
+ *
+ * @param componentIndex0 a component index
+ * @param segmentIndex0 a segment index
+ * @param segmentFraction0 a segment fraction
+ * @param componentIndex1 another component index
+ * @param segmentIndex1 another segment index
+ * @param segmentFraction1 another segment fraction
+ *@return a negative integer, zero, or a positive integer
+ * as the first set of location values
+ * is less than, equal to, or greater than the second set of locationValues
+ */
+ public static int compareLocationValues(
+ int componentIndex0, int segmentIndex0, double segmentFraction0,
+ int componentIndex1, int segmentIndex1, double segmentFraction1)
+ {
+ // compare component indices
+ if (componentIndex0 < componentIndex1) return -1;
+ if (componentIndex0 > componentIndex1) return 1;
+ // compare segments
+ if (segmentIndex0 < segmentIndex1) return -1;
+ if (segmentIndex0 > segmentIndex1) return 1;
+ // same segment, so compare segment fraction
+ if (segmentFraction0 < segmentFraction1) return -1;
+ if (segmentFraction0 > segmentFraction1) return 1;
+ // same location
+ return 0;
+ }
+
+ /**
+ * Tests whether two locations
+ * are on the same segment in the parent {@link Geometry}.
+ *
+ * @param loc a location on the same geometry
+ * @return true if the locations are on the same segment of the parent geometry
+ */
+ public boolean isOnSameSegment(LinearLocation loc)
+ {
+ if (componentIndex != loc.componentIndex) return false;
+ if (segmentIndex == loc.segmentIndex) return true;
+ if (loc.segmentIndex - segmentIndex == 1
+ && loc.segmentFraction == 0.0)
+ return true;
+ if (segmentIndex - loc.segmentIndex == 1
+ && segmentFraction == 0.0)
+ return true;
+ return false;
+ }
+
+ /**
+ * Tests whether this location is an endpoint of
+ * the linear component it refers to.
+ *
+ * @param linearGeom the linear geometry referenced by this location
+ * @return true if the location is a component endpoint
+ */
+ public boolean isEndpoint(Geometry linearGeom)
+ {
+ LineString lineComp = (LineString) linearGeom.getGeometryN(componentIndex);
+ // check for endpoint
+ int nseg = lineComp.getNumPoints() - 1;
+ return segmentIndex >= nseg
+ || (segmentIndex == nseg && segmentFraction >= 1.0);
+ }
+
+ /**
+ * Converts a linear location to the lowest equivalent location index.
+ * The lowest index has the lowest possible component and segment indices.
+ * <p>
+ * Specifically:
+ * <ul>
+ * <li>if the location point is an endpoint, a location value is returned as (nseg-1, 1.0)
+ * <li>if the location point is ambiguous (i.e. an endpoint and a startpoint), the lowest endpoint location is returned
+ * </ul>
+ * If the location index is already the lowest possible value, the original location is returned.
+ *
+ * @param linearGeom the linear geometry referenced by this location
+ * @return the lowest equivalent location
+ */
+ public LinearLocation toLowest(Geometry linearGeom)
+ {
+ // TODO: compute lowest component index
+ LineString lineComp = (LineString) linearGeom.getGeometryN(componentIndex);
+ int nseg = lineComp.getNumPoints() - 1;
+ // if not an endpoint can be returned directly
+ if (segmentIndex < nseg) return this;
+ return new LinearLocation(componentIndex, nseg, 1.0, false);
+ }
+
+ /**
+ * Copies this location
+ *
+ * @return a copy of this location
+ * @deprecated
+ */
+ public Object clone()
+ {
+ return copy();
+ }
+
+ /**
+ * Copies this location
+ *
+ * @return a copy of this location
+ */
+ public LinearLocation copy() {
+ return new LinearLocation(componentIndex, segmentIndex, segmentFraction);
+ }
+
+ public String toString()
+ {
+ return "LinearLoc["
+ + componentIndex + ", "
+ + segmentIndex + ", "
+ + segmentFraction + "]";
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexOfLine.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexOfLine.java
new file mode 100644
index 0000000..bbc6b66
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexOfLine.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * Determines the location of a subline along a linear {@link Geometry}.
+ * The location is reported as a pair of {@link LinearLocation}s.
+ * <p>
+ * <b>Note:</b> Currently this algorithm is not guaranteed to
+ * return the correct substring in some situations where
+ * an endpoint of the test line occurs more than once in the input line.
+ * (However, the common case of a ring is always handled correctly).
+ */
+class LocationIndexOfLine
+{
+ /**
+ * MD - this algorithm has been extracted into a class
+ * because it is intended to validate that the subline truly is a subline,
+ * and also to use the internal vertex information to unambiguously locate the subline.
+ */
+ public static LinearLocation[] indicesOf(Geometry linearGeom, Geometry subLine)
+ {
+ LocationIndexOfLine locater = new LocationIndexOfLine(linearGeom);
+ return locater.indicesOf(subLine);
+ }
+
+ private Geometry linearGeom;
+
+ public LocationIndexOfLine(Geometry linearGeom) {
+ this.linearGeom = linearGeom;
+ }
+
+ public LinearLocation[] indicesOf(Geometry subLine)
+ {
+ Coordinate startPt = ((LineString) subLine.getGeometryN(0)).getCoordinateN(0);
+ LineString lastLine = (LineString) subLine.getGeometryN(subLine.getNumGeometries() - 1);
+ Coordinate endPt = lastLine.getCoordinateN(lastLine.getNumPoints() - 1);
+
+ LocationIndexOfPoint locPt = new LocationIndexOfPoint(linearGeom);
+ LinearLocation[] subLineLoc = new LinearLocation[2];
+ subLineLoc[0] = locPt.indexOf(startPt);
+
+ // check for case where subline is zero length
+ if (subLine.getLength() == 0.0) {
+ subLineLoc[1] = subLineLoc[0].copy();
+ }
+ else {
+ subLineLoc[1] = locPt.indexOfAfter(endPt, subLineLoc[0]);
+ }
+ return subLineLoc;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexOfPoint.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexOfPoint.java
new file mode 100644
index 0000000..b3a6fb0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexOfPoint.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Computes the {@link LinearLocation} of the point
+ * on a linear {@link Geometry} nearest a given {@link Coordinate}.
+ * The nearest point is not necessarily unique; this class
+ * always computes the nearest point closest to
+ * the start of the geometry.
+ */
+class LocationIndexOfPoint
+{
+ public static LinearLocation indexOf(Geometry linearGeom, Coordinate inputPt)
+ {
+ LocationIndexOfPoint locater = new LocationIndexOfPoint(linearGeom);
+ return locater.indexOf(inputPt);
+ }
+
+ public static LinearLocation indexOfAfter(Geometry linearGeom, Coordinate inputPt, LinearLocation minIndex)
+ {
+ LocationIndexOfPoint locater = new LocationIndexOfPoint(linearGeom);
+ return locater.indexOfAfter(inputPt, minIndex);
+ }
+
+ private Geometry linearGeom;
+
+ public LocationIndexOfPoint(Geometry linearGeom) {
+ this.linearGeom = linearGeom;
+ }
+
+ /**
+ * Find the nearest location along a linear {@link Geometry} to a given point.
+ *
+ * @param inputPt the coordinate to locate
+ * @return the location of the nearest point
+ */
+ public LinearLocation indexOf(Coordinate inputPt)
+ {
+ return indexOfFromStart(inputPt, null);
+ }
+
+ /**
+ * Find the nearest {@link LinearLocation} along the linear {@link Geometry}
+ * to a given {@link Coordinate}
+ * after the specified minimum {@link LinearLocation}.
+ * If possible the location returned will be strictly greater than the
+ * <code>minLocation</code>.
+ * If this is not possible, the
+ * value returned will equal <code>minLocation</code>.
+ * (An example where this is not possible is when
+ * minLocation = [end of line] ).
+ *
+ * @param inputPt the coordinate to locate
+ * @param minIndex the minimum location for the point location
+ * @return the location of the nearest point
+ */
+ public LinearLocation indexOfAfter(Coordinate inputPt, LinearLocation minIndex)
+ {
+ if (minIndex == null) return indexOf(inputPt);
+
+ // sanity check for minLocation at or past end of line
+ LinearLocation endLoc = LinearLocation.getEndLocation(linearGeom);
+ if (endLoc.compareTo(minIndex) <= 0)
+ return endLoc;
+
+ LinearLocation closestAfter = indexOfFromStart(inputPt, minIndex);
+ /**
+ * Return the minDistanceLocation found.
+ * This will not be null, since it was initialized to minLocation
+ */
+ Assert.isTrue(closestAfter.compareTo(minIndex) >= 0,
+ "computed location is before specified minimum location");
+ return closestAfter;
+ }
+
+ private LinearLocation indexOfFromStart(Coordinate inputPt, LinearLocation minIndex)
+ {
+ double minDistance = Double.MAX_VALUE;
+ int minComponentIndex = 0;
+ int minSegmentIndex = 0;
+ double minFrac = -1.0;
+
+ LineSegment seg = new LineSegment();
+ for (LinearIterator it = new LinearIterator(linearGeom);
+ it.hasNext(); it.next()) {
+ if (! it.isEndOfLine()) {
+ seg.p0 = it.getSegmentStart();
+ seg.p1 = it.getSegmentEnd();
+ double segDistance = seg.distance(inputPt);
+ double segFrac = seg.segmentFraction(inputPt);
+
+ int candidateComponentIndex = it.getComponentIndex();
+ int candidateSegmentIndex = it.getVertexIndex();
+ if (segDistance < minDistance) {
+ // ensure after minLocation, if any
+ if (minIndex == null ||
+ minIndex.compareLocationValues(
+ candidateComponentIndex, candidateSegmentIndex, segFrac)
+ < 0
+ ) {
+ // otherwise, save this as new minimum
+ minComponentIndex = candidateComponentIndex;
+ minSegmentIndex = candidateSegmentIndex;
+ minFrac = segFrac;
+ minDistance = segDistance;
+ }
+ }
+ }
+ }
+ if (minDistance == Double.MAX_VALUE) {
+ // no minimum was found past minLocation, so return it
+ return new LinearLocation(minIndex);
+ }
+ // otherwise, return computed location
+ LinearLocation loc = new LinearLocation(minComponentIndex, minSegmentIndex, minFrac);
+ return loc;
+ }
+
+ /**
+ * Computes the fraction of distance (in <tt>[0.0, 1.0]</tt>)
+ * that a point occurs along a line segment.
+ * If the point is beyond either ends of the line segment,
+ * the closest fractional value (<tt>0.0</tt> or <tt>1.0</tt>) is returned.
+ *
+ * @param seg the line segment to use
+ * @param inputPt the point
+ * @return the fraction along the line segment the point occurs
+ */
+ /*
+ // MD - no longer needed
+ private static double segmentFraction(
+ LineSegment seg,
+ Coordinate inputPt)
+ {
+ double segFrac = seg.projectionFactor(inputPt);
+ if (segFrac < 0.0)
+ segFrac = 0.0;
+ else if (segFrac > 1.0)
+ segFrac = 1.0;
+ return segFrac;
+ }
+ */
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexedLine.java b/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexedLine.java
new file mode 100644
index 0000000..2b25110
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/LocationIndexedLine.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+
+/**
+ * Supports linear referencing
+ * along a linear {@link Geometry}
+ * using {@link LinearLocation}s as the index.
+ */
+public class LocationIndexedLine
+{
+ private Geometry linearGeom;
+
+ /**
+ * Constructs an object which allows linear referencing along
+ * a given linear {@link Geometry}.
+ *
+ * @param linearGeom the linear geometry to reference along
+ */
+ public LocationIndexedLine(Geometry linearGeom)
+ {
+ this.linearGeom = linearGeom;
+ checkGeometryType();
+ }
+
+ private void checkGeometryType()
+ {
+ if (! (linearGeom instanceof LineString || linearGeom instanceof MultiLineString))
+ throw new IllegalArgumentException("Input geometry must be linear");
+ }
+ /**
+ * Computes the {@link Coordinate} for the point
+ * on the line at the given index.
+ * If the index is out of range the first or last point on the
+ * line will be returned.
+ * The Z-ordinate of the computed point will be interpolated from
+ * the Z-ordinates of the line segment containing it, if they exist.
+ *
+ * @param index the index of the desired point
+ * @return the Coordinate at the given index
+ */
+ public Coordinate extractPoint(LinearLocation index)
+ {
+ return index.getCoordinate(linearGeom);
+ }
+
+ /**
+ * Computes the {@link Coordinate} for the point
+ * on the line at the given index, offset by the given distance.
+ * If the index is out of range the first or last point on the
+ * line will be returned.
+ * The computed point is offset to the left of the line if the offset distance is
+ * positive, to the right if negative.
+ *
+ * The Z-ordinate of the computed point will be interpolated from
+ * the Z-ordinates of the line segment containing it, if they exist.
+ *
+ * @param index the index of the desired point
+ * @param offsetDistance the distance the point is offset from the segment
+ * (positive is to the left, negative is to the right)
+ * @return the Coordinate at the given index
+ */
+ public Coordinate extractPoint(LinearLocation index, double offsetDistance)
+ {
+ LinearLocation indexLow = index.toLowest(linearGeom);
+ return indexLow.getSegment(linearGeom).pointAlongOffset(indexLow.getSegmentFraction(), offsetDistance);
+ }
+
+ /**
+ * Computes the {@link LineString} for the interval
+ * on the line between the given indices.
+ * If the start location is after the end location,
+ * the computed linear geometry has reverse orientation to the input line.
+ *
+ * @param startIndex the index of the start of the interval
+ * @param endIndex the index of the end of the interval
+ * @return the linear geometry between the indices
+ */
+ public Geometry extractLine(LinearLocation startIndex, LinearLocation endIndex)
+ {
+ return ExtractLineByLocation.extract(linearGeom, startIndex, endIndex);
+ }
+
+ /**
+ * Computes the index for a given point on the line.
+ * <p>
+ * The supplied point does not <i>necessarily</i> have to lie precisely
+ * on the line, but if it is far from the line the accuracy and
+ * performance of this function is not guaranteed.
+ * Use {@link #project} to compute a guaranteed result for points
+ * which may be far from the line.
+ *
+ * @param pt a point on the line
+ * @return the index of the point
+ * @see #project(Coordinate)
+ */
+ public LinearLocation indexOf(Coordinate pt)
+ {
+ return LocationIndexOfPoint.indexOf(linearGeom, pt);
+ }
+
+ /**
+ * Finds the index for a point on the line
+ * which is greater than the given index.
+ * If no such index exists, returns <tt>minIndex</tt>.
+ * This method can be used to determine all indexes for
+ * a point which occurs more than once on a non-simple line.
+ * It can also be used to disambiguate cases where the given point lies
+ * slightly off the line and is equidistant from two different
+ * points on the line.
+ *
+ * The supplied point does not <i>necessarily</i> have to lie precisely
+ * on the line, but if it is far from the line the accuracy and
+ * performance of this function is not guaranteed.
+ * Use {@link #project} to compute a guaranteed result for points
+ * which may be far from the line.
+ *
+ * @param pt a point on the line
+ * @param minIndex the value the returned index must be greater than
+ * @return the index of the point greater than the given minimum index
+ *
+ * @see #project(Coordinate)
+ */
+ public LinearLocation indexOfAfter(Coordinate pt, LinearLocation minIndex)
+ {
+ return LocationIndexOfPoint.indexOfAfter(linearGeom, pt, minIndex);
+ }
+
+
+ /**
+ * Computes the indices for a subline of the line.
+ * (The subline must <i>conform</i> to the line; that is,
+ * all vertices in the subline (except possibly the first and last)
+ * must be vertices of the line and occur in the same order).
+ *
+ * @param subLine a subLine of the line
+ * @return a pair of indices for the start and end of the subline.
+ */
+ public LinearLocation[] indicesOf(Geometry subLine)
+ {
+ return LocationIndexOfLine.indicesOf(linearGeom, subLine);
+ }
+
+ /**
+ * Computes the index for the closest point on the line to the given point.
+ * If more than one point has the closest distance the first one along the line
+ * is returned.
+ * (The point does not necessarily have to lie precisely on the line.)
+ *
+ * @param pt a point on the line
+ * @return the index of the point
+ */
+ public LinearLocation project(Coordinate pt)
+ {
+ return LocationIndexOfPoint.indexOf(linearGeom, pt);
+ }
+
+ /**
+ * Returns the index of the start of the line
+ * @return the location index
+ */
+ public LinearLocation getStartIndex()
+ {
+ return new LinearLocation();
+ }
+
+ /**
+ * Returns the index of the end of the line
+ * @return the location index
+ */
+ public LinearLocation getEndIndex()
+ {
+ return LinearLocation.getEndLocation(linearGeom);
+ }
+
+ /**
+ * Tests whether an index is in the valid index range for the line.
+ *
+ * @param index the index to test
+ * @return <code>true</code> if the index is in the valid range
+ */
+ public boolean isValidIndex(LinearLocation index)
+ {
+ return index.isValid(linearGeom);
+ }
+
+ /**
+ * Computes a valid index for this line
+ * by clamping the given index to the valid range of index values
+ *
+ * @return a valid index value
+ */
+ public LinearLocation clampIndex(LinearLocation index)
+ {
+ LinearLocation loc = index.copy();
+ loc.clamp(linearGeom);
+ return loc;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/linearref/package.html b/modules/core/src/main/java/org/locationtech/jts/linearref/package.html
new file mode 100644
index 0000000..303986d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/linearref/package.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes and interfaces implementing linear referencing on linear geometries
+
+<H3>Linear Referencing</H3>
+
+Linear Referencing is a way of defining positions along linear geometries
+(<code>LineStrings</code> and <code>MultiLineStrings</code>).
+It is used extensively in linear network systems.
+There are numerous possible <b>Linear Referencing Methods</b> which
+can be used to define positions along linear geometry.
+This package supports two:
+<ul>
+<li><b>Linear Location</b> - a linear location is a triple
+<code>(component index, segment index, segment fraction)</code>
+which precisely specifies a point on a linear geometry.
+It allows for efficient mapping of the index value to actual coordinate values.
+<li><b>Length</b> - the natural concept of using the length along
+the geometry to specify a position.
+
+<h2>Package Specification</h2>
+
+<ul>
+ <li>Java Topology Suite Technical Specifications
+ <li><A HREF="http://www.opengis.org/techno/specs.htm">
+ OpenGIS Simple Features Specification for SQL</A>
+</ul>
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/math/DD.java b/modules/core/src/main/java/org/locationtech/jts/math/DD.java
new file mode 100644
index 0000000..7f7e252
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/math/DD.java
@@ -0,0 +1,1380 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.math;
+
+import java.io.Serializable;
+
+/**
+ * Implements extended-precision floating-point numbers
+ * which maintain 106 bits (approximately 30 decimal digits) of precision.
+ * <p>
+ * A DoubleDouble uses a representation containing two double-precision values.
+ * A number x is represented as a pair of doubles, x.hi and x.lo,
+ * such that the number represented by x is x.hi + x.lo, where
+ * <pre>
+ * |x.lo| <= 0.5*ulp(x.hi)
+ * </pre>
+ * and ulp(y) means "unit in the last place of y".
+ * The basic arithmetic operations are implemented using
+ * convenient properties of IEEE-754 floating-point arithmetic.
+ * <p>
+ * The range of values which can be represented is the same as in IEEE-754.
+ * The precision of the representable numbers
+ * is twice as great as IEEE-754 double precision.
+ * <p>
+ * The correctness of the arithmetic algorithms relies on operations
+ * being performed with standard IEEE-754 double precision and rounding.
+ * This is the Java standard arithmetic model, but for performance reasons
+ * Java implementations are not
+ * constrained to using this standard by default.
+ * Some processors (notably the Intel Pentium architecture) perform
+ * floating point operations in (non-IEEE-754-standard) extended-precision.
+ * A JVM implementation may choose to use the non-standard extended-precision
+ * as its default arithmetic mode.
+ * To prevent this from happening, this code uses the
+ * Java <tt>strictfp</tt> modifier,
+ * which forces all operations to take place in the standard IEEE-754 rounding model.
+ * <p>
+ * The API provides both a set of value-oriented operations
+ * and a set of mutating operations.
+ * Value-oriented operations treat DoubleDouble values as
+ * immutable; operations on them return new objects carrying the result
+ * of the operation. This provides a simple and safe semantics for
+ * writing DoubleDouble expressions. However, there is a performance
+ * penalty for the object allocations required.
+ * The mutable interface updates object values in-place.
+ * It provides optimum memory performance, but requires
+ * care to ensure that aliasing errors are not created
+ * and constant values are not changed.
+ * <p>
+ * For example, the following code example constructs three DD instances:
+ * two to hold the input values and one to hold the result of the addition.
+ * <pre>
+ * DD a = new DD(2.0);
+ * DD b = new DD(3.0);
+ * DD c = a.add(b);
+ * </pre>
+ * In contrast, the following approach uses only one object:
+ * <pre>
+ * DD a = new DD(2.0);
+ * a.selfAdd(3.0);
+ * </pre>
+ * <p>
+ * This implementation uses algorithms originally designed variously by
+ * Knuth, Kahan, Dekker, and Linnainmaa.
+ * Douglas Priest developed the first C implementation of these techniques.
+ * Other more recent C++ implementation are due to Keith M. Briggs and David Bailey et al.
+ *
+ * <h3>References</h3>
+ * <ul>
+ * <li>Priest, D., <i>Algorithms for Arbitrary Precision Floating Point Arithmetic</i>,
+ * in P. Kornerup and D. Matula, Eds., Proc. 10th Symposium on Computer Arithmetic,
+ * IEEE Computer Society Press, Los Alamitos, Calif., 1991.
+ * <li>Yozo Hida, Xiaoye S. Li and David H. Bailey,
+ * <i>Quad-Double Arithmetic: Algorithms, Implementation, and Application</i>,
+ * manuscript, Oct 2000; Lawrence Berkeley National Laboratory Report BNL-46996.
+ * <li>David Bailey, <i>High Precision Software Directory</i>;
+ * <tt>http://crd.lbl.gov/~dhbailey/mpdist/index.html</tt>
+ * </ul>
+ *
+ *
+ * @author Martin Davis
+ *
+ */
+public strictfp final class DD
+ implements Serializable, Comparable, Cloneable
+{
+ /**
+ * The value nearest to the constant Pi.
+ */
+ public static final DD PI = new DD(
+ 3.141592653589793116e+00,
+ 1.224646799147353207e-16);
+
+ /**
+ * The value nearest to the constant 2 * Pi.
+ */
+ public static final DD TWO_PI = new DD(
+ 6.283185307179586232e+00,
+ 2.449293598294706414e-16);
+
+ /**
+ * The value nearest to the constant Pi / 2.
+ */
+ public static final DD PI_2 = new DD(
+ 1.570796326794896558e+00,
+ 6.123233995736766036e-17);
+
+ /**
+ * The value nearest to the constant e (the natural logarithm base).
+ */
+ public static final DD E = new DD(
+ 2.718281828459045091e+00,
+ 1.445646891729250158e-16);
+
+ /**
+ * A value representing the result of an operation which does not return a valid number.
+ */
+ public static final DD NaN = new DD(Double.NaN, Double.NaN);
+
+ /**
+ * The smallest representable relative difference between two {link @ DoubleDouble} values
+ */
+ public static final double EPS = 1.23259516440783e-32; /* = 2^-106 */
+
+ private static DD createNaN()
+ {
+ return new DD(Double.NaN, Double.NaN);
+ }
+
+ /**
+ * Converts the string argument to a DoubleDouble number.
+ *
+ * @param str a string containing a representation of a numeric value
+ * @return the extended precision version of the value
+ * @throws NumberFormatException if <tt>s</tt> is not a valid representation of a number
+ */
+ public static DD valueOf(String str)
+ throws NumberFormatException
+ {
+ return parse(str);
+ }
+
+ /**
+ * Converts the <tt>double</tt> argument to a DoubleDouble number.
+ *
+ * @param x a numeric value
+ * @return the extended precision version of the value
+ */
+ public static DD valueOf(double x) { return new DD(x); }
+
+ /**
+ * The value to split a double-precision value on during multiplication
+ */
+ private static final double SPLIT = 134217729.0D; // 2^27+1, for IEEE double
+
+ /**
+ * The high-order component of the double-double precision value.
+ */
+ private double hi = 0.0;
+
+ /**
+ * The low-order component of the double-double precision value.
+ */
+ private double lo = 0.0;
+
+ /**
+ * Creates a new DoubleDouble with value 0.0.
+ */
+ public DD()
+ {
+ init(0.0);
+ }
+
+ /**
+ * Creates a new DoubleDouble with value x.
+ *
+ * @param x the value to initialize
+ */
+ public DD(double x)
+ {
+ init(x);
+ }
+
+ /**
+ * Creates a new DoubleDouble with value (hi, lo).
+ *
+ * @param hi the high-order component
+ * @param lo the high-order component
+ */
+ public DD(double hi, double lo)
+ {
+ init(hi, lo);
+ }
+
+ /**
+ * Creates a new DoubleDouble with value equal to the argument.
+ *
+ * @param dd the value to initialize
+ */
+ public DD(DD dd)
+ {
+ init(dd);
+ }
+
+ /**
+ * Creates a new DoubleDouble with value equal to the argument.
+ *
+ * @param str the value to initialize by
+ * @throws NumberFormatException if <tt>str</tt> is not a valid representation of a number
+ */
+ public DD(String str)
+ throws NumberFormatException
+ {
+ this(parse(str));
+ }
+
+ /**
+ * Creates a new DoubleDouble with the value of the argument.
+ *
+ * @param dd the DoubleDouble value to copy
+ * @return a copy of the input value
+ */
+ public static DD copy(DD dd)
+ {
+ return new DD(dd);
+ }
+
+ /**
+ * Creates and returns a copy of this value.
+ *
+ * @return a copy of this value
+ */
+ public Object clone()
+ {
+ try {
+ return super.clone();
+ }
+ catch (CloneNotSupportedException ex) {
+ // should never reach here
+ return null;
+ }
+ }
+
+ private final void init(double x)
+ {
+ this.hi = x;
+ this.lo = 0.0;
+ }
+
+ private final void init(double hi, double lo)
+ {
+ this.hi = hi;
+ this.lo = lo;
+ }
+
+ private final void init(DD dd)
+ {
+ hi = dd.hi;
+ lo = dd.lo;
+ }
+
+ /*
+ double getHighComponent() { return hi; }
+
+ double getLowComponent() { return lo; }
+ */
+
+ // Testing only - should not be public
+ /*
+ public void RENORM()
+ {
+ double s = hi + lo;
+ double err = lo - (s - hi);
+ hi = s;
+ lo = err;
+ }
+ */
+
+ /**
+ * Set the value for the DD object. This method supports the mutating
+ * operations concept described in the class documentation (see above).
+ * @param value a DD instance supplying an extended-precision value.
+ * @return a self-reference to the DD instance.
+ */
+ public DD setValue(DD value) {
+ init(value);
+ return this;
+ }
+
+ /**
+ * Set the value for the DD object. This method supports the mutating
+ * operations concept described in the class documentation (see above).
+ * @param value a floating point value to be stored in the instance.
+ * @return a self-reference to the DD instance.
+ */
+ public DD setValue(double value) {
+ init(value);
+ return this;
+ }
+
+
+ /**
+ * Returns a new DoubleDouble whose value is <tt>(this + y)</tt>.
+ *
+ * @param y the addend
+ * @return <tt>(this + y)</tt>
+ */
+ public final DD add(DD y)
+ {
+ return copy(this).selfAdd(y);
+ }
+
+ /**
+ * Returns a new DoubleDouble whose value is <tt>(this + y)</tt>.
+ *
+ * @param y the addend
+ * @return <tt>(this + y)</tt>
+ */
+ public final DD add(double y)
+ {
+ return copy(this).selfAdd(y);
+ }
+
+ /**
+ * Adds the argument to the value of <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the addend
+ * @return this object, increased by y
+ */
+ public final DD selfAdd(DD y)
+ {
+ return selfAdd(y.hi, y.lo);
+ }
+
+ /**
+ * Adds the argument to the value of <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the addend
+ * @return this object, increased by y
+ */
+ public final DD selfAdd(double y)
+ {
+ double H, h, S, s, e, f;
+ S = hi + y;
+ e = S - hi;
+ s = S - e;
+ s = (y - e) + (hi - s);
+ f = s + lo;
+ H = S + f;
+ h = f + (S - H);
+ hi = H + h;
+ lo = h + (H - hi);
+ return this;
+ // return selfAdd(y, 0.0);
+ }
+
+ private final DD selfAdd(double yhi, double ylo)
+ {
+ double H, h, T, t, S, s, e, f;
+ S = hi + yhi;
+ T = lo + ylo;
+ e = S - hi;
+ f = T - lo;
+ s = S-e;
+ t = T-f;
+ s = (yhi-e)+(hi-s);
+ t = (ylo-f)+(lo-t);
+ e = s+T; H = S+e; h = e+(S-H); e = t+h;
+
+ double zhi = H + e;
+ double zlo = e + (H - zhi);
+ hi = zhi;
+ lo = zlo;
+ return this;
+ }
+
+ /**
+ * Computes a new DoubleDouble object whose value is <tt>(this - y)</tt>.
+ *
+ * @param y the subtrahend
+ * @return <tt>(this - y)</tt>
+ */
+ public final DD subtract(DD y)
+ {
+ return add(y.negate());
+ }
+
+ /**
+ * Computes a new DoubleDouble object whose value is <tt>(this - y)</tt>.
+ *
+ * @param y the subtrahend
+ * @return <tt>(this - y)</tt>
+ */
+ public final DD subtract(double y)
+ {
+ return add(-y);
+ }
+
+
+ /**
+ * Subtracts the argument from the value of <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the addend
+ * @return this object, decreased by y
+ */
+ public final DD selfSubtract(DD y)
+ {
+ if (isNaN()) return this;
+ return selfAdd(-y.hi, -y.lo);
+ }
+
+ /**
+ * Subtracts the argument from the value of <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the addend
+ * @return this object, decreased by y
+ */
+ public final DD selfSubtract(double y)
+ {
+ if (isNaN()) return this;
+ return selfAdd(-y, 0.0);
+ }
+
+ /**
+ * Returns a new DoubleDouble whose value is <tt>-this</tt>.
+ *
+ * @return <tt>-this</tt>
+ */
+ public final DD negate()
+ {
+ if (isNaN()) return this;
+ return new DD(-hi, -lo);
+ }
+
+ /**
+ * Returns a new DoubleDouble whose value is <tt>(this * y)</tt>.
+ *
+ * @param y the multiplicand
+ * @return <tt>(this * y)</tt>
+ */
+ public final DD multiply(DD y)
+ {
+ if (y.isNaN()) return createNaN();
+ return copy(this).selfMultiply(y);
+ }
+
+ /**
+ * Returns a new DoubleDouble whose value is <tt>(this * y)</tt>.
+ *
+ * @param y the multiplicand
+ * @return <tt>(this * y)</tt>
+ */
+ public final DD multiply(double y)
+ {
+ if (Double.isNaN(y)) return createNaN();
+ return copy(this).selfMultiply(y, 0.0);
+ }
+
+ /**
+ * Multiplies this object by the argument, returning <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the value to multiply by
+ * @return this object, multiplied by y
+ */
+ public final DD selfMultiply(DD y)
+ {
+ return selfMultiply(y.hi, y.lo);
+ }
+
+ /**
+ * Multiplies this object by the argument, returning <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the value to multiply by
+ * @return this object, multiplied by y
+ */
+ public final DD selfMultiply(double y)
+ {
+ return selfMultiply(y, 0.0);
+ }
+
+ private final DD selfMultiply(double yhi, double ylo)
+ {
+ double hx, tx, hy, ty, C, c;
+ C = SPLIT * hi; hx = C-hi; c = SPLIT * yhi;
+ hx = C-hx; tx = hi-hx; hy = c-yhi;
+ C = hi*yhi; hy = c-hy; ty = yhi-hy;
+ c = ((((hx*hy-C)+hx*ty)+tx*hy)+tx*ty)+(hi*ylo+lo*yhi);
+ double zhi = C+c; hx = C-zhi;
+ double zlo = c+hx;
+ hi = zhi;
+ lo = zlo;
+ return this;
+ }
+
+ /**
+ * Computes a new DoubleDouble whose value is <tt>(this / y)</tt>.
+ *
+ * @param y the divisor
+ * @return a new object with the value <tt>(this / y)</tt>
+ */
+ public final DD divide(DD y)
+ {
+ double hc, tc, hy, ty, C, c, U, u;
+ C = hi/y.hi; c = SPLIT*C; hc =c-C; u = SPLIT*y.hi; hc = c-hc;
+ tc = C-hc; hy = u-y.hi; U = C * y.hi; hy = u-hy; ty = y.hi-hy;
+ u = (((hc*hy-U)+hc*ty)+tc*hy)+tc*ty;
+ c = ((((hi-U)-u)+lo)-C*y.lo)/y.hi;
+ u = C+c;
+
+ double zhi = u;
+ double zlo = (C-u)+c;
+ return new DD(zhi, zlo);
+ }
+
+ /**
+ * Computes a new DoubleDouble whose value is <tt>(this / y)</tt>.
+ *
+ * @param y the divisor
+ * @return a new object with the value <tt>(this / y)</tt>
+ */
+ public final DD divide(double y)
+ {
+ if (Double.isNaN(y)) return createNaN();
+ return copy(this).selfDivide(y, 0.0);
+ }
+
+ /**
+ * Divides this object by the argument, returning <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the value to divide by
+ * @return this object, divided by y
+ */
+ public final DD selfDivide(DD y)
+ {
+ return selfDivide(y.hi, y.lo);
+ }
+
+ /**
+ * Divides this object by the argument, returning <tt>this</tt>.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @param y the value to divide by
+ * @return this object, divided by y
+ */
+ public final DD selfDivide(double y)
+ {
+ return selfDivide(y, 0.0);
+ }
+
+ private final DD selfDivide(double yhi, double ylo)
+ {
+ double hc, tc, hy, ty, C, c, U, u;
+ C = hi/yhi; c = SPLIT*C; hc =c-C; u = SPLIT*yhi; hc = c-hc;
+ tc = C-hc; hy = u-yhi; U = C * yhi; hy = u-hy; ty = yhi-hy;
+ u = (((hc*hy-U)+hc*ty)+tc*hy)+tc*ty;
+ c = ((((hi-U)-u)+lo)-C*ylo)/yhi;
+ u = C+c;
+
+ hi = u;
+ lo = (C-u)+c;
+ return this;
+ }
+
+ /**
+ * Returns a DoubleDouble whose value is <tt>1 / this</tt>.
+ *
+ * @return the reciprocal of this value
+ */
+ public final DD reciprocal()
+ {
+ double hc, tc, hy, ty, C, c, U, u;
+ C = 1.0/hi;
+ c = SPLIT*C;
+ hc =c-C;
+ u = SPLIT*hi;
+ hc = c-hc; tc = C-hc; hy = u-hi; U = C*hi; hy = u-hy; ty = hi-hy;
+ u = (((hc*hy-U)+hc*ty)+tc*hy)+tc*ty;
+ c = ((((1.0-U)-u))-C*lo)/hi;
+
+ double zhi = C+c;
+ double zlo = (C-zhi)+c;
+ return new DD(zhi, zlo);
+ }
+
+ /**
+ * Returns the largest (closest to positive infinity)
+ * value that is not greater than the argument
+ * and is equal to a mathematical integer.
+ * Special cases:
+ * <ul>
+ * <li>If this value is NaN, returns NaN.
+ * </ul>
+ *
+ * @return the largest (closest to positive infinity)
+ * value that is not greater than the argument
+ * and is equal to a mathematical integer.
+ */
+ public DD floor()
+ {
+ if (isNaN()) return NaN;
+ double fhi=Math.floor(hi);
+ double flo = 0.0;
+ // Hi is already integral. Floor the low word
+ if (fhi == hi) {
+ flo = Math.floor(lo);
+ }
+ // do we need to renormalize here?
+ return new DD(fhi, flo);
+ }
+
+ /**
+ * Returns the smallest (closest to negative infinity) value
+ * that is not less than the argument and is equal to a mathematical integer.
+ * Special cases:
+ * <ul>
+ * <li>If this value is NaN, returns NaN.
+ * </ul>
+ *
+ * @return the smallest (closest to negative infinity) value
+ * that is not less than the argument and is equal to a mathematical integer.
+ */
+ public DD ceil()
+ {
+ if (isNaN()) return NaN;
+ double fhi=Math.ceil(hi);
+ double flo = 0.0;
+ // Hi is already integral. Ceil the low word
+ if (fhi == hi) {
+ flo = Math.ceil(lo);
+ // do we need to renormalize here?
+ }
+ return new DD(fhi, flo);
+ }
+
+ /**
+ * Returns an integer indicating the sign of this value.
+ * <ul>
+ * <li>if this value is > 0, returns 1
+ * <li>if this value is < 0, returns -1
+ * <li>if this value is = 0, returns 0
+ * <li>if this value is NaN, returns 0
+ * </ul>
+ *
+ * @return an integer indicating the sign of this value
+ */
+ public int signum()
+ {
+ if (hi > 0) return 1;
+ if (hi < 0) return -1;
+ if (lo > 0) return 1;
+ if (lo < 0) return -1;
+ return 0;
+ }
+
+ /**
+ * Rounds this value to the nearest integer.
+ * The value is rounded to an integer by adding 1/2 and taking the floor of the result.
+ * Special cases:
+ * <ul>
+ * <li>If this value is NaN, returns NaN.
+ * </ul>
+ *
+ * @return this value rounded to the nearest integer
+ */
+ public DD rint()
+ {
+ if (isNaN()) return this;
+ // may not be 100% correct
+ DD plus5 = this.add(0.5);
+ return plus5.floor();
+ }
+
+ /**
+ * Returns the integer which is largest in absolute value and not further
+ * from zero than this value.
+ * Special cases:
+ * <ul>
+ * <li>If this value is NaN, returns NaN.
+ * </ul>
+ *
+ * @return the integer which is largest in absolute value and not further from zero than this value
+ */
+ public DD trunc()
+ {
+ if (isNaN()) return NaN;
+ if (isPositive())
+ return floor();
+ else
+ return ceil();
+ }
+
+ /**
+ * Returns the absolute value of this value.
+ * Special cases:
+ * <ul>
+ * <li>If this value is NaN, it is returned.
+ * </ul>
+ *
+ * @return the absolute value of this value
+ */
+ public DD abs()
+ {
+ if (isNaN()) return NaN;
+ if (isNegative())
+ return negate();
+ return new DD(this);
+ }
+
+ /**
+ * Computes the square of this value.
+ *
+ * @return the square of this value.
+ */
+ public DD sqr()
+ {
+ return this.multiply(this);
+ }
+
+ /**
+ * Squares this object.
+ * To prevent altering constants,
+ * this method <b>must only</b> be used on values known to
+ * be newly created.
+ *
+ * @return the square of this value.
+ */
+ public DD selfSqr()
+ {
+ return this.selfMultiply(this);
+ }
+
+ /**
+ * Computes the square of this value.
+ *
+ * @return the square of this value.
+ */
+ public static DD sqr(double x)
+ {
+ return valueOf(x).selfMultiply(x);
+ }
+
+ /**
+ * Computes the positive square root of this value.
+ * If the number is NaN or negative, NaN is returned.
+ *
+ * @return the positive square root of this number.
+ * If the argument is NaN or less than zero, the result is NaN.
+ */
+ public DD sqrt()
+ {
+ /* Strategy: Use Karp's trick: if x is an approximation
+ to sqrt(a), then
+
+ sqrt(a) = a*x + [a - (a*x)^2] * x / 2 (approx)
+
+ The approximation is accurate to twice the accuracy of x.
+ Also, the multiplication (a*x) and [-]*x can be done with
+ only half the precision.
+ */
+
+ if (isZero())
+ return valueOf(0.0);
+
+ if (isNegative()) {
+ return NaN;
+ }
+
+ double x = 1.0 / Math.sqrt(hi);
+ double ax = hi * x;
+
+ DD axdd = valueOf(ax);
+ DD diffSq = this.subtract(axdd.sqr());
+ double d2 = diffSq.hi * (x * 0.5);
+
+ return axdd.add(d2);
+ }
+
+ public static DD sqrt(double x)
+ {
+ return valueOf(x).sqrt();
+ }
+
+ /**
+ * Computes the value of this number raised to an integral power.
+ * Follows semantics of Java Math.pow as closely as possible.
+ *
+ * @param exp the integer exponent
+ * @return x raised to the integral power exp
+ */
+ public DD pow(int exp)
+ {
+ if (exp == 0.0)
+ return valueOf(1.0);
+
+ DD r = new DD(this);
+ DD s = valueOf(1.0);
+ int n = Math.abs(exp);
+
+ if (n > 1) {
+ /* Use binary exponentiation */
+ while (n > 0) {
+ if (n % 2 == 1) {
+ s.selfMultiply(r);
+ }
+ n /= 2;
+ if (n > 0)
+ r = r.sqr();
+ }
+ } else {
+ s = r;
+ }
+
+ /* Compute the reciprocal if n is negative. */
+ if (exp < 0)
+ return s.reciprocal();
+ return s;
+ }
+
+
+ /*------------------------------------------------------------
+ * Ordering Functions
+ *------------------------------------------------------------
+ */
+
+ /**
+ * Computes the minimum of this and another DD number.
+ *
+ * @param x a DD number
+ * @return the minimum of the two numbers
+ */
+ public DD min(DD x) {
+ if (this.le(x)) {
+ return this;
+ }
+ else {
+ return x;
+ }
+ }
+
+ /**
+ * Computes the maximum of this and another DD number.
+ *
+ * @param x a DD number
+ * @return the maximum of the two numbers
+ */
+ public DD max(DD x) {
+ if (this.ge(x)) {
+ return this;
+ }
+ else {
+ return x;
+ }
+ }
+
+ /*------------------------------------------------------------
+ * Conversion Functions
+ *------------------------------------------------------------
+ */
+
+ /**
+ * Converts this value to the nearest double-precision number.
+ *
+ * @return the nearest double-precision number to this value
+ */
+ public double doubleValue()
+ {
+ return hi + lo;
+ }
+
+ /**
+ * Converts this value to the nearest integer.
+ *
+ * @return the nearest integer to this value
+ */
+ public int intValue()
+ {
+ return (int) hi;
+ }
+
+ /*------------------------------------------------------------
+ * Predicates
+ *------------------------------------------------------------
+ */
+
+ /**
+ * Tests whether this value is equal to 0.
+ *
+ * @return true if this value is equal to 0
+ */
+ public boolean isZero()
+ {
+ return hi == 0.0 && lo == 0.0;
+ }
+
+ /**
+ * Tests whether this value is less than 0.
+ *
+ * @return true if this value is less than 0
+ */
+ public boolean isNegative()
+ {
+ return hi < 0.0 || (hi == 0.0 && lo < 0.0);
+ }
+
+ /**
+ * Tests whether this value is greater than 0.
+ *
+ * @return true if this value is greater than 0
+ */
+ public boolean isPositive()
+ {
+ return hi > 0.0 || (hi == 0.0 && lo > 0.0);
+ }
+
+ /**
+ * Tests whether this value is NaN.
+ *
+ * @return true if this value is NaN
+ */
+ public boolean isNaN() { return Double.isNaN(hi); }
+
+ /**
+ * Tests whether this value is equal to another <tt>DoubleDouble</tt> value.
+ *
+ * @param y a DoubleDouble value
+ * @return true if this value = y
+ */
+ public boolean equals(DD y)
+ {
+ return hi == y.hi && lo == y.lo;
+ }
+
+ /**
+ * Tests whether this value is greater than another <tt>DoubleDouble</tt> value.
+ * @param y a DoubleDouble value
+ * @return true if this value > y
+ */
+ public boolean gt(DD y)
+ {
+ return (hi > y.hi) || (hi == y.hi && lo > y.lo);
+ }
+ /**
+ * Tests whether this value is greater than or equals to another <tt>DoubleDouble</tt> value.
+ * @param y a DoubleDouble value
+ * @return true if this value >= y
+ */
+ public boolean ge(DD y)
+ {
+ return (hi > y.hi) || (hi == y.hi && lo >= y.lo);
+ }
+ /**
+ * Tests whether this value is less than another <tt>DoubleDouble</tt> value.
+ * @param y a DoubleDouble value
+ * @return true if this value < y
+ */
+ public boolean lt(DD y)
+ {
+ return (hi < y.hi) || (hi == y.hi && lo < y.lo);
+ }
+ /**
+ * Tests whether this value is less than or equal to another <tt>DoubleDouble</tt> value.
+ * @param y a DoubleDouble value
+ * @return true if this value <= y
+ */
+ public boolean le(DD y)
+ {
+ return (hi < y.hi) || (hi == y.hi && lo <= y.lo);
+ }
+
+ /**
+ * Compares two DoubleDouble objects numerically.
+ *
+ * @return -1,0 or 1 depending on whether this value is less than, equal to
+ * or greater than the value of <tt>o</tt>
+ */
+ public int compareTo(Object o)
+ {
+ DD other = (DD) o;
+
+ if (hi < other.hi) return -1;
+ if (hi > other.hi) return 1;
+ if (lo < other.lo) return -1;
+ if (lo > other.lo) return 1;
+ return 0;
+ }
+
+
+ /*------------------------------------------------------------
+ * Output
+ *------------------------------------------------------------
+ */
+
+ private static final int MAX_PRINT_DIGITS = 32;
+ private static final DD TEN = DD.valueOf(10.0);
+ private static final DD ONE = DD.valueOf(1.0);
+ private static final String SCI_NOT_EXPONENT_CHAR = "E";
+ private static final String SCI_NOT_ZERO = "0.0E0";
+
+ /**
+ * Dumps the components of this number to a string.
+ *
+ * @return a string showing the components of the number
+ */
+ public String dump()
+ {
+ return "DD<" + hi + ", " + lo + ">";
+ }
+
+ /**
+ * Returns a string representation of this number, in either standard or scientific notation.
+ * If the magnitude of the number is in the range [ 10<sup>-3</sup>, 10<sup>8</sup> ]
+ * standard notation will be used. Otherwise, scientific notation will be used.
+ *
+ * @return a string representation of this number
+ */
+ public String toString()
+ {
+ int mag = magnitude(hi);
+ if (mag >= -3 && mag <= 20)
+ return toStandardNotation();
+ return toSciNotation();
+ }
+
+ /**
+ * Returns the string representation of this value in standard notation.
+ *
+ * @return the string representation in standard notation
+ */
+ public String toStandardNotation()
+ {
+ String specialStr = getSpecialNumberString();
+ if (specialStr != null)
+ return specialStr;
+
+ int[] magnitude = new int[1];
+ String sigDigits = extractSignificantDigits(true, magnitude);
+ int decimalPointPos = magnitude[0] + 1;
+
+ String num = sigDigits;
+ // add a leading 0 if the decimal point is the first char
+ if (sigDigits.charAt(0) == '.') {
+ num = "0" + sigDigits;
+ }
+ else if (decimalPointPos < 0) {
+ num = "0." + stringOfChar('0', -decimalPointPos) + sigDigits;
+ }
+ else if (sigDigits.indexOf('.') == -1) {
+ // no point inserted - sig digits must be smaller than magnitude of number
+ // add zeroes to end to make number the correct size
+ int numZeroes = decimalPointPos - sigDigits.length();
+ String zeroes = stringOfChar('0', numZeroes);
+ num = sigDigits + zeroes + ".0";
+ }
+
+ if (this.isNegative())
+ return "-" + num;
+ return num;
+ }
+
+ /**
+ * Returns the string representation of this value in scientific notation.
+ *
+ * @return the string representation in scientific notation
+ */
+ public String toSciNotation()
+ {
+ // special case zero, to allow as
+ if (isZero())
+ return SCI_NOT_ZERO;
+
+ String specialStr = getSpecialNumberString();
+ if (specialStr != null)
+ return specialStr;
+
+ int[] magnitude = new int[1];
+ String digits = extractSignificantDigits(false, magnitude);
+ String expStr = SCI_NOT_EXPONENT_CHAR + magnitude[0];
+
+ // should never have leading zeroes
+ // MD - is this correct? Or should we simply strip them if they are present?
+ if (digits.charAt(0) == '0') {
+ throw new IllegalStateException("Found leading zero: " + digits);
+ }
+
+ // add decimal point
+ String trailingDigits = "";
+ if (digits.length() > 1)
+ trailingDigits = digits.substring(1);
+ String digitsWithDecimal = digits.charAt(0) + "." + trailingDigits;
+
+ if (this.isNegative())
+ return "-" + digitsWithDecimal + expStr;
+ return digitsWithDecimal + expStr;
+ }
+
+
+ /**
+ * Extracts the significant digits in the decimal representation of the argument.
+ * A decimal point may be optionally inserted in the string of digits
+ * (as long as its position lies within the extracted digits
+ * - if not, the caller must prepend or append the appropriate zeroes and decimal point).
+ *
+ * @param y the number to extract ( >= 0)
+ * @param decimalPointPos the position in which to insert a decimal point
+ * @return the string containing the significant digits and possibly a decimal point
+ */
+ private String extractSignificantDigits(boolean insertDecimalPoint, int[] magnitude)
+ {
+ DD y = this.abs();
+ // compute *correct* magnitude of y
+ int mag = magnitude(y.hi);
+ DD scale = TEN.pow(mag);
+ y = y.divide(scale);
+
+ // fix magnitude if off by one
+ if (y.gt(TEN)) {
+ y = y.divide(TEN);
+ mag += 1;
+ }
+ else if (y.lt(ONE)) {
+ y = y.multiply(TEN);
+ mag -= 1;
+ }
+
+ int decimalPointPos = mag + 1;
+ StringBuffer buf = new StringBuffer();
+ int numDigits = MAX_PRINT_DIGITS - 1;
+ for (int i = 0; i <= numDigits; i++) {
+ if (insertDecimalPoint && i == decimalPointPos) {
+ buf.append('.');
+ }
+ int digit = (int) y.hi;
+// System.out.println("printDump: [" + i + "] digit: " + digit + " y: " + y.dump() + " buf: " + buf);
+
+ /**
+ * This should never happen, due to heuristic checks on remainder below
+ */
+ if (digit < 0 || digit > 9) {
+// System.out.println("digit > 10 : " + digit);
+// throw new IllegalStateException("Internal errror: found digit = " + digit);
+ }
+ /**
+ * If a negative remainder is encountered, simply terminate the extraction.
+ * This is robust, but maybe slightly inaccurate.
+ * My current hypothesis is that negative remainders only occur for very small lo components,
+ * so the inaccuracy is tolerable
+ */
+ if (digit < 0) {
+ break;
+ // throw new IllegalStateException("Internal errror: found digit = " + digit);
+ }
+ boolean rebiasBy10 = false;
+ char digitChar = 0;
+ if (digit > 9) {
+ // set flag to re-bias after next 10-shift
+ rebiasBy10 = true;
+ // output digit will end up being '9'
+ digitChar = '9';
+ }
+ else {
+ digitChar = (char) ('0' + digit);
+ }
+ buf.append(digitChar);
+ y = (y.subtract(DD.valueOf(digit))
+ .multiply(TEN));
+ if (rebiasBy10)
+ y.selfAdd(TEN);
+
+ boolean continueExtractingDigits = true;
+ /**
+ * Heuristic check: if the remaining portion of
+ * y is non-positive, assume that output is complete
+ */
+// if (y.hi <= 0.0)
+// if (y.hi < 0.0)
+// continueExtractingDigits = false;
+ /**
+ * Check if remaining digits will be 0, and if so don't output them.
+ * Do this by comparing the magnitude of the remainder with the expected precision.
+ */
+ int remMag = magnitude(y.hi);
+ if (remMag < 0 && Math.abs(remMag) >= (numDigits - i))
+ continueExtractingDigits = false;
+ if (! continueExtractingDigits)
+ break;
+ }
+ magnitude[0] = mag;
+ return buf.toString();
+ }
+
+
+ /**
+ * Creates a string of a given length containing the given character
+ *
+ * @param ch the character to be repeated
+ * @param len the len of the desired string
+ * @return the string
+ */
+ private static String stringOfChar(char ch, int len)
+ {
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < len; i++) {
+ buf.append(ch);
+ }
+ return buf.toString();
+ }
+
+ /**
+ * Returns the string for this value if it has a known representation.
+ * (E.g. NaN or 0.0)
+ *
+ * @return the string for this special number
+ * or null if the number is not a special number
+ */
+ private String getSpecialNumberString()
+ {
+ if (isZero()) return "0.0";
+ if (isNaN()) return "NaN ";
+ return null;
+ }
+
+
+
+ /**
+ * Determines the decimal magnitude of a number.
+ * The magnitude is the exponent of the greatest power of 10 which is less than
+ * or equal to the number.
+ *
+ * @param x the number to find the magnitude of
+ * @return the decimal magnitude of x
+ */
+ private static int magnitude(double x)
+ {
+ double xAbs = Math.abs(x);
+ double xLog10 = Math.log(xAbs) / Math.log(10);
+ int xMag = (int) Math.floor(xLog10);
+ /**
+ * Since log computation is inexact, there may be an off-by-one error
+ * in the computed magnitude.
+ * Following tests that magnitude is correct, and adjusts it if not
+ */
+ double xApprox = Math.pow(10, xMag);
+ if (xApprox * 10 <= xAbs)
+ xMag += 1;
+
+ return xMag;
+ }
+
+
+ /*------------------------------------------------------------
+ * Input
+ *------------------------------------------------------------
+ */
+
+ /**
+ * Converts a string representation of a real number into a DoubleDouble value.
+ * The format accepted is similar to the standard Java real number syntax.
+ * It is defined by the following regular expression:
+ * <pre>
+ * [<tt>+</tt>|<tt>-</tt>] {<i>digit</i>} [ <tt>.</tt> {<i>digit</i>} ] [ ( <tt>e</tt> | <tt>E</tt> ) [<tt>+</tt>|<tt>-</tt>] {<i>digit</i>}+
+ * </pre>
+ *
+ * @param str the string to parse
+ * @return the value of the parsed number
+ * @throws NumberFormatException if <tt>str</tt> is not a valid representation of a number
+ */
+ public static DD parse(String str)
+ throws NumberFormatException
+ {
+ int i = 0;
+ int strlen = str.length();
+
+ // skip leading whitespace
+ while (Character.isWhitespace(str.charAt(i)))
+ i++;
+
+ // check for sign
+ boolean isNegative = false;
+ if (i < strlen) {
+ char signCh = str.charAt(i);
+ if (signCh == '-' || signCh == '+') {
+ i++;
+ if (signCh == '-') isNegative = true;
+ }
+ }
+
+ // scan all digits and accumulate into an integral value
+ // Keep track of the location of the decimal point (if any) to allow scaling later
+ DD val = new DD();
+
+ int numDigits = 0;
+ int numBeforeDec = 0;
+ int exp = 0;
+ while (true) {
+ if (i >= strlen)
+ break;
+ char ch = str.charAt(i);
+ i++;
+ if (Character.isDigit(ch)) {
+ double d = ch - '0';
+ val.selfMultiply(TEN);
+ // MD: need to optimize this
+ val.selfAdd(d);
+ numDigits++;
+ continue;
+ }
+ if (ch == '.') {
+ numBeforeDec = numDigits;
+ continue;
+ }
+ if (ch == 'e' || ch == 'E') {
+ String expStr = str.substring(i);
+ // this should catch any format problems with the exponent
+ try {
+ exp = Integer.parseInt(expStr);
+ }
+ catch (NumberFormatException ex) {
+ throw new NumberFormatException("Invalid exponent " + expStr + " in string " + str);
+ }
+ break;
+ }
+ throw new NumberFormatException("Unexpected character '" + ch
+ + "' at position " + i
+ + " in string " + str);
+ }
+ DD val2 = val;
+
+ // scale the number correctly
+ int numDecPlaces = numDigits - numBeforeDec - exp;
+ if (numDecPlaces == 0) {
+ val2 = val;
+ }
+ else if (numDecPlaces > 0) {
+ DD scale = TEN.pow(numDecPlaces);
+ val2 = val.divide(scale);
+ }
+ else if (numDecPlaces < 0) {
+ DD scale = TEN.pow(-numDecPlaces);
+ val2 = val.multiply(scale);
+ }
+ // apply leading sign, if any
+ if (isNegative) {
+ return val2.negate();
+ }
+ return val2;
+
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/math/MathUtil.java b/modules/core/src/main/java/org/locationtech/jts/math/MathUtil.java
new file mode 100644
index 0000000..2347af6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/math/MathUtil.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.math;
+
+/**
+ * Various utility functions for mathematical and numerical operations.
+ *
+ * @author mbdavis
+ *
+ */
+public class MathUtil
+{
+ /**
+ * Clamps a <tt>double</tt> value to a given range.
+ * @param x the value to clamp
+ * @param min the minimum value of the range
+ * @param max the maximum value of the range
+ * @return the clamped value
+ */
+ public static double clamp(double x, double min, double max)
+ {
+ if (x < min) return min;
+ if (x > max) return max;
+ return x;
+ }
+
+ /**
+ * Clamps an <tt>int</tt> value to a given range.
+ * @param x the value to clamp
+ * @param min the minimum value of the range
+ * @param max the maximum value of the range
+ * @return the clamped value
+ */
+ public static int clamp(int x, int min, int max)
+ {
+ if (x < min) return min;
+ if (x > max) return max;
+ return x;
+ }
+
+ private static final double LOG_10 = Math.log(10);
+
+ /**
+ * Computes the base-10 logarithm of a <tt>double</tt> value.
+ * <ul>
+ * <li>If the argument is NaN or less than zero, then the result is NaN.
+ * <li>If the argument is positive infinity, then the result is positive infinity.
+ * <li>If the argument is positive zero or negative zero, then the result is negative infinity.
+ * </ul>
+ *
+ * @param x a positive number
+ * @return the value log a, the base-10 logarithm of the input value
+ */
+ public static double log10(double x)
+ {
+ double ln = Math.log(x);
+ if (Double.isInfinite(ln)) return ln;
+ if (Double.isNaN(ln)) return ln;
+ return ln / LOG_10;
+ }
+
+ /**
+ * Computes an index which wraps around a given maximum value.
+ * For values >= 0, this is equals to <tt>val % max</tt>.
+ * For values < 0, this is equal to <tt>max - (-val) % max</tt>
+ *
+ * @param index the value to wrap
+ * @param max the maximum value (or modulus)
+ * @return the wrapped index
+ */
+ public static int wrap(int index, int max)
+ {
+ if (index < 0) {
+ return max - ((-index) % max);
+ }
+ return index % max;
+ }
+
+ /**
+ * Computes the average of two numbers.
+ *
+ * @param x1 a number
+ * @param x2 a number
+ * @return the average of the inputs
+ */
+ public static double average(double x1, double x2)
+ {
+ return (x1 + x2) / 2.0;
+ }
+
+ public static double max(double v1, double v2, double v3)
+ {
+ double max = v1;
+ if (v2 > max) max = v2;
+ if (v3 > max) max = v3;
+ return max;
+ }
+
+ public static double max(double v1, double v2, double v3, double v4)
+ {
+ double max = v1;
+ if (v2 > max) max = v2;
+ if (v3 > max) max = v3;
+ if (v4 > max) max = v4;
+ return max;
+ }
+
+ public static double min(double v1, double v2, double v3, double v4)
+ {
+ double min = v1;
+ if (v2 < min) min = v2;
+ if (v3 < min) min = v3;
+ if (v4 < min) min = v4;
+ return min;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/math/Matrix.java b/modules/core/src/main/java/org/locationtech/jts/math/Matrix.java
new file mode 100644
index 0000000..ececc22
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/math/Matrix.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.math;
+
+/**
+ * Implements some 2D matrix operations
+ * (in particular, solving systems of linear equations).
+ *
+ * @author Martin Davis
+ *
+ */
+public class Matrix
+{
+ private static void swapRows(double[][] m, int i, int j)
+ {
+ if (i == j) return;
+ for (int col = 0; col < m[0].length; col++) {
+ double temp = m[i][col];
+ m[i][col] = m[j][col];
+ m[j][col] = temp;
+ }
+ }
+
+ private static void swapRows(double[] m, int i, int j)
+ {
+ if (i == j) return;
+ double temp = m[i];
+ m[i] = m[j];
+ m[j] = temp;
+ }
+
+ /**
+ * Solves a system of equations using Gaussian Elimination.
+ * In order to avoid overhead the algorithm runs in-place
+ * on A - if A should not be modified the client must supply a copy.
+ *
+ * @param a an nxn matrix in row/column order )modified by this method)
+ * @param b a vector of length n
+ *
+ * @return a vector containing the solution (if any)
+ * or null if the system has no or no unique solution
+ *
+ * @throws IllegalArgumentException if the matrix is the wrong size
+ */
+ public static double[] solve( double[][] a, double[] b )
+ {
+ int n = b.length;
+ if ( a.length != n || a[0].length != n )
+ throw new IllegalArgumentException("Matrix A is incorrectly sized");
+
+ // Use Gaussian Elimination with partial pivoting.
+ // Iterate over each row
+ for (int i = 0; i < n; i++ ) {
+ // Find the largest pivot in the rows below the current one.
+ int maxElementRow = i;
+ for (int j = i + 1; j < n; j++ )
+ if ( Math.abs( a[j][i] ) > Math.abs( a[maxElementRow][i] ) )
+ maxElementRow = j;
+
+ if ( a[maxElementRow][i] == 0.0 )
+ return null;
+
+ // Exchange current row and maxElementRow in A and b.
+ swapRows(a, i, maxElementRow );
+ swapRows(b, i, maxElementRow );
+
+ // Eliminate using row i
+ for (int j = i + 1; j < n; j++ ) {
+ double rowFactor = a[j][i] / a[i][i];
+ for (int k = n - 1; k >= i; k-- )
+ a[j][k] -= a[i][k] * rowFactor;
+ b[j] -= b[i] * rowFactor;
+ }
+ }
+
+ /**
+ * A is now (virtually) in upper-triangular form.
+ * The solution vector is determined by back-substitution.
+ */
+ double[] solution = new double[n];
+ for (int j = n - 1; j >= 0; j-- ) {
+ double t = 0.0;
+ for (int k = j + 1; k < n; k++ )
+ t += a[j][k] * solution[k];
+ solution[j] = ( b[j] - t ) / a[j][j];
+ }
+ return solution;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/math/Plane3D.java b/modules/core/src/main/java/org/locationtech/jts/math/Plane3D.java
new file mode 100644
index 0000000..a0383da
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/math/Plane3D.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.math;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Models a plane in 3-dimensional Cartesian space.
+ *
+ * @author mdavis
+ *
+ */
+public class Plane3D {
+
+ /**
+ * Enums for the 3 coordinate planes
+ */
+ public static final int XY_PLANE = 1;
+ public static final int YZ_PLANE = 2;
+ public static final int XZ_PLANE = 3;
+
+ private Vector3D normal;
+ private Coordinate basePt;
+
+ public Plane3D(Vector3D normal, Coordinate basePt)
+ {
+ this.normal = normal;
+ this.basePt = basePt;
+ }
+
+ /**
+ * Computes the oriented distance from a point to the plane.
+ * The distance is:
+ * <ul>
+ * <li><b>positive</b> if the point lies above the plane (relative to the plane normal)
+ * <li><b>zero</b> if the point is on the plane
+ * <li><b>negative</b> if the point lies below the plane (relative to the plane normal)
+ * </ul>
+ *
+ * @param p the point to compute the distance for
+ * @return the oriented distance to the plane
+ */
+ public double orientedDistance(Coordinate p) {
+ Vector3D pb = new Vector3D(p, basePt);
+ double pbdDotNormal = pb.dot(normal);
+ if (Double.isNaN(pbdDotNormal))
+ throw new IllegalArgumentException("3D Coordinate has NaN ordinate");
+ double d = pbdDotNormal / normal.length();
+ return d;
+ }
+
+ /**
+ * Computes the axis plane that this plane lies closest to.
+ * <p>
+ * Geometries lying in this plane undergo least distortion
+ * (and have maximum area)
+ * when projected to the closest axis plane.
+ * This provides optimal conditioning for
+ * computing a Point-in-Polygon test.
+ *
+ * @return the index of the closest axis plane.
+ */
+ public int closestAxisPlane() {
+ double xmag = Math.abs(normal.getX());
+ double ymag = Math.abs(normal.getY());
+ double zmag = Math.abs(normal.getZ());
+ if (xmag > ymag) {
+ if (xmag > zmag)
+ return YZ_PLANE;
+ else
+ return XY_PLANE;
+ }
+ // y >= x
+ else if (zmag > ymag) {
+ return XY_PLANE;
+ }
+ // y >= z
+ return XZ_PLANE;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/math/Vector2D.java b/modules/core/src/main/java/org/locationtech/jts/math/Vector2D.java
new file mode 100644
index 0000000..0e3128c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/math/Vector2D.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.math;
+
+import org.locationtech.jts.algorithm.Angle;
+import org.locationtech.jts.algorithm.CGAlgorithmsDD;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A 2-dimensional mathematical vector represented by double-precision X and Y components.
+ *
+ * @author mbdavis
+ *
+ */
+public class Vector2D {
+ /**
+ * Creates a new vector with given X and Y components.
+ *
+ * @param x the x component
+ * @param y the y component
+ * @return a new vector
+ */
+ public static Vector2D create(double x, double y) {
+ return new Vector2D(x, y);
+ }
+
+ /**
+ * Creates a new vector from an existing one.
+ *
+ * @param v the vector to copy
+ * @return a new vector
+ */
+ public static Vector2D create(Vector2D v) {
+ return new Vector2D(v);
+ }
+
+ /**
+ * Creates a vector from a {@link Coordinate}.
+ *
+ * @param coord the Coordinate to copy
+ * @return a new vector
+ */
+ public static Vector2D create(Coordinate coord) {
+ return new Vector2D(coord);
+ }
+
+ /**
+ * Creates a vector with the direction and magnitude
+ * of the difference between the
+ * <tt>to</tt> and <tt>from</tt> {@link Coordinate}s.
+ *
+ * @param from the origin Coordinate
+ * @param to the destination Coordinate
+ * @return a new vector
+ */
+ public static Vector2D create(Coordinate from, Coordinate to) {
+ return new Vector2D(from, to);
+ }
+
+ /**
+ * The X component of this vector.
+ */
+ private double x;
+
+ /**
+ * The Y component of this vector.
+ */
+ private double y;
+
+ public Vector2D() {
+ this(0.0, 0.0);
+ }
+
+ public Vector2D(double x, double y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ public Vector2D(Vector2D v) {
+ x = v.x;
+ y = v.y;
+ }
+
+ public Vector2D(Coordinate from, Coordinate to) {
+ x = to.x - from.x;
+ y = to.y - from.y;
+ }
+
+ public Vector2D(Coordinate v) {
+ x = v.x;
+ y = v.y;
+ }
+
+ public double getX() {
+ return x;
+ }
+
+ public double getY() {
+ return y;
+ }
+
+ public double getComponent(int index) {
+ if (index == 0)
+ return x;
+ return y;
+ }
+
+ public Vector2D add(Vector2D v) {
+ return create(x + v.x, y + v.y);
+ }
+
+ public Vector2D subtract(Vector2D v) {
+ return create(x - v.x, y - v.y);
+ }
+
+ /**
+ * Multiplies the vector by a scalar value.
+ *
+ * @param d the value to multiply by
+ * @return a new vector with the value v * d
+ */
+ public Vector2D multiply(double d) {
+ return create(x * d, y * d);
+ }
+
+ /**
+ * Divides the vector by a scalar value.
+ *
+ * @param d the value to divide by
+ * @return a new vector with the value v / d
+ */
+ public Vector2D divide(double d) {
+ return create(x / d, y / d);
+ }
+
+ public Vector2D negate() {
+ return create(-x , -y);
+ }
+
+ public double length() {
+ return Math.sqrt(x * x + y * y);
+ }
+
+ public double lengthSquared() {
+ return x * x + y * y;
+ }
+
+ public Vector2D normalize() {
+ double length = length();
+ if (length > 0.0)
+ return divide(length);
+ return create(0.0, 0.0);
+ }
+
+ public Vector2D average(Vector2D v) {
+ return weightedSum(v, 0.5);
+ }
+
+ /**
+ * Computes the weighted sum of this vector
+ * with another vector,
+ * with this vector contributing a fraction
+ * of <tt>frac</tt> to the total.
+ * <p>
+ * In other words,
+ * <pre>
+ * sum = frac * this + (1 - frac) * v
+ * </pre>
+ *
+ * @param v the vector to sum
+ * @param frac the fraction of the total contributed by this vector
+ * @return the weighted sum of the two vectors
+ */
+ public Vector2D weightedSum(Vector2D v, double frac) {
+ return create(
+ frac * x + (1.0 - frac) * v.x,
+ frac * y + (1.0 - frac) * v.y);
+ }
+
+ /**
+ * Computes the distance between this vector and another one.
+ * @param v a vector
+ * @return the distance between the vectors
+ */
+ public double distance(Vector2D v)
+ {
+ double delx = v.x - x;
+ double dely = v.y - y;
+ return Math.sqrt(delx * delx + dely * dely);
+ }
+
+ /**
+ * Computes the dot-product of two vectors
+ *
+ * @param v a vector
+ * @return the dot product of the vectors
+ */
+ public double dot(Vector2D v) {
+ return x * v.x + y * v.y;
+ }
+
+ public double angle()
+ {
+ return Math.atan2(y, x);
+ }
+
+ public double angle(Vector2D v)
+ {
+ return Angle.diff(v.angle(), angle());
+ }
+
+ public double angleTo(Vector2D v)
+ {
+ double a1 = angle();
+ double a2 = v.angle();
+ double angDel = a2 - a1;
+
+ // normalize, maintaining orientation
+ if (angDel <= -Math.PI)
+ return angDel + Angle.PI_TIMES_2;
+ if (angDel > Math.PI)
+ return angDel - Angle.PI_TIMES_2;
+ return angDel;
+ }
+
+ public Vector2D rotate(double angle)
+ {
+ double cos = Math.cos(angle);
+ double sin = Math.sin(angle);
+ return create(
+ x * cos - y * sin,
+ x * sin + y * cos
+ );
+ }
+
+ /**
+ * Rotates a vector by a given number of quarter-circles (i.e. multiples of 90
+ * degrees or Pi/2 radians). A positive number rotates counter-clockwise, a
+ * negative number rotates clockwise. Under this operation the magnitude of
+ * the vector and the absolute values of the ordinates do not change, only
+ * their sign and ordinate index.
+ *
+ * @param numQuarters
+ * the number of quarter-circles to rotate by
+ * @return the rotated vector.
+ */
+ public Vector2D rotateByQuarterCircle(int numQuarters) {
+ int nQuad = numQuarters % 4;
+ if (numQuarters < 0 && nQuad != 0) {
+ nQuad = nQuad + 4;
+ }
+ switch (nQuad) {
+ case 0:
+ return create(x, y);
+ case 1:
+ return create(-y, x);
+ case 2:
+ return create(-x, -y);
+ case 3:
+ return create(y, -x);
+ }
+ Assert.shouldNeverReachHere();
+ return null;
+ }
+
+ public boolean isParallel(Vector2D v)
+ {
+ return 0.0 == CGAlgorithmsDD.signOfDet2x2(x, y, v.x, v.y);
+ }
+
+ public Coordinate translate(Coordinate coord) {
+ return new Coordinate(x + coord.x, y + coord.y);
+ }
+
+ public Coordinate toCoordinate() {
+ return new Coordinate(x, y);
+ }
+
+ /**
+ * Creates a copy of this vector
+ *
+ * @return a copy of this vector
+ */
+ public Object clone()
+ {
+ return new Vector2D(this);
+ }
+
+ /**
+ * Gets a string representation of this vector
+ *
+ * @return a string representing this vector
+ */
+ public String toString() {
+ return "[" + x + ", " + y + "]";
+ }
+
+ /**
+ * Tests if a vector <tt>o</tt> has the same values for the x and y
+ * components.
+ *
+ * @param o
+ * a <tt>Vector2D</tt> with which to do the comparison.
+ * @return true if <tt>other</tt> is a <tt>Vector2D</tt> with the same
+ * values for the x and y components.
+ */
+ public boolean equals(Object o) {
+ if (!(o instanceof Vector2D)) {
+ return false;
+ }
+ Vector2D v = (Vector2D) o;
+ return x == v.x && y == v.y;
+ }
+
+ /**
+ * Gets a hashcode for this vector.
+ *
+ * @return a hashcode for this vector
+ */
+ public int hashCode() {
+ // Algorithm from Effective Java by Joshua Bloch
+ int result = 17;
+ result = 37 * result + Coordinate.hashCode(x);
+ result = 37 * result + Coordinate.hashCode(y);
+ return result;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/math/Vector3D.java b/modules/core/src/main/java/org/locationtech/jts/math/Vector3D.java
new file mode 100644
index 0000000..bd0755e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/math/Vector3D.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.math;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Represents a vector in 3-dimensional Cartesian space.
+ *
+ * @author mdavis
+ *
+ */
+public class Vector3D {
+
+ /**
+ * Computes the dot product of the 3D vectors AB and CD.
+ *
+ * @param A
+ * @param B
+ * @param C
+ * @param D
+ * @return the dot product
+ */
+ public static double dot(Coordinate A, Coordinate B, Coordinate C, Coordinate D)
+ {
+ double ABx = B.x - A.x;
+ double ABy = B.y - A.y;
+ double ABz = B.z - A.z;
+ double CDx = D.x - C.x;
+ double CDy = D.y - C.y;
+ double CDz = D.z - C.z;
+ return ABx*CDx + ABy*CDy + ABz*CDz;
+ }
+
+ /**
+ * Creates a new vector with given X and Y components.
+ *
+ * @param x
+ * the x component
+ * @param y
+ * the y component
+ * @param z
+ * the z component
+ * @return a new vector
+ */
+ public static Vector3D create(double x, double y, double z) {
+ return new Vector3D(x, y, z);
+ }
+
+ /**
+ * Creates a vector from a {@link Coordinate}.
+ *
+ * @param coord
+ * the Coordinate to copy
+ * @return a new vector
+ */
+ public static Vector3D create(Coordinate coord) {
+ return new Vector3D(coord);
+ }
+
+ public Vector3D(Coordinate v) {
+ x = v.x;
+ y = v.y;
+ z = v.z;
+ }
+
+ /**
+ * Computes the 3D dot-product of two {@link Coordinate}s.
+ *
+ * @param v1 the first vector
+ * @param v2 the second vector
+ * @return the dot product of the vectors
+ */
+ public static double dot(Coordinate v1, Coordinate v2) {
+ return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z;
+ }
+
+ private double x;
+ private double y;
+ private double z;
+
+ public Vector3D(Coordinate from, Coordinate to) {
+ x = to.x - from.x;
+ y = to.y - from.y;
+ z = to.z - from.z;
+ }
+
+ public Vector3D(double x, double y, double z) {
+ this.x = x;
+ this.y = y;
+ this.z = z;
+ }
+
+ public double getX() {
+ return x;
+ }
+
+ public double getY() {
+ return y;
+ }
+
+ public double getZ() {
+ return z;
+ }
+
+
+ /**
+ * Computes the dot-product of two vectors
+ *
+ * @param v
+ * a vector
+ * @return the dot product of the vectors
+ */
+ public double dot(Vector3D v) {
+ return x * v.x + y * v.y + z * v.z;
+ }
+
+ public double length() {
+ return Math.sqrt(x * x + y * y + z * z);
+ }
+
+ public static double length(Coordinate v) {
+ return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
+ }
+
+ public Vector3D normalize() {
+ double length = length();
+ if (length > 0.0)
+ return divide(length());
+ return create(0.0, 0.0, 0.0);
+ }
+
+ private Vector3D divide(double d) {
+ return create(x / d, y / d, z / d);
+ }
+
+ public static Coordinate normalize(Coordinate v) {
+ double len = length(v);
+ return new Coordinate(v.x / len, v.y / len, v.z / len);
+ }
+ /**
+ * Gets a string representation of this vector
+ *
+ * @return a string representing this vector
+ */
+ public String toString() {
+ return "[" + x + ", " + y + ", " + z + "]";
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/BasicSegmentString.java b/modules/core/src/main/java/org/locationtech/jts/noding/BasicSegmentString.java
new file mode 100644
index 0000000..e1dfccd
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/BasicSegmentString.java
@@ -0,0 +1,89 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.io.WKTWriter;
+
+/**
+ * Represents a list of contiguous line segments,
+ * and supports noding the segments.
+ * The line segments are represented by an array of {@link Coordinate}s.
+ * Intended to optimize the noding of contiguous segments by
+ * reducing the number of allocated objects.
+ * SegmentStrings can carry a context object, which is useful
+ * for preserving topological or parentage information.
+ * All noded substrings are initialized with the same context object.
+ *
+ * @version 1.7
+ */
+public class BasicSegmentString
+ implements SegmentString
+{
+ private Coordinate[] pts;
+ private Object data;
+
+ /**
+ * Creates a new segment string from a list of vertices.
+ *
+ * @param pts the vertices of the segment string
+ * @param data the user-defined data of this segment string (may be null)
+ */
+ public BasicSegmentString(Coordinate[] pts, Object data)
+ {
+ this.pts = pts;
+ this.data = data;
+ }
+
+ /**
+ * Gets the user-defined data for this segment string.
+ *
+ * @return the user-defined data
+ */
+ public Object getData() { return data; }
+
+ /**
+ * Sets the user-defined data for this segment string.
+ *
+ * @param data an Object containing user-defined data
+ */
+ public void setData(Object data) { this.data = data; }
+
+ public int size() { return pts.length; }
+ public Coordinate getCoordinate(int i) { return pts[i]; }
+ public Coordinate[] getCoordinates() { return pts; }
+
+ public boolean isClosed()
+ {
+ return pts[0].equals(pts[pts.length - 1]);
+ }
+
+ /**
+ * Gets the octant of the segment starting at vertex <code>index</code>.
+ *
+ * @param index the index of the vertex starting the segment. Must not be
+ * the last index in the vertex list
+ * @return the octant of the segment at the vertex
+ */
+ public int getSegmentOctant(int index)
+ {
+ if (index == pts.length - 1) return -1;
+ return Octant.octant(getCoordinate(index), getCoordinate(index + 1));
+ }
+
+ public String toString()
+ {
+ return WKTWriter.toLineString(new CoordinateArraySequence(pts));
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/FastNodingValidator.java b/modules/core/src/main/java/org/locationtech/jts/noding/FastNodingValidator.java
new file mode 100644
index 0000000..3f37f71
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/FastNodingValidator.java
@@ -0,0 +1,156 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.io.WKTWriter;
+
+
+/**
+ * Validates that a collection of {@link SegmentString}s is correctly noded.
+ * Indexing is used to improve performance.
+ * In the most common use case, validation stops after a single
+ * non-noded intersection is detected,
+ * but the class can be requested to detect all intersections
+ * by using the {@link #setFindAllIntersections(boolean)} method.
+ * <p>
+ * The validator does not check for a-b-a topology collapse situations.
+ * <p>
+ * The validator does not check for endpoint-interior vertex intersections.
+ * This should not be a problem, since the JTS noders should be
+ * able to compute intersections between vertices correctly.
+ * <p>
+ * The client may either test the {@link #isValid()} condition,
+ * or request that a suitable {@link TopologyException} be thrown.
+ *
+ * @version 1.7
+ */
+public class FastNodingValidator
+{
+ public static List computeIntersections(Collection segStrings)
+ {
+ FastNodingValidator nv = new FastNodingValidator(segStrings);
+ nv.setFindAllIntersections(true);
+ nv.isValid();
+ return nv.getIntersections();
+ }
+
+ private LineIntersector li = new RobustLineIntersector();
+
+ private Collection segStrings;
+ private boolean findAllIntersections = false;
+ private InteriorIntersectionFinder segInt = null;
+ private boolean isValid = true;
+
+ /**
+ * Creates a new noding validator for a given set of linework.
+ *
+ * @param segStrings a collection of {@link SegmentString}s
+ */
+ public FastNodingValidator(Collection segStrings)
+ {
+ this.segStrings = segStrings;
+ }
+
+ public void setFindAllIntersections(boolean findAllIntersections)
+ {
+ this.findAllIntersections = findAllIntersections;
+ }
+
+ /**
+ * Gets a list of all intersections found.
+ * Intersections are represented as {@link Coordinate}s.
+ * List is empty if none were found.
+ *
+ * @return a list of Coordinate
+ */
+ public List getIntersections()
+ {
+ return segInt.getIntersections();
+ }
+
+ /**
+ * Checks for an intersection and
+ * reports if one is found.
+ *
+ * @return true if the arrangement contains an interior intersection
+ */
+ public boolean isValid()
+ {
+ execute();
+ return isValid;
+ }
+
+ /**
+ * Returns an error message indicating the segments containing
+ * the intersection.
+ *
+ * @return an error message documenting the intersection location
+ */
+ public String getErrorMessage()
+ {
+ if (isValid) return "no intersections found";
+
+ Coordinate[] intSegs = segInt.getIntersectionSegments();
+ return "found non-noded intersection between "
+ + WKTWriter.toLineString(intSegs[0], intSegs[1])
+ + " and "
+ + WKTWriter.toLineString(intSegs[2], intSegs[3]);
+ }
+
+ /**
+ * Checks for an intersection and throws
+ * a TopologyException if one is found.
+ *
+ * @throws TopologyException if an intersection is found
+ */
+ public void checkValid()
+ {
+ execute();
+ if (! isValid)
+ throw new TopologyException(getErrorMessage(), segInt.getInteriorIntersection());
+ }
+
+ private void execute()
+ {
+ if (segInt != null)
+ return;
+ checkInteriorIntersections();
+ }
+
+ private void checkInteriorIntersections()
+ {
+ /**
+ * MD - It may even be reliable to simply check whether
+ * end segments (of SegmentStrings) have an interior intersection,
+ * since noding should have split any true interior intersections already.
+ */
+ isValid = true;
+ segInt = new InteriorIntersectionFinder(li);
+ segInt.setFindAllIntersections(findAllIntersections);
+ MCIndexNoder noder = new MCIndexNoder();
+ noder.setSegmentIntersector(segInt);
+ noder.computeNodes(segStrings);
+ if (segInt.hasIntersection()) {
+ isValid = false;
+ return;
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/FastSegmentSetIntersectionFinder.java b/modules/core/src/main/java/org/locationtech/jts/noding/FastSegmentSetIntersectionFinder.java
new file mode 100644
index 0000000..c234d17
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/FastSegmentSetIntersectionFinder.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+
+/**
+ * Finds if two sets of {@link SegmentString}s intersect.
+ * Uses indexing for fast performance and to optimize repeated tests
+ * against a target set of lines.
+ * Short-circuited to return as soon an intersection is found.
+ *
+ * Immutable and thread-safe.
+ *
+ * @version 1.7
+ */
+public class FastSegmentSetIntersectionFinder
+{
+ private final SegmentSetMutualIntersector segSetMutInt;
+ // for testing purposes
+ // private SimpleSegmentSetMutualIntersector mci;
+
+ /**
+ * Creates an intersection finder against a given set of segment strings.
+ *
+ * @param baseSegStrings the segment strings to search for intersections
+ */
+ public FastSegmentSetIntersectionFinder(Collection baseSegStrings)
+ {
+ segSetMutInt = new MCIndexSegmentSetMutualIntersector(baseSegStrings);
+ }
+
+ /**
+ * Gets the segment set intersector used by this class.
+ * This allows other uses of the same underlying indexed structure.
+ *
+ * @return the segment set intersector used
+ */
+ public SegmentSetMutualIntersector getSegmentSetIntersector()
+ {
+ return segSetMutInt;
+ }
+
+ /**
+ * Tests for intersections with a given set of target {@link SegmentString}s.
+ *
+ * @param segStrings the SegmentStrings to test
+ * @return true if an intersection is found
+ */
+ public boolean intersects(Collection segStrings)
+ {
+ SegmentIntersectionDetector intFinder = new SegmentIntersectionDetector();
+ return intersects(segStrings, intFinder);
+ }
+
+ /**
+ * Tests for intersections with a given set of target {@link SegmentString}s.
+ * using a given SegmentIntersectionDetector.
+ *
+ * @param segStrings the SegmentStrings to test
+ * @param intDetector the intersection detector to use
+ * @return true if the detector reports intersections
+ */
+ public boolean intersects(Collection segStrings, SegmentIntersectionDetector intDetector)
+ {
+ segSetMutInt.process(segStrings, intDetector);
+ return intDetector.hasIntersection();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/InteriorIntersectionFinder.java b/modules/core/src/main/java/org/locationtech/jts/noding/InteriorIntersectionFinder.java
new file mode 100644
index 0000000..127f60e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/InteriorIntersectionFinder.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+
+
+/**
+ * Finds an interior intersection in a set of {@link SegmentString}s,
+ * if one exists. Only the first intersection found is reported.
+ *
+ * @version 1.7
+ */
+public class InteriorIntersectionFinder
+ implements SegmentIntersector
+{
+ /**
+ * Creates an intersection finder which tests if there is at least one interior intersection.
+ * Uses short-circuiting for efficient performance.
+ * The intersection found is recorded.
+ *
+ * @param li a line intersector
+ * @return a intersection finder which tests if there is at least one interior intersection.
+ */
+ public static InteriorIntersectionFinder createAnyIntersectionFinder(LineIntersector li)
+ {
+ return new InteriorIntersectionFinder(li);
+ }
+
+ /**
+ * Creates an intersection finder which finds all interior intersections.
+ * The intersections are recorded for later inspection.
+ *
+ * @param li a line intersector
+ * @return a intersection finder which finds all interior intersections.
+ */
+ public static InteriorIntersectionFinder createAllIntersectionsFinder(LineIntersector li)
+ {
+ InteriorIntersectionFinder finder = new InteriorIntersectionFinder(li);
+ finder.setFindAllIntersections(true);
+ return finder;
+ }
+
+ /**
+ * Creates an intersection finder which counts all interior intersections.
+ * The intersections are note recorded to reduce memory usage.
+ *
+ * @param li a line intersector
+ * @return a intersection finder which counts all interior intersections.
+ */
+ public static InteriorIntersectionFinder createIntersectionCounter(LineIntersector li)
+ {
+ InteriorIntersectionFinder finder = new InteriorIntersectionFinder(li);
+ finder.setFindAllIntersections(true);
+ finder.setKeepIntersections(false);
+ return finder;
+ }
+
+ private boolean findAllIntersections = false;
+ private boolean isCheckEndSegmentsOnly = false;
+ private LineIntersector li;
+ private Coordinate interiorIntersection = null;
+ private Coordinate[] intSegments = null;
+ private List intersections = new ArrayList();
+ private int intersectionCount = 0;
+ private boolean keepIntersections = true;
+
+ /**
+ * Creates an intersection finder which finds an interior intersection
+ * if one exists
+ *
+ * @param li the LineIntersector to use
+ */
+ public InteriorIntersectionFinder(LineIntersector li)
+ {
+ this.li = li;
+ interiorIntersection = null;
+ }
+
+ /**
+ * Sets whether all intersections should be computed.
+ * When this is <code>false</code> (the default value)
+ * the value of {@link #isDone()} is <code>true</code> after the first intersection is found.
+ * <p>
+ * Default is <code>false</code>.
+ *
+ * @param findAllIntersections whether all intersections should be computed
+ */
+ public void setFindAllIntersections(boolean findAllIntersections)
+ {
+ this.findAllIntersections = findAllIntersections;
+ }
+
+ /**
+ * Sets whether intersection points are recorded.
+ * If the only need is to count intersection points, this can be set to <code>false</code>.
+ * <p>
+ * Default is <code>true</code>.
+ *
+ * @param keepIntersections indicates whether intersections should be recorded
+ */
+ public void setKeepIntersections(boolean keepIntersections)
+ {
+ this.keepIntersections = keepIntersections;
+ }
+
+ /**
+ * Gets the intersections found.
+ *
+ * @return a List of {@link Coordinate}
+ */
+ public List getIntersections()
+ {
+ return intersections;
+ }
+
+ /**
+ * Gets the count of intersections found.
+ *
+ * @return the intersection count
+ */
+ public int count()
+ {
+ return intersectionCount;
+ }
+
+ /**
+ * Sets whether only end segments should be tested for interior intersection.
+ * This is a performance optimization that may be used if
+ * the segments have been previously noded by an appropriate algorithm.
+ * It may be known that any potential noding failures will occur only in
+ * end segments.
+ *
+ * @param isCheckEndSegmentsOnly whether to test only end segments
+ */
+ public void setCheckEndSegmentsOnly(boolean isCheckEndSegmentsOnly)
+ {
+ this.isCheckEndSegmentsOnly = isCheckEndSegmentsOnly;
+ }
+
+ /**
+ * Tests whether an intersection was found.
+ *
+ * @return true if an intersection was found
+ */
+ public boolean hasIntersection()
+ {
+ return interiorIntersection != null;
+ }
+
+ /**
+ * Gets the computed location of the intersection.
+ * Due to round-off, the location may not be exact.
+ *
+ * @return the coordinate for the intersection location
+ */
+ public Coordinate getInteriorIntersection()
+ {
+ return interiorIntersection;
+ }
+
+ /**
+ * Gets the endpoints of the intersecting segments.
+ *
+ * @return an array of the segment endpoints (p00, p01, p10, p11)
+ */
+ public Coordinate[] getIntersectionSegments()
+ {
+ return intSegments;
+ }
+
+ /**
+ * This method is called by clients
+ * of the {@link SegmentIntersector} class to process
+ * intersections for two segments of the {@link SegmentString}s being intersected.
+ * Note that some clients (such as <code>MonotoneChain</code>s) may optimize away
+ * this call for segment pairs which they have determined do not intersect
+ * (e.g. by an disjoint envelope test).
+ */
+ public void processIntersections(
+ SegmentString e0, int segIndex0,
+ SegmentString e1, int segIndex1
+ )
+ {
+ // short-circuit if intersection already found
+ if (! findAllIntersections && hasIntersection())
+ return;
+
+ // don't bother intersecting a segment with itself
+ if (e0 == e1 && segIndex0 == segIndex1) return;
+
+ /**
+ * If enabled, only test end segments (on either segString).
+ *
+ */
+ if (isCheckEndSegmentsOnly) {
+ boolean isEndSegPresent = isEndSegment(e0, segIndex0) || isEndSegment(e1, segIndex1);
+ if (! isEndSegPresent)
+ return;
+ }
+
+ Coordinate p00 = e0.getCoordinates()[segIndex0];
+ Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
+ Coordinate p10 = e1.getCoordinates()[segIndex1];
+ Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
+
+ li.computeIntersection(p00, p01, p10, p11);
+//if (li.hasIntersection() && li.isProper()) Debug.println(li);
+
+ if (li.hasIntersection()) {
+ if (li.isInteriorIntersection()) {
+ intSegments = new Coordinate[4];
+ intSegments[0] = p00;
+ intSegments[1] = p01;
+ intSegments[2] = p10;
+ intSegments[3] = p11;
+
+ interiorIntersection = li.getIntersection(0);
+ if (keepIntersections) intersections.add(interiorIntersection);
+ intersectionCount++;
+ }
+ }
+ }
+
+ /**
+ * Tests whether a segment in a {@link SegmentString} is an end segment.
+ * (either the first or last).
+ *
+ * @param segStr a segment string
+ * @param index the index of a segment in the segment string
+ * @return true if the segment is an end segment
+ */
+ private boolean isEndSegment(SegmentString segStr, int index)
+ {
+ if (index == 0) return true;
+ if (index >= segStr.size() - 2) return true;
+ return false;
+ }
+
+ public boolean isDone()
+ {
+ if (findAllIntersections) return false;
+ return interiorIntersection != null;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/InteriorIntersectionFinderAdder.java b/modules/core/src/main/java/org/locationtech/jts/noding/InteriorIntersectionFinderAdder.java
new file mode 100644
index 0000000..b302787
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/InteriorIntersectionFinderAdder.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Finds <b>interior</b> intersections between line segments in {@link NodedSegmentString}s,
+ * and adds them as nodes
+ * using {@link NodedSegmentString#addIntersection(LineIntersector, int, int, int)}.
+ * <p>
+ * This class is used primarily for Snap-Rounding.
+ * For general-purpose noding, use {@link IntersectionAdder}.
+ *
+ * @version 1.7
+ * @see IntersectionAdder
+ */
+public class InteriorIntersectionFinderAdder
+ implements SegmentIntersector
+{
+ private LineIntersector li;
+ private final List interiorIntersections;
+
+
+ /**
+ * Creates an intersection finder which finds all proper intersections
+ *
+ * @param li the LineIntersector to use
+ */
+ public InteriorIntersectionFinderAdder(LineIntersector li)
+ {
+ this.li = li;
+ interiorIntersections = new ArrayList();
+ }
+
+ public List getInteriorIntersections() { return interiorIntersections; }
+
+ /**
+ * This method is called by clients
+ * of the {@link SegmentIntersector} class to process
+ * intersections for two segments of the {@link SegmentString}s being intersected.
+ * Note that some clients (such as <code>MonotoneChain</code>s) may optimize away
+ * this call for segment pairs which they have determined do not intersect
+ * (e.g. by an disjoint envelope test).
+ */
+ public void processIntersections(
+ SegmentString e0, int segIndex0,
+ SegmentString e1, int segIndex1
+ )
+ {
+ // don't bother intersecting a segment with itself
+ if (e0 == e1 && segIndex0 == segIndex1) return;
+
+ Coordinate p00 = e0.getCoordinates()[segIndex0];
+ Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
+ Coordinate p10 = e1.getCoordinates()[segIndex1];
+ Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
+
+ li.computeIntersection(p00, p01, p10, p11);
+//if (li.hasIntersection() && li.isProper()) Debug.println(li);
+
+ if (li.hasIntersection()) {
+ if (li.isInteriorIntersection()) {
+ for (int intIndex = 0; intIndex < li.getIntersectionNum(); intIndex++) {
+ interiorIntersections.add(li.getIntersection(intIndex));
+ }
+ ((NodedSegmentString) e0).addIntersections(li, segIndex0, 0);
+ ((NodedSegmentString) e1).addIntersections(li, segIndex1, 1);
+ }
+ }
+ }
+
+ /**
+ * Always process all intersections
+ *
+ * @return false always
+ */
+ public boolean isDone() { return false; }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/IntersectionAdder.java b/modules/core/src/main/java/org/locationtech/jts/noding/IntersectionAdder.java
new file mode 100644
index 0000000..2a2f686
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/IntersectionAdder.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Computes the possible intersections between two line segments in {@link NodedSegmentString}s
+ * and adds them to each string
+ * using {@link NodedSegmentString#addIntersection(LineIntersector, int, int, int)}.
+ *
+ * @version 1.7
+ */
+public class IntersectionAdder
+ implements SegmentIntersector
+{
+ public static boolean isAdjacentSegments(int i1, int i2)
+ {
+ return Math.abs(i1 - i2) == 1;
+ }
+
+ /**
+ * These variables keep track of what types of intersections were
+ * found during ALL edges that have been intersected.
+ */
+ private boolean hasIntersection = false;
+ private boolean hasProper = false;
+ private boolean hasProperInterior = false;
+ private boolean hasInterior = false;
+
+ // the proper intersection point found
+ private Coordinate properIntersectionPoint = null;
+
+ private LineIntersector li;
+ private boolean isSelfIntersection;
+ //private boolean intersectionFound;
+ public int numIntersections = 0;
+ public int numInteriorIntersections = 0;
+ public int numProperIntersections = 0;
+
+ // testing only
+ public int numTests = 0;
+
+ public IntersectionAdder(LineIntersector li)
+ {
+ this.li = li;
+ }
+
+ public LineIntersector getLineIntersector() { return li; }
+
+ /**
+ * @return the proper intersection point, or <code>null</code> if none was found
+ */
+ public Coordinate getProperIntersectionPoint() { return properIntersectionPoint; }
+
+ public boolean hasIntersection() { return hasIntersection; }
+ /**
+ * A proper intersection is an intersection which is interior to at least two
+ * line segments. Note that a proper intersection is not necessarily
+ * in the interior of the entire Geometry, since another edge may have
+ * an endpoint equal to the intersection, which according to SFS semantics
+ * can result in the point being on the Boundary of the Geometry.
+ */
+ public boolean hasProperIntersection() { return hasProper; }
+ /**
+ * A proper interior intersection is a proper intersection which is <b>not</b>
+ * contained in the set of boundary nodes set for this SegmentIntersector.
+ */
+ public boolean hasProperInteriorIntersection() { return hasProperInterior; }
+ /**
+ * An interior intersection is an intersection which is
+ * in the interior of some segment.
+ */
+ public boolean hasInteriorIntersection() { return hasInterior; }
+
+ /**
+ * A trivial intersection is an apparent self-intersection which in fact
+ * is simply the point shared by adjacent line segments.
+ * Note that closed edges require a special check for the point shared by the beginning
+ * and end segments.
+ */
+ private boolean isTrivialIntersection(SegmentString e0, int segIndex0, SegmentString e1, int segIndex1)
+ {
+ if (e0 == e1) {
+ if (li.getIntersectionNum() == 1) {
+ if (isAdjacentSegments(segIndex0, segIndex1))
+ return true;
+ if (e0.isClosed()) {
+ int maxSegIndex = e0.size() - 1;
+ if ( (segIndex0 == 0 && segIndex1 == maxSegIndex)
+ || (segIndex1 == 0 && segIndex0 == maxSegIndex) ) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * This method is called by clients
+ * of the {@link SegmentIntersector} class to process
+ * intersections for two segments of the {@link SegmentString}s being intersected.
+ * Note that some clients (such as <code>MonotoneChain</code>s) may optimize away
+ * this call for segment pairs which they have determined do not intersect
+ * (e.g. by an disjoint envelope test).
+ */
+ public void processIntersections(
+ SegmentString e0, int segIndex0,
+ SegmentString e1, int segIndex1
+ )
+ {
+ if (e0 == e1 && segIndex0 == segIndex1) return;
+numTests++;
+ Coordinate p00 = e0.getCoordinates()[segIndex0];
+ Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
+ Coordinate p10 = e1.getCoordinates()[segIndex1];
+ Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
+
+ li.computeIntersection(p00, p01, p10, p11);
+//if (li.hasIntersection() && li.isProper()) Debug.println(li);
+ if (li.hasIntersection()) {
+ //intersectionFound = true;
+ numIntersections++;
+ if (li.isInteriorIntersection()) {
+ numInteriorIntersections++;
+ hasInterior = true;
+//System.out.println(li);
+ }
+ // if the segments are adjacent they have at least one trivial intersection,
+ // the shared endpoint. Don't bother adding it if it is the
+ // only intersection.
+ if (! isTrivialIntersection(e0, segIndex0, e1, segIndex1)) {
+ hasIntersection = true;
+ ((NodedSegmentString) e0).addIntersections(li, segIndex0, 0);
+ ((NodedSegmentString) e1).addIntersections(li, segIndex1, 1);
+ if (li.isProper()) {
+ numProperIntersections++;
+//Debug.println(li.toString()); Debug.println(li.getIntersection(0));
+ //properIntersectionPoint = (Coordinate) li.getIntersection(0).clone();
+ hasProper = true;
+ hasProperInterior = true;
+ }
+ }
+ }
+ }
+
+ /**
+ * Always process all intersections
+ *
+ * @return false always
+ */
+ public boolean isDone() { return false; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/IntersectionFinderAdder.java b/modules/core/src/main/java/org/locationtech/jts/noding/IntersectionFinderAdder.java
new file mode 100644
index 0000000..9f29354
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/IntersectionFinderAdder.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Finds <b>interior</b> intersections between line segments in {@link NodedSegmentString}s,
+ * and adds them as nodes
+ * using {@link NodedSegmentString#addIntersection(LineIntersector, int, int, int)}.
+ * <p>
+ * This class is used primarily for Snap-Rounding.
+ * For general-purpose noding, use {@link IntersectionAdder}.
+ *
+ * @version 1.7
+ * @see IntersectionAdder
+ * @deprecated see InteriorIntersectionFinderAdder
+ */
+public class IntersectionFinderAdder
+ implements SegmentIntersector
+{
+ private LineIntersector li;
+ private final List interiorIntersections;
+
+
+ /**
+ * Creates an intersection finder which finds all proper intersections
+ *
+ * @param li the LineIntersector to use
+ */
+ public IntersectionFinderAdder(LineIntersector li)
+ {
+ this.li = li;
+ interiorIntersections = new ArrayList();
+ }
+
+ public List getInteriorIntersections() { return interiorIntersections; }
+
+ /**
+ * This method is called by clients
+ * of the {@link SegmentIntersector} class to process
+ * intersections for two segments of the {@link SegmentString}s being intersected.
+ * Note that some clients (such as <code>MonotoneChain</code>s) may optimize away
+ * this call for segment pairs which they have determined do not intersect
+ * (e.g. by an disjoint envelope test).
+ */
+ public void processIntersections(
+ SegmentString e0, int segIndex0,
+ SegmentString e1, int segIndex1
+ )
+ {
+ // don't bother intersecting a segment with itself
+ if (e0 == e1 && segIndex0 == segIndex1) return;
+
+ Coordinate p00 = e0.getCoordinates()[segIndex0];
+ Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
+ Coordinate p10 = e1.getCoordinates()[segIndex1];
+ Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
+
+ li.computeIntersection(p00, p01, p10, p11);
+//if (li.hasIntersection() && li.isProper()) Debug.println(li);
+
+ if (li.hasIntersection()) {
+ if (li.isInteriorIntersection()) {
+ for (int intIndex = 0; intIndex < li.getIntersectionNum(); intIndex++) {
+ interiorIntersections.add(li.getIntersection(intIndex));
+ }
+ ((NodedSegmentString) e0).addIntersections(li, segIndex0, 0);
+ ((NodedSegmentString) e1).addIntersections(li, segIndex1, 1);
+ }
+ }
+ }
+
+ /**
+ * Always process all intersections
+ *
+ * @return false always
+ */
+ public boolean isDone() { return false; }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/IteratedNoder.java b/modules/core/src/main/java/org/locationtech/jts/noding/IteratedNoder.java
new file mode 100644
index 0000000..8823446
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/IteratedNoder.java
@@ -0,0 +1,122 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.TopologyException;
+
+/**
+ * Nodes a set of {@link NodedSegmentString}s completely.
+ * The set of segment strings is fully noded;
+ * i.e. noding is repeated until no further
+ * intersections are detected.
+ * <p>
+ * Iterated noding using a FLOATING precision model is not guaranteed to converge,
+ * due to roundoff error.
+ * This problem is detected and an exception is thrown.
+ * Clients can choose to rerun the noding using a lower precision model.
+ *
+ * @version 1.7
+ */
+public class IteratedNoder
+ implements Noder
+{
+ public static final int MAX_ITER = 5;
+
+ private PrecisionModel pm;
+ private LineIntersector li;
+ private Collection nodedSegStrings;
+ private int maxIter = MAX_ITER;
+
+ public IteratedNoder(PrecisionModel pm)
+ {
+ li = new RobustLineIntersector();
+ this.pm = pm;
+ li.setPrecisionModel(pm);
+ }
+
+ /**
+ * Sets the maximum number of noding iterations performed before
+ * the noding is aborted.
+ * Experience suggests that this should rarely need to be changed
+ * from the default.
+ * The default is MAX_ITER.
+ *
+ * @param maxIter the maximum number of iterations to perform
+ */
+ public void setMaximumIterations(int maxIter)
+ {
+ this.maxIter = maxIter;
+ }
+
+ public Collection getNodedSubstrings() { return nodedSegStrings; }
+
+ /**
+ * Fully nodes a list of {@link SegmentString}s, i.e. performs noding iteratively
+ * until no intersections are found between segments.
+ * Maintains labelling of edges correctly through
+ * the noding.
+ *
+ * @param segStrings a collection of SegmentStrings to be noded
+ * @throws TopologyException if the iterated noding fails to converge.
+ */
+ public void computeNodes(Collection segStrings)
+ throws TopologyException
+ {
+ int[] numInteriorIntersections = new int[1];
+ nodedSegStrings = segStrings;
+ int nodingIterationCount = 0;
+ int lastNodesCreated = -1;
+ do {
+ node(nodedSegStrings, numInteriorIntersections);
+ nodingIterationCount++;
+ int nodesCreated = numInteriorIntersections[0];
+
+ /**
+ * Fail if the number of nodes created is not declining.
+ * However, allow a few iterations at least before doing this
+ */
+//System.out.println("# nodes created: " + nodesCreated);
+ if (lastNodesCreated > 0
+ && nodesCreated >= lastNodesCreated
+ && nodingIterationCount > maxIter) {
+ throw new TopologyException("Iterated noding failed to converge after "
+ + nodingIterationCount + " iterations");
+ }
+ lastNodesCreated = nodesCreated;
+
+ } while (lastNodesCreated > 0);
+//System.out.println("# nodings = " + nodingIterationCount);
+ }
+
+
+/**
+ * Node the input segment strings once
+ * and create the split edges between the nodes
+ */
+ private void node(Collection segStrings, int[] numInteriorIntersections)
+ {
+ IntersectionAdder si = new IntersectionAdder(li);
+ MCIndexNoder noder = new MCIndexNoder();
+ noder.setSegmentIntersector(si);
+ noder.computeNodes(segStrings);
+ nodedSegStrings = noder.getNodedSubstrings();
+ numInteriorIntersections[0] = si.numInteriorIntersections;
+//System.out.println("# intersection tests: " + si.numTests);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/MCIndexNoder.java b/modules/core/src/main/java/org/locationtech/jts/noding/MCIndexNoder.java
new file mode 100644
index 0000000..8dc0952
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/MCIndexNoder.java
@@ -0,0 +1,125 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.chain.MonotoneChain;
+import org.locationtech.jts.index.chain.MonotoneChainBuilder;
+import org.locationtech.jts.index.chain.MonotoneChainOverlapAction;
+import org.locationtech.jts.index.strtree.STRtree;
+
+/**
+ * Nodes a set of {@link SegmentString}s using a index based
+ * on {@link MonotoneChain}s and a {@link SpatialIndex}.
+ * The {@link SpatialIndex} used should be something that supports
+ * envelope (range) queries efficiently (such as a <code>Quadtree</code>}
+ * or {@link STRtree} (which is the default index provided).
+ *
+ * @version 1.7
+ */
+public class MCIndexNoder
+ extends SinglePassNoder
+{
+ private List monoChains = new ArrayList();
+ private SpatialIndex index= new STRtree();
+ private int idCounter = 0;
+ private Collection nodedSegStrings;
+ // statistics
+ private int nOverlaps = 0;
+
+ public MCIndexNoder()
+ {
+ }
+ public MCIndexNoder(SegmentIntersector si)
+ {
+ super(si);
+ }
+
+ public List getMonotoneChains() { return monoChains; }
+
+ public SpatialIndex getIndex() { return index; }
+
+ public Collection getNodedSubstrings()
+ {
+ return NodedSegmentString.getNodedSubstrings(nodedSegStrings);
+ }
+
+ public void computeNodes(Collection inputSegStrings)
+ {
+ this.nodedSegStrings = inputSegStrings;
+ for (Iterator i = inputSegStrings.iterator(); i.hasNext(); ) {
+ add((SegmentString) i.next());
+ }
+ intersectChains();
+//System.out.println("MCIndexNoder: # chain overlaps = " + nOverlaps);
+ }
+
+ private void intersectChains()
+ {
+ MonotoneChainOverlapAction overlapAction = new SegmentOverlapAction(segInt);
+
+ for (Iterator i = monoChains.iterator(); i.hasNext(); ) {
+ MonotoneChain queryChain = (MonotoneChain) i.next();
+ List overlapChains = index.query(queryChain.getEnvelope());
+ for (Iterator j = overlapChains.iterator(); j.hasNext(); ) {
+ MonotoneChain testChain = (MonotoneChain) j.next();
+ /**
+ * following test makes sure we only compare each pair of chains once
+ * and that we don't compare a chain to itself
+ */
+ if (testChain.getId() > queryChain.getId()) {
+ queryChain.computeOverlaps(testChain, overlapAction);
+ nOverlaps++;
+ }
+ // short-circuit if possible
+ if (segInt.isDone())
+ return;
+ }
+ }
+ }
+
+ private void add(SegmentString segStr)
+ {
+ List segChains = MonotoneChainBuilder.getChains(segStr.getCoordinates(), segStr);
+ for (Iterator i = segChains.iterator(); i.hasNext(); ) {
+ MonotoneChain mc = (MonotoneChain) i.next();
+ mc.setId(idCounter++);
+ index.insert(mc.getEnvelope(), mc);
+ monoChains.add(mc);
+ }
+ }
+
+ public static class SegmentOverlapAction
+ extends MonotoneChainOverlapAction
+ {
+ private SegmentIntersector si = null;
+
+ public SegmentOverlapAction(SegmentIntersector si)
+ {
+ this.si = si;
+ }
+
+ public void overlap(MonotoneChain mc1, int start1, MonotoneChain mc2, int start2)
+ {
+ SegmentString ss1 = (SegmentString) mc1.getContext();
+ SegmentString ss2 = (SegmentString) mc2.getContext();
+ si.processIntersections(ss1, start1, ss2, start2);
+ }
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/MCIndexSegmentSetMutualIntersector.java b/modules/core/src/main/java/org/locationtech/jts/noding/MCIndexSegmentSetMutualIntersector.java
new file mode 100644
index 0000000..ca996dd
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/MCIndexSegmentSetMutualIntersector.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.chain.MonotoneChain;
+import org.locationtech.jts.index.chain.MonotoneChainBuilder;
+import org.locationtech.jts.index.chain.MonotoneChainOverlapAction;
+import org.locationtech.jts.index.strtree.STRtree;
+
+
+/**
+ * Intersects two sets of {@link SegmentString}s using a index based
+ * on {@link MonotoneChain}s and a {@link SpatialIndex}.
+ *
+ * Thread-safe and immutable.
+ *
+ * @version 1.7
+ */
+public class MCIndexSegmentSetMutualIntersector implements SegmentSetMutualIntersector
+{
+ /**
+ * The {@link SpatialIndex} used should be something that supports
+ * envelope (range) queries efficiently (such as a
+ * {@link org.locationtech.jts.index.quadtree.Quadtree}
+ * or {@link STRtree}.
+ */
+ private STRtree index = new STRtree();
+
+ /**
+ * Constructs a new intersector for a given set of {@link SegmentString}s.
+ *
+ * @param baseSegStrings the base segment strings to intersect
+ */
+ public MCIndexSegmentSetMutualIntersector(Collection baseSegStrings)
+ {
+ initBaseSegments(baseSegStrings);
+ }
+
+ /**
+ * Gets the index constructed over the base segment strings.
+ *
+ * NOTE: To retain thread-safety, treat returned value as immutable!
+ *
+ * @return the constructed index
+ */
+ public SpatialIndex getIndex() { return index; }
+
+ private void initBaseSegments(Collection segStrings)
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ addToIndex((SegmentString) i.next());
+ }
+ // build index to ensure thread-safety
+ index.build();
+ }
+
+ private void addToIndex(SegmentString segStr)
+ {
+ List segChains = MonotoneChainBuilder.getChains(segStr.getCoordinates(), segStr);
+ for (Iterator i = segChains.iterator(); i.hasNext(); ) {
+ MonotoneChain mc = (MonotoneChain) i.next();
+ index.insert(mc.getEnvelope(), mc);
+ }
+ }
+
+ /**
+ * Calls {@link SegmentIntersector#processIntersections(SegmentString, int, SegmentString, int)}
+ * for all <i>candidate</i> intersections between
+ * the given collection of SegmentStrings and the set of indexed segments.
+ *
+ * @param a set of segments to intersect
+ * @param the segment intersector to use
+ */
+ public void process(Collection segStrings, SegmentIntersector segInt)
+ {
+ List monoChains = new ArrayList();
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ addToMonoChains((SegmentString) i.next(), monoChains);
+ }
+ intersectChains(monoChains, segInt);
+// System.out.println("MCIndexBichromaticIntersector: # chain overlaps = " + nOverlaps);
+// System.out.println("MCIndexBichromaticIntersector: # oct chain overlaps = " + nOctOverlaps);
+ }
+
+ private void addToMonoChains(SegmentString segStr, List monoChains)
+ {
+ List segChains = MonotoneChainBuilder.getChains(segStr.getCoordinates(), segStr);
+ for (Iterator i = segChains.iterator(); i.hasNext(); ) {
+ MonotoneChain mc = (MonotoneChain) i.next();
+ monoChains.add(mc);
+ }
+ }
+
+ private void intersectChains(List monoChains, SegmentIntersector segInt)
+ {
+ MonotoneChainOverlapAction overlapAction = new SegmentOverlapAction(segInt);
+
+ for (Iterator i = monoChains.iterator(); i.hasNext(); ) {
+ MonotoneChain queryChain = (MonotoneChain) i.next();
+ List overlapChains = index.query(queryChain.getEnvelope());
+ for (Iterator j = overlapChains.iterator(); j.hasNext(); ) {
+ MonotoneChain testChain = (MonotoneChain) j.next();
+ queryChain.computeOverlaps(testChain, overlapAction);
+ if (segInt.isDone()) return;
+ }
+ }
+ }
+
+ public static class SegmentOverlapAction
+ extends MonotoneChainOverlapAction
+ {
+ private SegmentIntersector si = null;
+
+ public SegmentOverlapAction(SegmentIntersector si)
+ {
+ this.si = si;
+ }
+
+ public void overlap(MonotoneChain mc1, int start1, MonotoneChain mc2, int start2)
+ {
+ SegmentString ss1 = (SegmentString) mc1.getContext();
+ SegmentString ss2 = (SegmentString) mc2.getContext();
+ si.processIntersections(ss1, start1, ss2, start2);
+ }
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/NodableSegmentString.java b/modules/core/src/main/java/org/locationtech/jts/noding/NodableSegmentString.java
new file mode 100644
index 0000000..326ce83
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/NodableSegmentString.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * An interface for classes which support adding nodes to
+ * a segment string.
+ *
+ * @author Martin Davis
+ */
+public interface NodableSegmentString
+ extends SegmentString
+{
+ /**
+ * Adds an intersection node for a given point and segment to this segment string.
+ *
+ * @param intPt the location of the intersection
+ * @param segmentIndex the index of the segment containing the intersection
+ */
+ public void addIntersection(Coordinate intPt, int segmentIndex);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/NodedSegmentString.java b/modules/core/src/main/java/org/locationtech/jts/noding/NodedSegmentString.java
new file mode 100644
index 0000000..a8a1cf4
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/NodedSegmentString.java
@@ -0,0 +1,195 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.io.WKTWriter;
+
+/**
+ * Represents a list of contiguous line segments,
+ * and supports noding the segments.
+ * The line segments are represented by an array of {@link Coordinate}s.
+ * Intended to optimize the noding of contiguous segments by
+ * reducing the number of allocated objects.
+ * SegmentStrings can carry a context object, which is useful
+ * for preserving topological or parentage information.
+ * All noded substrings are initialized with the same context object.
+ *
+ * @version 1.7
+ */
+public class NodedSegmentString
+ implements NodableSegmentString
+{
+ /**
+ * Gets the {@link SegmentString}s which result from splitting this string at node points.
+ *
+ * @param segStrings a Collection of NodedSegmentStrings
+ * @return a Collection of NodedSegmentStrings representing the substrings
+ */
+ public static List getNodedSubstrings(Collection segStrings)
+ {
+ List resultEdgelist = new ArrayList();
+ getNodedSubstrings(segStrings, resultEdgelist);
+ return resultEdgelist;
+ }
+
+ /**
+ * Adds the noded {@link SegmentString}s which result from splitting this string at node points.
+ *
+ * @param segStrings a Collection of NodedSegmentStrings
+ * @param resultEdgelist a List which will collect the NodedSegmentStrings representing the substrings
+ */
+ public static void getNodedSubstrings(Collection segStrings, Collection resultEdgelist)
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ NodedSegmentString ss = (NodedSegmentString) i.next();
+ ss.getNodeList().addSplitEdges(resultEdgelist);
+ }
+ }
+
+ private SegmentNodeList nodeList = new SegmentNodeList(this);
+ private Coordinate[] pts;
+ private Object data;
+
+ /**
+ * Creates a new segment string from a list of vertices.
+ *
+ * @param pts the vertices of the segment string
+ * @param data the user-defined data of this segment string (may be null)
+ */
+ public NodedSegmentString(Coordinate[] pts, Object data)
+ {
+ this.pts = pts;
+ this.data = data;
+ }
+
+ /**
+ * Gets the user-defined data for this segment string.
+ *
+ * @return the user-defined data
+ */
+ public Object getData() { return data; }
+
+ /**
+ * Sets the user-defined data for this segment string.
+ *
+ * @param data an Object containing user-defined data
+ */
+ public void setData(Object data) { this.data = data; }
+
+ public SegmentNodeList getNodeList() { return nodeList; }
+ public int size() { return pts.length; }
+ public Coordinate getCoordinate(int i) { return pts[i]; }
+ public Coordinate[] getCoordinates() { return pts; }
+
+ public boolean isClosed()
+ {
+ return pts[0].equals(pts[pts.length - 1]);
+ }
+
+ /**
+ * Gets the octant of the segment starting at vertex <code>index</code>.
+ *
+ * @param index the index of the vertex starting the segment. Must not be
+ * the last index in the vertex list
+ * @return the octant of the segment at the vertex
+ */
+ public int getSegmentOctant(int index)
+ {
+ if (index == pts.length - 1) return -1;
+ return safeOctant(getCoordinate(index), getCoordinate(index + 1));
+// return Octant.octant(getCoordinate(index), getCoordinate(index + 1));
+ }
+
+ private int safeOctant(Coordinate p0, Coordinate p1)
+ {
+ if (p0.equals2D(p1)) return 0;
+ return Octant.octant(p0, p1);
+ }
+
+ /**
+ * Adds EdgeIntersections for one or both
+ * intersections found for a segment of an edge to the edge intersection list.
+ */
+ public void addIntersections(LineIntersector li, int segmentIndex, int geomIndex)
+ {
+ for (int i = 0; i < li.getIntersectionNum(); i++) {
+ addIntersection(li, segmentIndex, geomIndex, i);
+ }
+ }
+ /**
+ * Add an SegmentNode for intersection intIndex.
+ * An intersection that falls exactly on a vertex
+ * of the SegmentString is normalized
+ * to use the higher of the two possible segmentIndexes
+ */
+ public void addIntersection(LineIntersector li, int segmentIndex, int geomIndex, int intIndex)
+ {
+ Coordinate intPt = new Coordinate(li.getIntersection(intIndex));
+ addIntersection(intPt, segmentIndex);
+ }
+
+ /**
+ * Adds an intersection node for a given point and segment to this segment string.
+ *
+ * @param intPt the location of the intersection
+ * @param segmentIndex the index of the segment containing the intersection
+ */
+ public void addIntersection(Coordinate intPt, int segmentIndex) {
+ addIntersectionNode(intPt, segmentIndex);
+ }
+
+ /**
+ * Adds an intersection node for a given point and segment to this segment string.
+ * If an intersection already exists for this exact location, the existing
+ * node will be returned.
+ *
+ * @param intPt the location of the intersection
+ * @param segmentIndex the index of the segment containing the intersection
+ * @return the intersection node for the point
+ */
+ public SegmentNode addIntersectionNode(Coordinate intPt, int segmentIndex) {
+ int normalizedSegmentIndex = segmentIndex;
+ //Debug.println("edge intpt: " + intPt + " dist: " + dist);
+ // normalize the intersection point location
+ int nextSegIndex = normalizedSegmentIndex + 1;
+ if (nextSegIndex < pts.length) {
+ Coordinate nextPt = pts[nextSegIndex];
+ //Debug.println("next pt: " + nextPt);
+
+ // Normalize segment index if intPt falls on vertex
+ // The check for point equality is 2D only - Z values are ignored
+ if (intPt.equals2D(nextPt)) {
+ //Debug.println("normalized distance");
+ normalizedSegmentIndex = nextSegIndex;
+ }
+ }
+ /**
+ * Add the intersection point to edge intersection list.
+ */
+ SegmentNode ei = nodeList.add(intPt, normalizedSegmentIndex);
+ return ei;
+ }
+
+ public String toString()
+ {
+ return WKTWriter.toLineString(new CoordinateArraySequence(pts));
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/Noder.java b/modules/core/src/main/java/org/locationtech/jts/noding/Noder.java
new file mode 100644
index 0000000..c552ffa
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/Noder.java
@@ -0,0 +1,46 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+
+/**
+ * Computes all intersections between segments in a set of {@link SegmentString}s.
+ * Intersections found are represented as {@link SegmentNode}s and added to the
+ * {@link SegmentString}s in which they occur.
+ * As a final step in the noding a new set of segment strings split
+ * at the nodes may be returned.
+ *
+ * @version 1.7
+ */
+public interface Noder
+{
+
+ /**
+ * Computes the noding for a collection of {@link SegmentString}s.
+ * Some Noders may add all these nodes to the input SegmentStrings;
+ * others may only add some or none at all.
+ *
+ * @param segStrings a collection of {@link SegmentString}s to node
+ */
+ void computeNodes(Collection segStrings);
+
+ /**
+ * Returns a {@link Collection} of fully noded {@link SegmentString}s.
+ * The SegmentStrings have the same context as their parent.
+ *
+ * @return a Collection of SegmentStrings
+ */
+ Collection getNodedSubstrings();
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/NodingValidator.java b/modules/core/src/main/java/org/locationtech/jts/noding/NodingValidator.java
new file mode 100644
index 0000000..5c2a2fa
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/NodingValidator.java
@@ -0,0 +1,165 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.util.Debug;
+
+/**
+ * Validates that a collection of {@link SegmentString}s is correctly noded.
+ * Throws an appropriate exception if an noding error is found.
+ *
+ * @version 1.7
+ */
+public class NodingValidator {
+
+ private LineIntersector li = new RobustLineIntersector();
+
+ private Collection segStrings;
+
+ private static final GeometryFactory fact = new GeometryFactory();
+
+ public NodingValidator(Collection segStrings)
+ {
+ this.segStrings = segStrings;
+ }
+
+ public void checkValid()
+ {
+ // MD - is this call required? Or could it be done in the Interior Intersection code?
+ checkEndPtVertexIntersections();
+ checkInteriorIntersections();
+ checkCollapses();
+ }
+
+ /**
+ * Checks if a segment string contains a segment pattern a-b-a (which implies a self-intersection)
+ */
+ private void checkCollapses()
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString ss = (SegmentString) i.next();
+ checkCollapses(ss);
+ }
+ }
+
+ private void checkCollapses(SegmentString ss)
+ {
+ Coordinate[] pts = ss.getCoordinates();
+ for (int i = 0; i < pts.length - 2; i++) {
+ checkCollapse(pts[i], pts[i + 1], pts[i + 2]);
+ }
+ }
+
+ private void checkCollapse(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ if (p0.equals(p2))
+ throw new RuntimeException("found non-noded collapse at "
+ + fact.createLineString(new Coordinate[] { p0, p1, p2}));
+ }
+
+ /**
+ * Checks all pairs of segments for intersections at an interior point of a segment
+ */
+ private void checkInteriorIntersections()
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString ss0 = (SegmentString) i.next();
+ for (Iterator j = segStrings.iterator(); j.hasNext(); ) {
+ SegmentString ss1 = (SegmentString) j.next();
+
+ checkInteriorIntersections(ss0, ss1);
+ }
+ }
+ }
+
+ private void checkInteriorIntersections(SegmentString ss0, SegmentString ss1)
+ {
+ Coordinate[] pts0 = ss0.getCoordinates();
+ Coordinate[] pts1 = ss1.getCoordinates();
+ for (int i0 = 0; i0 < pts0.length - 1; i0++) {
+ for (int i1 = 0; i1 < pts1.length - 1; i1++) {
+ checkInteriorIntersections(ss0, i0, ss1, i1);
+ }
+ }
+ }
+
+ private void checkInteriorIntersections(SegmentString e0, int segIndex0, SegmentString e1, int segIndex1)
+ {
+ if (e0 == e1 && segIndex0 == segIndex1) return;
+//numTests++;
+ Coordinate p00 = e0.getCoordinates()[segIndex0];
+ Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
+ Coordinate p10 = e1.getCoordinates()[segIndex1];
+ Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
+
+ li.computeIntersection(p00, p01, p10, p11);
+ if (li.hasIntersection()) {
+
+ if (li.isProper()
+ || hasInteriorIntersection(li, p00, p01)
+ || hasInteriorIntersection(li, p10, p11)) {
+ throw new RuntimeException("found non-noded intersection at "
+ + p00 + "-" + p01
+ + " and "
+ + p10 + "-" + p11);
+ }
+ }
+ }
+ /**
+ *@return true if there is an intersection point which is not an endpoint of the segment p0-p1
+ */
+ private boolean hasInteriorIntersection(LineIntersector li, Coordinate p0, Coordinate p1)
+ {
+ for (int i = 0; i < li.getIntersectionNum(); i++) {
+ Coordinate intPt = li.getIntersection(i);
+ if (! (intPt.equals(p0) || intPt.equals(p1)))
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks for intersections between an endpoint of a segment string
+ * and an interior vertex of another segment string
+ */
+ private void checkEndPtVertexIntersections()
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString ss = (SegmentString) i.next();
+ Coordinate[] pts = ss.getCoordinates();
+ checkEndPtVertexIntersections(pts[0], segStrings);
+ checkEndPtVertexIntersections(pts[pts.length - 1], segStrings);
+ }
+ }
+
+ private void checkEndPtVertexIntersections(Coordinate testPt, Collection segStrings)
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString ss = (SegmentString) i.next();
+ Coordinate[] pts = ss.getCoordinates();
+ for (int j = 1; j < pts.length - 1; j++) {
+ if (pts[j].equals(testPt))
+ throw new RuntimeException("found endpt/interior pt intersection at index " + j + " :pt " + testPt);
+ }
+ }
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/Octant.java b/modules/core/src/main/java/org/locationtech/jts/noding/Octant.java
new file mode 100644
index 0000000..304b917
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/Octant.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.geom.Coordinate;
+/**
+ * Methods for computing and working with octants of the Cartesian plane
+ * Octants are numbered as follows:
+ * <pre>
+ * \2|1/
+ * 3 \|/ 0
+ * ---+--
+ * 4 /|\ 7
+ * /5|6\
+ * </pre>
+ * If line segments lie along a coordinate axis, the octant is the lower of the two
+ * possible values.
+ *
+ * @version 1.7
+ */
+public class Octant {
+
+ /**
+ * Returns the octant of a directed line segment (specified as x and y
+ * displacements, which cannot both be 0).
+ */
+ public static int octant(double dx, double dy)
+ {
+ if (dx == 0.0 && dy == 0.0)
+ throw new IllegalArgumentException("Cannot compute the octant for point ( "+ dx + ", " + dy + " )" );
+
+ double adx = Math.abs(dx);
+ double ady = Math.abs(dy);
+
+ if (dx >= 0) {
+ if (dy >= 0) {
+ if (adx >= ady)
+ return 0;
+ else
+ return 1;
+ }
+ else { // dy < 0
+ if (adx >= ady)
+ return 7;
+ else
+ return 6;
+ }
+ }
+ else { // dx < 0
+ if (dy >= 0) {
+ if (adx >= ady)
+ return 3;
+ else
+ return 2;
+ }
+ else { // dy < 0
+ if (adx >= ady)
+ return 4;
+ else
+ return 5;
+ }
+ }
+ }
+
+ /**
+ * Returns the octant of a directed line segment from p0 to p1.
+ */
+ public static int octant(Coordinate p0, Coordinate p1)
+ {
+ double dx = p1.x - p0.x;
+ double dy = p1.y - p0.y;
+ if (dx == 0.0 && dy == 0.0)
+ throw new IllegalArgumentException("Cannot compute the octant for two identical points " + p0);
+ return octant(dx, dy);
+ }
+
+ private Octant() {
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/OrientedCoordinateArray.java b/modules/core/src/main/java/org/locationtech/jts/noding/OrientedCoordinateArray.java
new file mode 100644
index 0000000..1a7761a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/OrientedCoordinateArray.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+
+/**
+ * Allows comparing {@link Coordinate} arrays
+ * in an orientation-independent way.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class OrientedCoordinateArray
+ implements Comparable
+{
+ private Coordinate[] pts;
+ private boolean orientation;
+
+ /**
+ * Creates a new {@link OrientedCoordinateArray}
+ * for the given {@link Coordinate} array.
+ *
+ * @param pts the coordinates to orient
+ */
+ public OrientedCoordinateArray(Coordinate[] pts)
+ {
+ this.pts = pts;
+ orientation = orientation(pts);
+ }
+
+ /**
+ * Computes the canonical orientation for a coordinate array.
+ *
+ * @param pts the array to test
+ * @return <code>true</code> if the points are oriented forwards
+ * or <code>false</code if the points are oriented in reverse
+ */
+ private static boolean orientation(Coordinate[] pts)
+ {
+ return CoordinateArrays.increasingDirection(pts) == 1;
+ }
+
+ /**
+ * Compares two {@link OrientedCoordinateArray}s for their relative order
+ *
+ * @return -1 this one is smaller;
+ * 0 the two objects are equal;
+ * 1 this one is greater
+ */
+
+ public int compareTo(Object o1) {
+ OrientedCoordinateArray oca = (OrientedCoordinateArray) o1;
+ int comp = compareOriented(pts, orientation,
+ oca.pts, oca.orientation);
+/*
+ // MD - testing only
+ int oldComp = SegmentStringDissolver.ptsComp.compare(pts, oca.pts);
+ if ((oldComp == 0 || comp == 0) && oldComp != comp) {
+ System.out.println("bidir mismatch");
+
+ boolean orient1 = orientation(pts);
+ boolean orient2 = orientation(oca.pts);
+ int comp2 = compareOriented(pts, orientation,
+ oca.pts, oca.orientation);
+ int oldComp2 = SegmentStringDissolver.ptsComp.compare(pts, oca.pts);
+ }
+ */
+ return comp;
+ }
+
+ private static int compareOriented(Coordinate[] pts1,
+ boolean orientation1,
+ Coordinate[] pts2,
+ boolean orientation2)
+ {
+ int dir1 = orientation1 ? 1 : -1;
+ int dir2 = orientation2 ? 1 : -1;
+ int limit1 = orientation1 ? pts1.length : -1;
+ int limit2 = orientation2 ? pts2.length : -1;
+
+ int i1 = orientation1 ? 0 : pts1.length - 1;
+ int i2 = orientation2 ? 0 : pts2.length - 1;
+ int comp = 0;
+ while (true) {
+ int compPt = pts1[i1].compareTo(pts2[i2]);
+ if (compPt != 0)
+ return compPt;
+ i1 += dir1;
+ i2 += dir2;
+ boolean done1 = i1 == limit1;
+ boolean done2 = i2 == limit2;
+ if (done1 && ! done2) return -1;
+ if (! done1 && done2) return 1;
+ if (done1 && done2) return 0;
+ }
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/ScaledNoder.java b/modules/core/src/main/java/org/locationtech/jts/noding/ScaledNoder.java
new file mode 100644
index 0000000..7bf973a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/ScaledNoder.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+
+/**
+ * Wraps a {@link Noder} and transforms its input
+ * into the integer domain.
+ * This is intended for use with Snap-Rounding noders,
+ * which typically are only intended to work in the integer domain.
+ * Offsets can be provided to increase the number of digits of available precision.
+ * <p>
+ * Clients should be aware that rescaling can involve loss of precision,
+ * which can cause zero-length line segments to be created.
+ * These in turn can cause problems when used to build a planar graph.
+ * This situation should be checked for and collapsed segments removed if necessary.
+ *
+ * @version 1.7
+ */
+public class ScaledNoder
+ implements Noder
+{
+ private Noder noder;
+ private double scaleFactor;
+ private double offsetX;
+ private double offsetY;
+ private boolean isScaled = false;
+
+ public ScaledNoder(Noder noder, double scaleFactor) {
+ this(noder, scaleFactor, 0, 0);
+ }
+
+ public ScaledNoder(Noder noder, double scaleFactor, double offsetX, double offsetY) {
+ this.noder = noder;
+ this.scaleFactor = scaleFactor;
+ // no need to scale if input precision is already integral
+ isScaled = ! isIntegerPrecision();
+ }
+
+ public boolean isIntegerPrecision() { return scaleFactor == 1.0; }
+
+ public Collection getNodedSubstrings()
+ {
+ Collection splitSS = noder.getNodedSubstrings();
+ if (isScaled) rescale(splitSS);
+ return splitSS;
+ }
+
+ public void computeNodes(Collection inputSegStrings)
+ {
+ Collection intSegStrings = inputSegStrings;
+ if (isScaled)
+ intSegStrings = scale(inputSegStrings);
+ noder.computeNodes(intSegStrings);
+ }
+
+ private Collection scale(Collection segStrings)
+ {
+ List nodedSegmentStrings = new ArrayList(segStrings.size());
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString ss = (SegmentString) i.next();
+ nodedSegmentStrings.add(new NodedSegmentString(scale(ss.getCoordinates()), ss.getData()));
+ }
+ return nodedSegmentStrings;
+ }
+
+ private Coordinate[] scale(Coordinate[] pts)
+ {
+ Coordinate[] roundPts = new Coordinate[pts.length];
+ for (int i = 0; i < pts.length; i++) {
+ roundPts[i] = new Coordinate(
+ Math.round((pts[i].x - offsetX) * scaleFactor),
+ Math.round((pts[i].y - offsetY) * scaleFactor),
+ pts[i].z
+ );
+ }
+ Coordinate[] roundPtsNoDup = CoordinateArrays.removeRepeatedPoints(roundPts);
+ return roundPtsNoDup;
+ }
+
+ //private double scale(double val) { return (double) Math.round(val * scaleFactor); }
+
+ private void rescale(Collection segStrings)
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString ss = (SegmentString) i.next();
+ rescale(ss.getCoordinates());
+ }
+ }
+
+ private void rescale(Coordinate[] pts)
+ {
+ Coordinate p0 = null;
+ Coordinate p1 = null;
+
+ if (pts.length == 2) {
+ p0 = new Coordinate(pts[0]);
+ p1 = new Coordinate(pts[1]);
+ }
+
+ for (int i = 0; i < pts.length; i++) {
+ pts[i].x = pts[i].x / scaleFactor + offsetX;
+ pts[i].y = pts[i].y / scaleFactor + offsetY;
+ }
+
+ if (pts.length == 2 && pts[0].equals2D(pts[1])) {
+ System.out.println(pts);
+ }
+ }
+
+ //private double rescale(double val) { return val / scaleFactor; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentIntersectionDetector.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentIntersectionDetector.java
new file mode 100644
index 0000000..d8ea973
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentIntersectionDetector.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Detects and records an intersection between two {@link SegmentString}s,
+ * if one exists. Only a single intersection is recorded.
+ * This strategy can be configured to search for <b>proper intersections</b>.
+ * In this case, the presence of <i>any</i> kind of intersection will still be recorded,
+ * but searching will continue until either a proper intersection has been found
+ * or no intersections are detected.
+ *
+ * @version 1.7
+ */
+public class SegmentIntersectionDetector
+ implements SegmentIntersector
+{
+ private LineIntersector li;
+ private boolean findProper = false;
+ private boolean findAllTypes = false;
+
+ private boolean hasIntersection = false;
+ private boolean hasProperIntersection = false;
+ private boolean hasNonProperIntersection = false;
+
+ private Coordinate intPt = null;
+ private Coordinate[] intSegments = null;
+
+ /**
+ * Creates an intersection finder using a {@link RobustLineIntersector}.
+ */
+ public SegmentIntersectionDetector()
+ {
+ this(new RobustLineIntersector());
+ }
+
+ /**
+ * Creates an intersection finder using a given LineIntersector.
+ *
+ * @param li the LineIntersector to use
+ */
+ public SegmentIntersectionDetector(LineIntersector li)
+ {
+ this.li = li;
+ }
+
+ /**
+ * Sets whether processing must continue until a proper intersection is found.
+ *
+ * @param findProper true if processing should continue until a proper intersection is found
+ */
+ public void setFindProper(boolean findProper)
+ {
+ this.findProper = findProper;
+ }
+
+ /**
+ * Sets whether processing can terminate once any intersection is found.
+ *
+ * @param findAllTypes true if processing can terminate once any intersection is found.
+ */
+ public void setFindAllIntersectionTypes(boolean findAllTypes)
+ {
+ this.findAllTypes = findAllTypes;
+ }
+
+ /**
+ * Tests whether an intersection was found.
+ *
+ * @return true if an intersection was found
+ */
+ public boolean hasIntersection()
+ {
+ return hasIntersection;
+ }
+
+ /**
+ * Tests whether a proper intersection was found.
+ *
+ * @return true if a proper intersection was found
+ */
+ public boolean hasProperIntersection()
+ {
+ return hasProperIntersection;
+ }
+
+ /**
+ * Tests whether a non-proper intersection was found.
+ *
+ * @return true if a non-proper intersection was found
+ */
+ public boolean hasNonProperIntersection()
+ {
+ return hasNonProperIntersection;
+ }
+
+ /**
+ * Gets the computed location of the intersection.
+ * Due to round-off, the location may not be exact.
+ *
+ * @return the coordinate for the intersection location
+ */
+ public Coordinate getIntersection()
+ {
+ return intPt;
+ }
+
+
+ /**
+ * Gets the endpoints of the intersecting segments.
+ *
+ * @return an array of the segment endpoints (p00, p01, p10, p11)
+ */
+ public Coordinate[] getIntersectionSegments()
+ {
+ return intSegments;
+ }
+
+ /**
+ * This method is called by clients
+ * of the {@link SegmentIntersector} class to process
+ * intersections for two segments of the {@link SegmentString}s being intersected.
+ * Note that some clients (such as <code>MonotoneChain</code>s) may optimize away
+ * this call for segment pairs which they have determined do not intersect
+ * (e.g. by an disjoint envelope test).
+ */
+ public void processIntersections(
+ SegmentString e0, int segIndex0,
+ SegmentString e1, int segIndex1
+ )
+ {
+ // don't bother intersecting a segment with itself
+ if (e0 == e1 && segIndex0 == segIndex1) return;
+
+ Coordinate p00 = e0.getCoordinates()[segIndex0];
+ Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
+ Coordinate p10 = e1.getCoordinates()[segIndex1];
+ Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
+
+ li.computeIntersection(p00, p01, p10, p11);
+// if (li.hasIntersection() && li.isProper()) Debug.println(li);
+
+ if (li.hasIntersection()) {
+ // System.out.println(li);
+
+ // record intersection info
+ hasIntersection = true;
+
+ boolean isProper = li.isProper();
+ if (isProper)
+ hasProperIntersection = true;
+ if (! isProper)
+ hasNonProperIntersection = true;
+
+ /**
+ * If this is the kind of intersection we are searching for
+ * OR no location has yet been recorded
+ * save the location data
+ */
+ boolean saveLocation = true;
+ if (findProper && ! isProper) saveLocation = false;
+
+ if (intPt == null || saveLocation) {
+
+ // record intersection location (approximate)
+ intPt = li.getIntersection(0);
+
+ // record intersecting segments
+ intSegments = new Coordinate[4];
+ intSegments[0] = p00;
+ intSegments[1] = p01;
+ intSegments[2] = p10;
+ intSegments[3] = p11;
+ }
+ }
+ }
+
+ /**
+ * Tests whether processing can terminate,
+ * because all required information has been obtained
+ * (e.g. an intersection of the desired type has been detected).
+ *
+ * @return true if processing can terminate
+ */
+ public boolean isDone()
+ {
+ /**
+ * If finding all types, we can stop
+ * when both possible types have been found.
+ */
+ if (findAllTypes) {
+ return hasProperIntersection && hasNonProperIntersection;
+ }
+
+ /**
+ * If searching for a proper intersection, only stop if one is found
+ */
+ if (findProper) {
+ return hasProperIntersection;
+ }
+ return hasIntersection;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentIntersector.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentIntersector.java
new file mode 100644
index 0000000..7b8b3ba
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentIntersector.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+/**
+ * Processes possible intersections detected by a {@link Noder}.
+ * The {@link SegmentIntersector} is passed to a {@link Noder}.
+ * The {@link SegmentIntersector#processIntersections(SegmentString, int, SegmentString, int)} method is called whenever the {@link Noder}
+ * detects that two SegmentStrings <i>might</i> intersect.
+ * This class may be used either to find all intersections, or
+ * to detect the presence of an intersection. In the latter case,
+ * Noders may choose to short-circuit their computation by calling the
+ * {@link #isDone()} method.
+ * This class is an example of the <i>Strategy</i> pattern.
+ *
+ * @version 1.7
+ */
+public interface SegmentIntersector
+{
+ /**
+ * This method is called by clients
+ * of the {@link SegmentIntersector} interface to process
+ * intersections for two segments of the {@link SegmentString}s being intersected.
+ */
+ void processIntersections(
+ SegmentString e0, int segIndex0,
+ SegmentString e1, int segIndex1
+ );
+
+ /**
+ * Reports whether the client of this class
+ * needs to continue testing all intersections in an arrangement.
+ *
+ * @return true if there is no need to continue testing segments
+ */
+ boolean isDone();
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentNode.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentNode.java
new file mode 100644
index 0000000..41204e4
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentNode.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.io.PrintStream;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Represents an intersection point between two {@link SegmentString}s.
+ *
+ * @version 1.7
+ */
+public class SegmentNode
+ implements Comparable
+{
+ private final NodedSegmentString segString;
+ public final Coordinate coord; // the point of intersection
+ public final int segmentIndex; // the index of the containing line segment in the parent edge
+ private final int segmentOctant;
+ private final boolean isInterior;
+
+ public SegmentNode(NodedSegmentString segString, Coordinate coord, int segmentIndex, int segmentOctant) {
+ this.segString = segString;
+ this.coord = new Coordinate(coord);
+ this.segmentIndex = segmentIndex;
+ this.segmentOctant = segmentOctant;
+ isInterior = ! coord.equals2D(segString.getCoordinate(segmentIndex));
+ }
+
+ /**
+ * Gets the {@link Coordinate} giving the location of this node.
+ *
+ * @return the coordinate of the node
+ */
+ public Coordinate getCoordinate()
+ {
+ return coord;
+ }
+
+ public boolean isInterior() { return isInterior; }
+
+ public boolean isEndPoint(int maxSegmentIndex)
+ {
+ if (segmentIndex == 0 && ! isInterior) return true;
+ if (segmentIndex == maxSegmentIndex) return true;
+ return false;
+ }
+
+ /**
+ * @return -1 this SegmentNode is located before the argument location;
+ * 0 this SegmentNode is at the argument location;
+ * 1 this SegmentNode is located after the argument location
+ */
+ public int compareTo(Object obj)
+ {
+ SegmentNode other = (SegmentNode) obj;
+
+ if (segmentIndex < other.segmentIndex) return -1;
+ if (segmentIndex > other.segmentIndex) return 1;
+
+ if (coord.equals2D(other.coord)) return 0;
+
+ return SegmentPointComparator.compare(segmentOctant, coord, other.coord);
+ //return segment.compareNodePosition(this, other);
+ }
+
+ public void print(PrintStream out)
+ {
+ out.print(coord);
+ out.print(" seg # = " + segmentIndex);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentNodeList.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentNodeList.java
new file mode 100644
index 0000000..6900b7e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentNodeList.java
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * A list of the {@link SegmentNode}s present along a noded {@link SegmentString}.
+ *
+ * @version 1.7
+ */
+public class SegmentNodeList
+{
+ private Map nodeMap = new TreeMap();
+ private NodedSegmentString edge; // the parent edge
+
+ public SegmentNodeList(NodedSegmentString edge)
+ {
+ this.edge = edge;
+ }
+
+ public NodedSegmentString getEdge() { return edge; }
+
+ /**
+ * Adds an intersection into the list, if it isn't already there.
+ * The input segmentIndex and dist are expected to be normalized.
+ *
+ * @return the SegmentIntersection found or added
+ */
+ public SegmentNode add(Coordinate intPt, int segmentIndex)
+ {
+ SegmentNode eiNew = new SegmentNode(edge, intPt, segmentIndex, edge.getSegmentOctant(segmentIndex));
+ SegmentNode ei = (SegmentNode) nodeMap.get(eiNew);
+ if (ei != null) {
+ // debugging sanity check
+ Assert.isTrue(ei.coord.equals2D(intPt), "Found equal nodes with different coordinates");
+// if (! ei.coord.equals2D(intPt))
+// Debug.println("Found equal nodes with different coordinates");
+
+ return ei;
+ }
+ // node does not exist, so create it
+ nodeMap.put(eiNew, eiNew);
+ return eiNew;
+ }
+
+ /**
+ * returns an iterator of SegmentNodes
+ */
+ public Iterator iterator() { return nodeMap.values().iterator(); }
+
+ /**
+ * Adds nodes for the first and last points of the edge
+ */
+ private void addEndpoints()
+ {
+ int maxSegIndex = edge.size() - 1;
+ add(edge.getCoordinate(0), 0);
+ add(edge.getCoordinate(maxSegIndex), maxSegIndex);
+ }
+
+ /**
+ * Adds nodes for any collapsed edge pairs.
+ * Collapsed edge pairs can be caused by inserted nodes, or they can be
+ * pre-existing in the edge vertex list.
+ * In order to provide the correct fully noded semantics,
+ * the vertex at the base of a collapsed pair must also be added as a node.
+ */
+ private void addCollapsedNodes()
+ {
+ List collapsedVertexIndexes = new ArrayList();
+
+ findCollapsesFromInsertedNodes(collapsedVertexIndexes);
+ findCollapsesFromExistingVertices(collapsedVertexIndexes);
+
+ // node the collapses
+ for (Iterator it = collapsedVertexIndexes.iterator(); it.hasNext(); ) {
+ int vertexIndex = ((Integer) it.next()).intValue();
+ add(edge.getCoordinate(vertexIndex), vertexIndex);
+ }
+ }
+
+ /**
+ * Adds nodes for any collapsed edge pairs
+ * which are pre-existing in the vertex list.
+ */
+ private void findCollapsesFromExistingVertices(List collapsedVertexIndexes)
+ {
+ for (int i = 0; i < edge.size() - 2; i++) {
+ Coordinate p0 = edge.getCoordinate(i);
+ Coordinate p1 = edge.getCoordinate(i + 1);
+ Coordinate p2 = edge.getCoordinate(i + 2);
+ if (p0.equals2D(p2)) {
+ // add base of collapse as node
+ collapsedVertexIndexes.add(new Integer(i + 1));
+ }
+ }
+ }
+
+ /**
+ * Adds nodes for any collapsed edge pairs caused by inserted nodes
+ * Collapsed edge pairs occur when the same coordinate is inserted as a node
+ * both before and after an existing edge vertex.
+ * To provide the correct fully noded semantics,
+ * the vertex must be added as a node as well.
+ */
+ private void findCollapsesFromInsertedNodes(List collapsedVertexIndexes)
+ {
+ int[] collapsedVertexIndex = new int[1];
+ Iterator it = iterator();
+ // there should always be at least two entries in the list, since the endpoints are nodes
+ SegmentNode eiPrev = (SegmentNode) it.next();
+ while (it.hasNext()) {
+ SegmentNode ei = (SegmentNode) it.next();
+ boolean isCollapsed = findCollapseIndex(eiPrev, ei, collapsedVertexIndex);
+ if (isCollapsed)
+ collapsedVertexIndexes.add(new Integer(collapsedVertexIndex[0]));
+
+ eiPrev = ei;
+ }
+ }
+
+ private boolean findCollapseIndex(SegmentNode ei0, SegmentNode ei1, int[] collapsedVertexIndex)
+ {
+ // only looking for equal nodes
+ if (! ei0.coord.equals2D(ei1.coord)) return false;
+
+ int numVerticesBetween = ei1.segmentIndex - ei0.segmentIndex;
+ if (! ei1.isInterior()) {
+ numVerticesBetween--;
+ }
+
+ // if there is a single vertex between the two equal nodes, this is a collapse
+ if (numVerticesBetween == 1) {
+ collapsedVertexIndex[0] = ei0.segmentIndex + 1;
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * Creates new edges for all the edges that the intersections in this
+ * list split the parent edge into.
+ * Adds the edges to the provided argument list
+ * (this is so a single list can be used to accumulate all split edges
+ * for a set of {@link SegmentString}s).
+ */
+ public void addSplitEdges(Collection edgeList)
+ {
+ // ensure that the list has entries for the first and last point of the edge
+ addEndpoints();
+ addCollapsedNodes();
+
+ Iterator it = iterator();
+ // there should always be at least two entries in the list, since the endpoints are nodes
+ SegmentNode eiPrev = (SegmentNode) it.next();
+ while (it.hasNext()) {
+ SegmentNode ei = (SegmentNode) it.next();
+ SegmentString newEdge = createSplitEdge(eiPrev, ei);
+ /*
+ if (newEdge.size() < 2)
+ throw new RuntimeException("created single point edge: " + newEdge.toString());
+ */
+ edgeList.add(newEdge);
+ eiPrev = ei;
+ }
+ //checkSplitEdgesCorrectness(testingSplitEdges);
+ }
+
+ /**
+ * Checks the correctness of the set of split edges corresponding to this edge.
+ *
+ * @param splitEdges the split edges for this edge (in order)
+ */
+ private void checkSplitEdgesCorrectness(List splitEdges)
+ {
+ Coordinate[] edgePts = edge.getCoordinates();
+
+ // check that first and last points of split edges are same as endpoints of edge
+ SegmentString split0 = (SegmentString) splitEdges.get(0);
+ Coordinate pt0 = split0.getCoordinate(0);
+ if (! pt0.equals2D(edgePts[0]))
+ throw new RuntimeException("bad split edge start point at " + pt0);
+
+ SegmentString splitn = (SegmentString) splitEdges.get(splitEdges.size() - 1);
+ Coordinate[] splitnPts = splitn.getCoordinates();
+ Coordinate ptn = splitnPts[splitnPts.length - 1];
+ if (! ptn.equals2D(edgePts[edgePts.length - 1]))
+ throw new RuntimeException("bad split edge end point at " + ptn);
+
+ }
+
+ /**
+ * Create a new "split edge" with the section of points between
+ * (and including) the two intersections.
+ * The label for the new edge is the same as the label for the parent edge.
+ */
+ SegmentString createSplitEdge(SegmentNode ei0, SegmentNode ei1)
+ {
+//Debug.println("\ncreateSplitEdge"); Debug.print(ei0); Debug.print(ei1);
+ int npts = ei1.segmentIndex - ei0.segmentIndex + 2;
+
+ Coordinate lastSegStartPt = edge.getCoordinate(ei1.segmentIndex);
+ // if the last intersection point is not equal to the its segment start pt,
+ // add it to the points list as well.
+ // (This check is needed because the distance metric is not totally reliable!)
+ // The check for point equality is 2D only - Z values are ignored
+ boolean useIntPt1 = ei1.isInterior() || ! ei1.coord.equals2D(lastSegStartPt);
+ if (! useIntPt1) {
+ npts--;
+ }
+
+ Coordinate[] pts = new Coordinate[npts];
+ int ipt = 0;
+ pts[ipt++] = new Coordinate(ei0.coord);
+ for (int i = ei0.segmentIndex + 1; i <= ei1.segmentIndex; i++) {
+ pts[ipt++] = edge.getCoordinate(i);
+ }
+ if (useIntPt1) pts[ipt] = new Coordinate(ei1.coord);
+
+ return new NodedSegmentString(pts, edge.getData());
+ }
+
+ /**
+ * Gets the list of coordinates for the fully noded segment string,
+ * including all original segment string vertices and vertices
+ * introduced by nodes in this list.
+ * Repeated coordinates are collapsed.
+ *
+ * @return an array of Coordinates
+ *
+ */
+ public Coordinate[] getSplitCoordinates()
+ {
+ CoordinateList coordList = new CoordinateList();
+ // ensure that the list has entries for the first and last point of the edge
+ addEndpoints();
+
+ Iterator it = iterator();
+ // there should always be at least two entries in the list, since the endpoints are nodes
+ SegmentNode eiPrev = (SegmentNode) it.next();
+ while (it.hasNext()) {
+ SegmentNode ei = (SegmentNode) it.next();
+ addEdgeCoordinates(eiPrev, ei, coordList);
+ eiPrev = ei;
+ }
+ return coordList.toCoordinateArray();
+ }
+
+ private void addEdgeCoordinates(SegmentNode ei0, SegmentNode ei1,
+ CoordinateList coordList) {
+ int npts = ei1.segmentIndex - ei0.segmentIndex + 2;
+
+ Coordinate lastSegStartPt = edge.getCoordinate(ei1.segmentIndex);
+ // if the last intersection point is not equal to the its segment start pt,
+ // add it to the points list as well.
+ // (This check is needed because the distance metric is not totally reliable!)
+ // The check for point equality is 2D only - Z values are ignored
+ boolean useIntPt1 = ei1.isInterior() || ! ei1.coord.equals2D(lastSegStartPt);
+ if (! useIntPt1) {
+ npts--;
+ }
+
+ int ipt = 0;
+ coordList.add(new Coordinate(ei0.coord), false);
+ for (int i = ei0.segmentIndex + 1; i <= ei1.segmentIndex; i++) {
+ coordList.add(edge.getCoordinate(i));
+ }
+ if (useIntPt1) {
+ coordList.add(new Coordinate(ei1.coord));
+ }
+ }
+
+ public void print(PrintStream out)
+ {
+ out.println("Intersections:");
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ SegmentNode ei = (SegmentNode) it.next();
+ ei.print(out);
+ }
+ }
+}
+
+// INCOMPLETE!
+class NodeVertexIterator
+ implements Iterator
+{
+ private SegmentNodeList nodeList;
+ private NodedSegmentString edge;
+ private Iterator nodeIt;
+ private SegmentNode currNode = null;
+ private SegmentNode nextNode = null;
+ private int currSegIndex = 0;
+
+ NodeVertexIterator(SegmentNodeList nodeList)
+ {
+ this.nodeList = nodeList;
+ edge = nodeList.getEdge();
+ nodeIt = nodeList.iterator();
+ readNextNode();
+ }
+
+ public boolean hasNext() {
+ if (nextNode == null) return false;
+ return true;
+ }
+
+ public Object next()
+ {
+ if (currNode == null) {
+ currNode = nextNode;
+ currSegIndex = currNode.segmentIndex;
+ readNextNode();
+ return currNode;
+ }
+ // check for trying to read too far
+ if (nextNode == null) return null;
+
+ if (nextNode.segmentIndex == currNode.segmentIndex) {
+ currNode = nextNode;
+ currSegIndex = currNode.segmentIndex;
+ readNextNode();
+ return currNode;
+ }
+
+ if (nextNode.segmentIndex > currNode.segmentIndex) {
+
+ }
+ return null;
+ }
+
+ private void readNextNode()
+ {
+ if (nodeIt.hasNext())
+ nextNode = (SegmentNode) nodeIt.next();
+ else
+ nextNode = null;
+ }
+ /**
+ * Not implemented.
+ *
+ *@throws UnsupportedOperationException This method is not implemented.
+ */
+ public void remove() {
+ throw new UnsupportedOperationException(getClass().getName());
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentPointComparator.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentPointComparator.java
new file mode 100644
index 0000000..a459b19
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentPointComparator.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Implements a robust method of comparing the relative position of two
+ * points along the same segment.
+ * The coordinates are assumed to lie "near" the segment.
+ * This means that this algorithm will only return correct results
+ * if the input coordinates
+ * have the same precision and correspond to rounded values
+ * of exact coordinates lying on the segment.
+ *
+ * @version 1.7
+ */
+public class SegmentPointComparator {
+
+ /**
+ * Compares two {@link Coordinate}s for their relative position along a segment
+ * lying in the specified {@link Octant}.
+ *
+ * @return -1 node0 occurs first;
+ * 0 the two nodes are equal;
+ * 1 node1 occurs first
+ */
+ public static int compare(int octant, Coordinate p0, Coordinate p1)
+ {
+ // nodes can only be equal if their coordinates are equal
+ if (p0.equals2D(p1)) return 0;
+
+ int xSign = relativeSign(p0.x, p1.x);
+ int ySign = relativeSign(p0.y, p1.y);
+
+ switch (octant) {
+ case 0: return compareValue(xSign, ySign);
+ case 1: return compareValue(ySign, xSign);
+ case 2: return compareValue(ySign, -xSign);
+ case 3: return compareValue(-xSign, ySign);
+ case 4: return compareValue(-xSign, -ySign);
+ case 5: return compareValue(-ySign, -xSign);
+ case 6: return compareValue(-ySign, xSign);
+ case 7: return compareValue(xSign, -ySign);
+ }
+ Assert.shouldNeverReachHere("invalid octant value");
+ return 0;
+ }
+
+ public static int relativeSign(double x0, double x1)
+ {
+ if (x0 < x1) return -1;
+ if (x0 > x1) return 1;
+ return 0;
+ }
+
+ private static int compareValue(int compareSign0, int compareSign1)
+ {
+ if (compareSign0 < 0) return -1;
+ if (compareSign0 > 0) return 1;
+ if (compareSign1 < 0) return -1;
+ if (compareSign1 > 0) return 1;
+ return 0;
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentSetMutualIntersector.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentSetMutualIntersector.java
new file mode 100644
index 0000000..caeee6f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentSetMutualIntersector.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+
+/**
+ * An intersector for the red-blue intersection problem.
+ * In this class of line arrangement problem,
+ * two disjoint sets of linestrings are intersected.
+ * <p>
+ * Implementing classes must provide a way
+ * of supplying the base set of segment strings to
+ * test against (e.g. in the constructor,
+ * for straightforward thread-safety).
+ * <p>
+ * In order to allow optimizing processing,
+ * the following condition is assumed to hold for each set:
+ * <ul>
+ * <li>the only intersection between any two linestrings occurs at their endpoints.
+ * </ul>
+ * Implementations can take advantage of this fact to optimize processing
+ * (i.e. by avoiding testing for intersections between linestrings
+ * belonging to the same set).
+ *
+ * @author Martin Davis
+ * @version 1.10
+ */
+public interface SegmentSetMutualIntersector
+{
+ /**
+ * Computes the intersections with a given set of {@link SegmentString}s,
+ * using the supplied {@link SegmentIntersector}.
+ *
+ * @param segStrings a collection of {@link SegmentString}s to node
+ * @param segInt the intersection detector to either record intersection occurrences
+ * or add intersection nodes to the input segment strings.
+ */
+ void process(Collection segStrings, SegmentIntersector segInt);
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentString.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentString.java
new file mode 100644
index 0000000..443a96a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentString.java
@@ -0,0 +1,44 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * An interface for classes which represent a sequence of contiguous line segments.
+ * SegmentStrings can carry a context object, which is useful
+ * for preserving topological or parentage information.
+ *
+ * @version 1.7
+ */
+public interface SegmentString
+{
+ /**
+ * Gets the user-defined data for this segment string.
+ *
+ * @return the user-defined data
+ */
+ public Object getData();
+
+ /**
+ * Sets the user-defined data for this segment string.
+ *
+ * @param data an Object containing user-defined data
+ */
+ public void setData(Object data);
+
+ public int size();
+ public Coordinate getCoordinate(int i);
+ public Coordinate[] getCoordinates();
+ public boolean isClosed();
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentStringDissolver.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentStringDissolver.java
new file mode 100644
index 0000000..990005c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentStringDissolver.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.CoordinateArrays;
+
+/**
+ * Dissolves a noded collection of {@link SegmentString}s to produce
+ * a set of merged linework with unique segments.
+ * A custom {@link SegmentStringMerger} merging strategy
+ * can be supplied.
+ * This strategy will be called when two identical (up to orientation)
+ * strings are dissolved together.
+ * The default merging strategy is simply to discard one of the merged strings.
+ * <p>
+ * A common use for this class is to merge noded edges
+ * while preserving topological labelling.
+ * This requires a custom merging strategy to be supplied
+ * to merge the topology labels appropriately.
+ *
+ * @version 1.7
+ * @see SegmentStringMerger
+ */
+public class SegmentStringDissolver
+{
+ /**
+ * A merging strategy which can be used to update the context data of {@link SegmentString}s
+ * which are merged during the dissolve process.
+ *
+ * @author mbdavis
+ *
+ */
+ public interface SegmentStringMerger
+ {
+ /**
+ * Updates the context data of a SegmentString
+ * when an identical (up to orientation) one is found during dissolving.
+ *
+ * @param mergeTarget the segment string to update
+ * @param ssToMerge the segment string being dissolved
+ * @param isSameOrientation <code>true</code> if the strings are in the same direction,
+ * <code>false</code> if they are opposite
+ */
+ void merge(SegmentString mergeTarget, SegmentString ssToMerge, boolean isSameOrientation);
+ }
+
+ private SegmentStringMerger merger;
+ private Map ocaMap = new TreeMap();
+
+ // testing only
+ //private List testAddedSS = new ArrayList();
+
+ /**
+ * Creates a dissolver with a user-defined merge strategy.
+ *
+ * @param merger the merging strategy to use
+ */
+ public SegmentStringDissolver(SegmentStringMerger merger) {
+ this.merger = merger;
+ }
+
+ /**
+ * Creates a dissolver with the default merging strategy.
+ */
+ public SegmentStringDissolver() {
+ this(null);
+ }
+
+ /**
+ * Dissolve all {@link SegmentString}s in the input {@link Collection}
+ * @param segStrings
+ */
+ public void dissolve(Collection segStrings)
+ {
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ dissolve((SegmentString) i.next());
+ }
+ }
+
+ private void add(OrientedCoordinateArray oca, SegmentString segString)
+ {
+ ocaMap.put(oca, segString);
+ //testAddedSS.add(oca);
+ }
+
+ /**
+ * Dissolve the given {@link SegmentString}.
+ *
+ * @param segString the string to dissolve
+ */
+ public void dissolve(SegmentString segString)
+ {
+ OrientedCoordinateArray oca = new OrientedCoordinateArray(segString.getCoordinates());
+ SegmentString existing = findMatching(oca, segString);
+ if (existing == null) {
+ add(oca, segString);
+ }
+ else {
+ if (merger != null) {
+ boolean isSameOrientation
+ = CoordinateArrays.equals(existing.getCoordinates(), segString.getCoordinates());
+ merger.merge(existing, segString, isSameOrientation);
+ }
+ }
+ }
+
+ private SegmentString findMatching(OrientedCoordinateArray oca,
+ SegmentString segString)
+ {
+ SegmentString matchSS = (SegmentString) ocaMap.get(oca);
+ /*
+ boolean hasBeenAdded = checkAdded(oca);
+ if (matchSS == null && hasBeenAdded) {
+ System.out.println("added!");
+ }
+ */
+ return matchSS;
+ }
+
+/*
+
+ private boolean checkAdded(OrientedCoordinateArray oca)
+ {
+ for (Iterator i = testAddedSS.iterator(); i.hasNext(); ) {
+ OrientedCoordinateArray addedOCA = (OrientedCoordinateArray) i.next();
+ if (oca.compareTo(addedOCA) == 0)
+ return true;
+ }
+ return false;
+ }
+*/
+
+ /**
+ * Gets the collection of dissolved (i.e. unique) {@link SegmentString}s
+ *
+ * @return the unique {@link SegmentString}s
+ */
+ public Collection getDissolved() { return ocaMap.values(); }
+}
+
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SegmentStringUtil.java b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentStringUtil.java
new file mode 100644
index 0000000..eddd4be
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SegmentStringUtil.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+
+
+/**
+ * Utility methods for processing {@link SegmentString}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public class SegmentStringUtil
+{
+ /**
+ * Extracts all linear components from a given {@link Geometry}
+ * to {@link SegmentString}s.
+ * The SegmentString data item is set to be the source Geometry.
+ *
+ * @param geom the geometry to extract from
+ * @return a List of SegmentStrings
+ */
+ public static List extractSegmentStrings(Geometry geom)
+ {
+ return extractNodedSegmentStrings(geom);
+ }
+
+ /**
+ * Extracts all linear components from a given {@link Geometry}
+ * to {@link SegmentString}s.
+ * The SegmentString data item is set to be the source Geometry.
+ *
+ * @param geom the geometry to extract from
+ * @return a List of SegmentStrings
+ */
+ public static List extractNodedSegmentStrings(Geometry geom)
+ {
+ List segStr = new ArrayList();
+ List lines = LinearComponentExtracter.getLines(geom);
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ Coordinate[] pts = line.getCoordinates();
+ segStr.add(new NodedSegmentString(pts, geom));
+ }
+ return segStr;
+ }
+
+ /**
+ * Converts a collection of {@link SegmentString}s into a {@link Geometry}.
+ * The geometry will be either a {@link LineString} or a {@link MultiLineString} (possibly empty).
+ *
+ * @param segStrings a collection of SegmentStrings
+ * @return a LineString or MultiLineString
+ */
+ public static Geometry toGeometry(Collection segStrings, GeometryFactory geomFact)
+ {
+ LineString[] lines = new LineString[segStrings.size()];
+ int index = 0;
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString ss = (SegmentString) i.next();
+ LineString line = geomFact.createLineString(ss.getCoordinates());
+ lines[index++] = line;
+ }
+ if (lines.length == 1) return lines[0];
+ return geomFact.createMultiLineString(lines);
+ }
+
+ public static String toString(List segStrings)
+ {
+ StringBuffer buf = new StringBuffer();
+ for (Iterator i = segStrings.iterator(); i.hasNext(); ) {
+ SegmentString segStr = (SegmentString) i.next();
+ buf.append(segStr.toString());
+ buf.append("\n");
+
+ }
+ return buf.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SimpleNoder.java b/modules/core/src/main/java/org/locationtech/jts/noding/SimpleNoder.java
new file mode 100644
index 0000000..a274087
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SimpleNoder.java
@@ -0,0 +1,65 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Nodes a set of {@link SegmentString}s by
+ * performing a brute-force comparison of every segment to every other one.
+ * This has n^2 performance, so is too slow for use on large numbers
+ * of segments.
+ *
+ * @version 1.7
+ */
+public class SimpleNoder
+ extends SinglePassNoder
+{
+
+ private Collection nodedSegStrings;
+
+ public SimpleNoder() {
+ }
+
+ public Collection getNodedSubstrings()
+ {
+ return NodedSegmentString.getNodedSubstrings(nodedSegStrings);
+ }
+
+ public void computeNodes(Collection inputSegStrings)
+ {
+ this.nodedSegStrings = inputSegStrings;
+ for (Iterator i0 = inputSegStrings.iterator(); i0.hasNext(); ) {
+ SegmentString edge0 = (SegmentString) i0.next();
+ for (Iterator i1 = inputSegStrings.iterator(); i1.hasNext(); ) {
+ SegmentString edge1 = (SegmentString) i1.next();
+ computeIntersects(edge0, edge1);
+ }
+ }
+ }
+
+ private void computeIntersects(SegmentString e0, SegmentString e1)
+ {
+ Coordinate[] pts0 = e0.getCoordinates();
+ Coordinate[] pts1 = e1.getCoordinates();
+ for (int i0 = 0; i0 < pts0.length - 1; i0++) {
+ for (int i1 = 0; i1 < pts1.length - 1; i1++) {
+ segInt.processIntersections(e0, i0, e1, i1);
+ }
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SimpleSegmentSetMutualIntersector.java b/modules/core/src/main/java/org/locationtech/jts/noding/SimpleSegmentSetMutualIntersector.java
new file mode 100644
index 0000000..342b775
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SimpleSegmentSetMutualIntersector.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Coordinate;
+
+
+
+/**
+ * Intersects two sets of {@link SegmentString}s using
+ * brute-force comparison.
+ *
+ * @version 1.7
+ */
+public class SimpleSegmentSetMutualIntersector implements SegmentSetMutualIntersector
+{
+ private final Collection baseSegStrings;
+
+ /**
+ * Constructs a new intersector for a given set of {@link SegmentString}s.
+ *
+ * @param segStrings the base segment strings to intersect
+ */
+ public SimpleSegmentSetMutualIntersector(Collection segStrings)
+ {
+ this.baseSegStrings = segStrings;
+ }
+
+ /**
+ * Calls {@link SegmentIntersector#processIntersections(SegmentString, int, SegmentString, int)}
+ * for all <i>candidate</i> intersections between
+ * the given collection of SegmentStrings and the set of base segments.
+ *
+ * @param a set of segments to intersect
+ * @param the segment intersector to use
+ */
+ public void process(Collection segStrings, SegmentIntersector segInt) {
+ for (Iterator i = baseSegStrings.iterator(); i.hasNext(); ) {
+ SegmentString baseSS = (SegmentString) i.next();
+ for (Iterator j = segStrings.iterator(); j.hasNext(); ) {
+ SegmentString ss = (SegmentString) j.next();
+ intersect(baseSS, ss, segInt);
+ if (segInt.isDone())
+ return;
+ }
+ }
+ }
+
+ /**
+ * Processes all of the segment pairs in the given segment strings
+ * using the given SegmentIntersector.
+ *
+ * @param ss0 a Segment string
+ * @param ss1 a segment string
+ * @param segInt the segment intersector to use
+ */
+ private void intersect(SegmentString ss0, SegmentString ss1, SegmentIntersector segInt)
+ {
+ Coordinate[] pts0 = ss0.getCoordinates();
+ Coordinate[] pts1 = ss1.getCoordinates();
+ for (int i0 = 0; i0 < pts0.length - 1; i0++) {
+ for (int i1 = 0; i1 < pts1.length - 1; i1++) {
+ segInt.processIntersections(ss0, i0, ss1, i1);
+ if (segInt.isDone())
+ return;
+ }
+ }
+
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/SinglePassNoder.java b/modules/core/src/main/java/org/locationtech/jts/noding/SinglePassNoder.java
new file mode 100644
index 0000000..e101749
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/SinglePassNoder.java
@@ -0,0 +1,70 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding;
+
+import java.util.Collection;
+
+/**
+ * Base class for {@link Noder}s which make a single
+ * pass to find intersections.
+ * This allows using a custom {@link SegmentIntersector}
+ * (which for instance may simply identify intersections, rather than
+ * insert them).
+ *
+ * @version 1.7
+ */
+public abstract class SinglePassNoder
+ implements Noder
+{
+
+ protected SegmentIntersector segInt;
+
+ public SinglePassNoder() {
+ }
+
+ public SinglePassNoder(SegmentIntersector segInt) {
+ setSegmentIntersector(segInt);
+ }
+
+ /**
+ * Sets the SegmentIntersector to use with this noder.
+ * A SegmentIntersector will normally add intersection nodes
+ * to the input segment strings, but it may not - it may
+ * simply record the presence of intersections.
+ * However, some Noders may require that intersections be added.
+ *
+ * @param segInt
+ */
+ public void setSegmentIntersector(SegmentIntersector segInt)
+ {
+ this.segInt = segInt;
+ }
+
+ /**
+ * Computes the noding for a collection of {@link SegmentString}s.
+ * Some Noders may add all these nodes to the input SegmentStrings;
+ * others may only add some or none at all.
+ *
+ * @param segStrings a collection of {@link SegmentString}s to node
+ */
+ public abstract void computeNodes(Collection segStrings);
+
+ /**
+ * Returns a {@link Collection} of fully noded {@link SegmentString}s.
+ * The SegmentStrings have the same context as their parent.
+ *
+ * @return a Collection of SegmentStrings
+ */
+ public abstract Collection getNodedSubstrings();
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/package.html b/modules/core/src/main/java/org/locationtech/jts/noding/package.html
new file mode 100644
index 0000000..be69c89
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to compute nodings for arrangements of line segments and line segment sequences.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/snapround/GeometryNoder.java b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/GeometryNoder.java
new file mode 100644
index 0000000..9d5469d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/GeometryNoder.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding.snapround;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.noding.NodedSegmentString;
+import org.locationtech.jts.noding.Noder;
+import org.locationtech.jts.noding.NodingValidator;
+import org.locationtech.jts.noding.SegmentString;
+
+/**
+ * Nodes the linework in a list of {@link Geometry}s using Snap-Rounding
+ * to a given {@link PrecisionModel}.
+ * <p>
+ * The input coordinates are expected to be rounded
+ * to the given precision model.
+ * This class does not perform that function.
+ * <code>GeometryPrecisionReducer</code> may be used to do this.
+ * <p>
+ * This class does <b>not</b> dissolve the output linework,
+ * so there may be duplicate linestrings in the output.
+ * Subsequent processing (e.g. polygonization) may require
+ * the linework to be unique. Using <code>UnaryUnion</code> is one way
+ * to do this (although this is an inefficient approach).
+ *
+ *
+ */
+public class GeometryNoder
+{
+ private GeometryFactory geomFact;
+ private PrecisionModel pm;
+ private boolean isValidityChecked = false;
+
+ /**
+ * Creates a new noder which snap-rounds to a grid specified
+ * by the given {@link PrecisionModel}.
+ *
+ * @param pm the precision model for the grid to snap-round to
+ */
+ public GeometryNoder(PrecisionModel pm) {
+ this.pm = pm;
+ }
+
+ /**
+ * Sets whether noding validity is checked after noding is performed.
+ *
+ * @param isValidityChecked
+ */
+ public void setValidate(boolean isValidityChecked)
+ {
+ this.isValidityChecked = isValidityChecked;
+ }
+
+ /**
+ * Nodes the linework of a set of Geometrys using SnapRounding.
+ *
+ * @param geoms a Collection of Geometrys of any type
+ * @return a List of LineStrings representing the noded linework of the input
+ */
+ public List node(Collection geoms)
+ {
+ // get geometry factory
+ Geometry geom0 = (Geometry) geoms.iterator().next();
+ geomFact = geom0.getFactory();
+
+ List segStrings = toSegmentStrings(extractLines(geoms));
+ //Noder sr = new SimpleSnapRounder(pm);
+ Noder sr = new MCIndexSnapRounder(pm);
+ sr.computeNodes(segStrings);
+ Collection nodedLines = sr.getNodedSubstrings();
+
+ //TODO: improve this to check for full snap-rounded correctness
+ if (isValidityChecked) {
+ NodingValidator nv = new NodingValidator(nodedLines);
+ nv.checkValid();
+ }
+
+ return toLineStrings(nodedLines);
+ }
+
+ private List toLineStrings(Collection segStrings)
+ {
+ List lines = new ArrayList();
+ for (Iterator it = segStrings.iterator(); it.hasNext(); ) {
+ SegmentString ss = (SegmentString) it.next();
+ // skip collapsed lines
+ if (ss.size() < 2)
+ continue;
+ lines.add(geomFact.createLineString(ss.getCoordinates()));
+ }
+ return lines;
+ }
+
+ private List extractLines(Collection geoms)
+ {
+ List lines = new ArrayList();
+ LinearComponentExtracter lce = new LinearComponentExtracter(lines);
+ for (Iterator it = geoms.iterator(); it.hasNext(); ) {
+ Geometry geom = (Geometry) it.next();
+ geom.apply(lce);
+ }
+ return lines;
+ }
+
+ private List toSegmentStrings(Collection lines)
+ {
+ List segStrings = new ArrayList();
+ for (Iterator it = lines.iterator(); it.hasNext(); ) {
+ LineString line = (LineString) it.next();
+ segStrings.add(new NodedSegmentString(line.getCoordinates(), null));
+ }
+ return segStrings;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/snapround/HotPixel.java b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/HotPixel.java
new file mode 100644
index 0000000..dcdb3c5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/HotPixel.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding.snapround;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.noding.NodedSegmentString;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Implements a "hot pixel" as used in the Snap Rounding algorithm.
+ * A hot pixel contains the interior of the tolerance square and
+ * the boundary
+ * <b>minus</b> the top and right segments.
+ * <p>
+ * The hot pixel operations are all computed in the integer domain
+ * to avoid rounding problems.
+ *
+ * @version 1.7
+ */
+public class HotPixel
+{
+ // testing only
+// public static int nTests = 0;
+
+ private LineIntersector li;
+
+ private Coordinate pt;
+ private Coordinate originalPt;
+ private Coordinate ptScaled;
+
+ private Coordinate p0Scaled;
+ private Coordinate p1Scaled;
+
+ private double scaleFactor;
+
+ private double minx;
+ private double maxx;
+ private double miny;
+ private double maxy;
+
+ /**
+ * The corners of the hot pixel, in the order:
+ * 10
+ * 23
+ */
+ private Coordinate[] corner = new Coordinate[4];
+
+ private Envelope safeEnv = null;
+
+ /**
+ * Creates a new hot pixel, using a given scale factor.
+ * The scale factor must be strictly positive (non-zero).
+ *
+ * @param pt the coordinate at the centre of the pixel
+ * @param scaleFactor the scaleFactor determining the pixel size. Must be > 0
+ * @param li the intersector to use for testing intersection with line segments
+ *
+ */
+ public HotPixel(Coordinate pt, double scaleFactor, LineIntersector li) {
+ originalPt = pt;
+ this.pt = pt;
+ this.scaleFactor = scaleFactor;
+ this.li = li;
+ //tolerance = 0.5;
+ if (scaleFactor <= 0)
+ throw new IllegalArgumentException("Scale factor must be non-zero");
+ if (scaleFactor != 1.0) {
+ this.pt = new Coordinate(scale(pt.x), scale(pt.y));
+ p0Scaled = new Coordinate();
+ p1Scaled = new Coordinate();
+ }
+ initCorners(this.pt);
+ }
+
+ /**
+ * Gets the coordinate this hot pixel is based at.
+ *
+ * @return the coordinate of the pixel
+ */
+ public Coordinate getCoordinate() { return originalPt; }
+
+ private static final double SAFE_ENV_EXPANSION_FACTOR = 0.75;
+
+ /**
+ * Returns a "safe" envelope that is guaranteed to contain the hot pixel.
+ * The envelope returned will be larger than the exact envelope of the
+ * pixel.
+ *
+ * @return an envelope which contains the hot pixel
+ */
+ public Envelope getSafeEnvelope()
+ {
+ if (safeEnv == null) {
+ double safeTolerance = SAFE_ENV_EXPANSION_FACTOR / scaleFactor;
+ safeEnv = new Envelope(originalPt.x - safeTolerance,
+ originalPt.x + safeTolerance,
+ originalPt.y - safeTolerance,
+ originalPt.y + safeTolerance
+ );
+ }
+ return safeEnv;
+ }
+
+ private void initCorners(Coordinate pt)
+ {
+ double tolerance = 0.5;
+ minx = pt.x - tolerance;
+ maxx = pt.x + tolerance;
+ miny = pt.y - tolerance;
+ maxy = pt.y + tolerance;
+
+ corner[0] = new Coordinate(maxx, maxy);
+ corner[1] = new Coordinate(minx, maxy);
+ corner[2] = new Coordinate(minx, miny);
+ corner[3] = new Coordinate(maxx, miny);
+ }
+
+ private double scale(double val)
+ {
+ return (double) Math.round(val * scaleFactor);
+ }
+
+ /**
+ * Tests whether the line segment (p0-p1)
+ * intersects this hot pixel.
+ *
+ * @param p0 the first coordinate of the line segment to test
+ * @param p1 the second coordinate of the line segment to test
+ * @return true if the line segment intersects this hot pixel
+ */
+ public boolean intersects(Coordinate p0, Coordinate p1)
+ {
+ if (scaleFactor == 1.0)
+ return intersectsScaled(p0, p1);
+
+ copyScaled(p0, p0Scaled);
+ copyScaled(p1, p1Scaled);
+ return intersectsScaled(p0Scaled, p1Scaled);
+ }
+
+ private void copyScaled(Coordinate p, Coordinate pScaled)
+ {
+ pScaled.x = scale(p.x);
+ pScaled.y = scale(p.y);
+ }
+
+ private boolean intersectsScaled(Coordinate p0, Coordinate p1)
+ {
+ double segMinx = Math.min(p0.x, p1.x);
+ double segMaxx = Math.max(p0.x, p1.x);
+ double segMiny = Math.min(p0.y, p1.y);
+ double segMaxy = Math.max(p0.y, p1.y);
+
+ boolean isOutsidePixelEnv = maxx < segMinx
+ || minx > segMaxx
+ || maxy < segMiny
+ || miny > segMaxy;
+ if (isOutsidePixelEnv)
+ return false;
+ boolean intersects = intersectsToleranceSquare(p0, p1);
+// boolean intersectsPixelClosure = intersectsPixelClosure(p0, p1);
+
+// if (intersectsPixel != intersects) {
+// Debug.println("Found hot pixel intersection mismatch at " + pt);
+// Debug.println("Test segment: " + p0 + " " + p1);
+// }
+
+/*
+ if (scaleFactor != 1.0) {
+ boolean intersectsScaled = intersectsScaledTest(p0, p1);
+ if (intersectsScaled != intersects) {
+ intersectsScaledTest(p0, p1);
+// Debug.println("Found hot pixel scaled intersection mismatch at " + pt);
+// Debug.println("Test segment: " + p0 + " " + p1);
+ }
+ return intersectsScaled;
+ }
+*/
+
+ Assert.isTrue(! (isOutsidePixelEnv && intersects), "Found bad envelope test");
+// if (isOutsideEnv && intersects) {
+// Debug.println("Found bad envelope test");
+// }
+
+ return intersects;
+ //return intersectsPixelClosure;
+ }
+
+ /**
+ * Tests whether the segment p0-p1 intersects the hot pixel tolerance square.
+ * Because the tolerance square point set is partially open (along the
+ * top and right) the test needs to be more sophisticated than
+ * simply checking for any intersection.
+ * However, it can take advantage of the fact that the hot pixel edges
+ * do not lie on the coordinate grid.
+ * It is sufficient to check if any of the following occur:
+ * <ul>
+ * <li>a proper intersection between the segment and any hot pixel edge
+ * <li>an intersection between the segment and <b>both</b> the left and bottom hot pixel edges
+ * (which detects the case where the segment intersects the bottom left hot pixel corner)
+ * <li>an intersection between a segment endpoint and the hot pixel coordinate
+ * </ul>
+ *
+ * @param p0
+ * @param p1
+ * @return
+ */
+ private boolean intersectsToleranceSquare(Coordinate p0, Coordinate p1)
+ {
+ boolean intersectsLeft = false;
+ boolean intersectsBottom = false;
+ //System.out.println("Hot Pixel: " + WKTWriter.toLineString(corner));
+ //System.out.println("Line: " + WKTWriter.toLineString(p0, p1));
+
+ li.computeIntersection(p0, p1, corner[0], corner[1]);
+ if (li.isProper()) return true;
+
+ li.computeIntersection(p0, p1, corner[1], corner[2]);
+ if (li.isProper()) return true;
+ if (li.hasIntersection()) intersectsLeft = true;
+
+ li.computeIntersection(p0, p1, corner[2], corner[3]);
+ if (li.isProper()) return true;
+ if (li.hasIntersection()) intersectsBottom = true;
+
+ li.computeIntersection(p0, p1, corner[3], corner[0]);
+ if (li.isProper()) return true;
+
+ if (intersectsLeft && intersectsBottom) return true;
+
+ if (p0.equals(pt)) return true;
+ if (p1.equals(pt)) return true;
+
+ return false;
+ }
+ /**
+ * Test whether the given segment intersects
+ * the closure of this hot pixel.
+ * This is NOT the test used in the standard snap-rounding
+ * algorithm, which uses the partially closed tolerance square
+ * instead.
+ * This routine is provided for testing purposes only.
+ *
+ * @param p0 the start point of a line segment
+ * @param p1 the end point of a line segment
+ * @return <code>true</code> if the segment intersects the closure of the pixel's tolerance square
+ */
+ private boolean intersectsPixelClosure(Coordinate p0, Coordinate p1)
+ {
+ li.computeIntersection(p0, p1, corner[0], corner[1]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[1], corner[2]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[2], corner[3]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[3], corner[0]);
+ if (li.hasIntersection()) return true;
+
+ return false;
+ }
+
+ /**
+ * Adds a new node (equal to the snap pt) to the specified segment
+ * if the segment passes through the hot pixel
+ *
+ * @param segStr
+ * @param segIndex
+ * @return true if a node was added to the segment
+ */
+ public boolean addSnappedNode(
+ NodedSegmentString segStr,
+ int segIndex
+ )
+ {
+ Coordinate p0 = segStr.getCoordinate(segIndex);
+ Coordinate p1 = segStr.getCoordinate(segIndex + 1);
+
+ if (intersects(p0, p1)) {
+ //System.out.println("snapped: " + snapPt);
+ //System.out.println("POINT (" + snapPt.x + " " + snapPt.y + ")");
+ segStr.addIntersection(getCoordinate(), segIndex);
+
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/snapround/MCIndexPointSnapper.java b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/MCIndexPointSnapper.java
new file mode 100644
index 0000000..86b2ae8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/MCIndexPointSnapper.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding.snapround;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.chain.MonotoneChain;
+import org.locationtech.jts.index.chain.MonotoneChainSelectAction;
+import org.locationtech.jts.index.strtree.STRtree;
+import org.locationtech.jts.noding.NodedSegmentString;
+import org.locationtech.jts.noding.SegmentString;
+
+/**
+ * "Snaps" all {@link SegmentString}s in a {@link SpatialIndex} containing
+ * {@link MonotoneChain}s to a given {@link HotPixel}.
+ *
+ * @version 1.7
+ */
+public class MCIndexPointSnapper
+{
+ //public static final int nSnaps = 0;
+
+ private STRtree index;
+
+ public MCIndexPointSnapper(SpatialIndex index) {
+ this.index = (STRtree) index;
+ }
+
+ /**
+ * Snaps (nodes) all interacting segments to this hot pixel.
+ * The hot pixel may represent a vertex of an edge,
+ * in which case this routine uses the optimization
+ * of not noding the vertex itself
+ *
+ * @param hotPixel the hot pixel to snap to
+ * @param parentEdge the edge containing the vertex, if applicable, or <code>null</code>
+ * @param hotPixelVertexIndex the index of the hotPixel vertex, if applicable, or -1
+ * @return <code>true</code> if a node was added for this pixel
+ */
+ public boolean snap(HotPixel hotPixel, SegmentString parentEdge, int hotPixelVertexIndex)
+ {
+ final Envelope pixelEnv = hotPixel.getSafeEnvelope();
+ final HotPixelSnapAction hotPixelSnapAction = new HotPixelSnapAction(hotPixel, parentEdge, hotPixelVertexIndex);
+
+ index.query(pixelEnv, new ItemVisitor() {
+ public void visitItem(Object item) {
+ MonotoneChain testChain = (MonotoneChain) item;
+ testChain.select(pixelEnv, hotPixelSnapAction);
+ }
+ }
+ );
+ return hotPixelSnapAction.isNodeAdded();
+ }
+
+ public boolean snap(HotPixel hotPixel)
+ {
+ return snap(hotPixel, null, -1);
+ }
+
+ public static class HotPixelSnapAction
+ extends MonotoneChainSelectAction
+ {
+ private HotPixel hotPixel;
+ private SegmentString parentEdge;
+ // is -1 if hotPixel is not a vertex
+ private int hotPixelVertexIndex;
+ private boolean isNodeAdded = false;
+
+ public HotPixelSnapAction(HotPixel hotPixel, SegmentString parentEdge, int hotPixelVertexIndex)
+ {
+ this.hotPixel = hotPixel;
+ this.parentEdge = parentEdge;
+ this.hotPixelVertexIndex = hotPixelVertexIndex;
+ }
+
+ public boolean isNodeAdded() { return isNodeAdded; }
+
+ public void select(MonotoneChain mc, int startIndex)
+ {
+ NodedSegmentString ss = (NodedSegmentString) mc.getContext();
+ /**
+ * Check to avoid snapping a hotPixel vertex to the same vertex.
+ * This method is called for segments which intersects the
+ * hot pixel,
+ * so need to check if either end of the segment is equal to the hot pixel
+ * and if so, do not snap.
+ *
+ * Sep 22 2012 - MD - currently do need to snap to every vertex,
+ * since otherwise the testCollapse1 test in SnapRoundingTest fails.
+ */
+ if (parentEdge != null) {
+ if (ss == parentEdge &&
+ (startIndex == hotPixelVertexIndex
+ ))
+ return;
+ }
+ isNodeAdded = hotPixel.addSnappedNode(ss, startIndex);
+ }
+
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/snapround/MCIndexSnapRounder.java b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/MCIndexSnapRounder.java
new file mode 100644
index 0000000..d91cdf3
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/MCIndexSnapRounder.java
@@ -0,0 +1,156 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding.snapround;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.noding.InteriorIntersectionFinderAdder;
+import org.locationtech.jts.noding.MCIndexNoder;
+import org.locationtech.jts.noding.NodedSegmentString;
+import org.locationtech.jts.noding.Noder;
+import org.locationtech.jts.noding.NodingValidator;
+import org.locationtech.jts.noding.SegmentString;
+
+/**
+ * Uses Snap Rounding to compute a rounded,
+ * fully noded arrangement from a set of {@link SegmentString}s.
+ * Implements the Snap Rounding technique described in
+ * papers by Hobby, Guibas & Marimont, and Goodrich et al.
+ * Snap Rounding assumes that all vertices lie on a uniform grid;
+ * hence the precision model of the input must be fixed precision,
+ * and all the input vertices must be rounded to that precision.
+ * <p>
+ * This implementation uses a monotone chains and a spatial index to
+ * speed up the intersection tests.
+ * <p>
+ * This implementation appears to be fully robust using an integer precision model.
+ * It will function with non-integer precision models, but the
+ * results are not 100% guaranteed to be correctly noded.
+ *
+ * @version 1.7
+ */
+public class MCIndexSnapRounder
+ implements Noder
+{
+ private final PrecisionModel pm;
+ private LineIntersector li;
+ private final double scaleFactor;
+ private MCIndexNoder noder;
+ private MCIndexPointSnapper pointSnapper;
+ private Collection nodedSegStrings;
+
+ public MCIndexSnapRounder(PrecisionModel pm) {
+ this.pm = pm;
+ li = new RobustLineIntersector();
+ li.setPrecisionModel(pm);
+ scaleFactor = pm.getScale();
+ }
+
+ public Collection getNodedSubstrings()
+ {
+ return NodedSegmentString.getNodedSubstrings(nodedSegStrings);
+ }
+
+ public void computeNodes(Collection inputSegmentStrings)
+ {
+ this.nodedSegStrings = inputSegmentStrings;
+ noder = new MCIndexNoder();
+ pointSnapper = new MCIndexPointSnapper(noder.getIndex());
+ snapRound(inputSegmentStrings, li);
+
+ // testing purposes only - remove in final version
+ //checkCorrectness(inputSegmentStrings);
+ }
+
+ private void checkCorrectness(Collection inputSegmentStrings)
+ {
+ Collection resultSegStrings = NodedSegmentString.getNodedSubstrings(inputSegmentStrings);
+ NodingValidator nv = new NodingValidator(resultSegStrings);
+ try {
+ nv.checkValid();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ private void snapRound(Collection segStrings, LineIntersector li)
+ {
+ List intersections = findInteriorIntersections(segStrings, li);
+ computeIntersectionSnaps(intersections);
+ computeVertexSnaps(segStrings);
+ }
+
+ /**
+ * Computes all interior intersections in the collection of {@link SegmentString}s,
+ * and returns their {@link Coordinate}s.
+ *
+ * Does NOT node the segStrings.
+ *
+ * @return a list of Coordinates for the intersections
+ */
+ private List findInteriorIntersections(Collection segStrings, LineIntersector li)
+ {
+ InteriorIntersectionFinderAdder intFinderAdder = new InteriorIntersectionFinderAdder(li);
+ noder.setSegmentIntersector(intFinderAdder);
+ noder.computeNodes(segStrings);
+ return intFinderAdder.getInteriorIntersections();
+ }
+
+ /**
+ * Snaps segments to nodes created by segment intersections.
+ */
+ private void computeIntersectionSnaps(Collection snapPts)
+ {
+ for (Iterator it = snapPts.iterator(); it.hasNext(); ) {
+ Coordinate snapPt = (Coordinate) it.next();
+ HotPixel hotPixel = new HotPixel(snapPt, scaleFactor, li);
+ pointSnapper.snap(hotPixel);
+ }
+ }
+
+ /**
+ * Snaps segments to all vertices.
+ *
+ * @param edges the list of segment strings to snap together
+ */
+ public void computeVertexSnaps(Collection edges)
+ {
+ for (Iterator i0 = edges.iterator(); i0.hasNext(); ) {
+ NodedSegmentString edge0 = (NodedSegmentString) i0.next();
+ computeVertexSnaps(edge0);
+ }
+ }
+
+ /**
+ * Snaps segments to the vertices of a Segment String.
+ */
+ private void computeVertexSnaps(NodedSegmentString e)
+ {
+ Coordinate[] pts0 = e.getCoordinates();
+ for (int i = 0; i < pts0.length ; i++) {
+ HotPixel hotPixel = new HotPixel(pts0[i], scaleFactor, li);
+ boolean isNodeAdded = pointSnapper.snap(hotPixel, e, i);
+ // if a node is created for a vertex, that vertex must be noded too
+ if (isNodeAdded) {
+ e.addIntersection(pts0[i], i);
+ }
+ }
+}
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/snapround/SimpleSnapRounder.java b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/SimpleSnapRounder.java
new file mode 100644
index 0000000..7fea869
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/SimpleSnapRounder.java
@@ -0,0 +1,185 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.noding.snapround;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.noding.InteriorIntersectionFinderAdder;
+import org.locationtech.jts.noding.MCIndexNoder;
+import org.locationtech.jts.noding.NodedSegmentString;
+import org.locationtech.jts.noding.Noder;
+import org.locationtech.jts.noding.NodingValidator;
+import org.locationtech.jts.noding.SegmentString;
+import org.locationtech.jts.noding.SinglePassNoder;
+
+/**
+ * Uses Snap Rounding to compute a rounded,
+ * fully noded arrangement from a set of {@link SegmentString}s.
+ * Implements the Snap Rounding technique described in
+ * the papers by Hobby, Guibas & Marimont, and Goodrich et al.
+ * Snap Rounding assumes that all vertices lie on a uniform grid;
+ * hence the precision model of the input must be fixed precision,
+ * and all the input vertices must be rounded to that precision.
+ * <p>
+ * This implementation uses simple iteration over the line segments.
+ * This is not the most efficient approach for large sets of segments.
+ * <p>
+ * This implementation appears to be fully robust using an integer precision model.
+ * It will function with non-integer precision models, but the
+ * results are not 100% guaranteed to be correctly noded.
+ *
+ * @version 1.7
+ */
+public class SimpleSnapRounder
+ implements Noder
+{
+ private final PrecisionModel pm;
+ private LineIntersector li;
+ private final double scaleFactor;
+ private Collection nodedSegStrings;
+
+ public SimpleSnapRounder(PrecisionModel pm) {
+ this.pm = pm;
+ li = new RobustLineIntersector();
+ li.setPrecisionModel(pm);
+ scaleFactor = pm.getScale();
+ }
+
+ /**
+ * @return a Collection of NodedSegmentStrings representing the substrings
+ *
+ */
+ public Collection getNodedSubstrings()
+ {
+ return NodedSegmentString.getNodedSubstrings(nodedSegStrings);
+ }
+
+ /**
+ * @param inputSegmentStrings a Collection of NodedSegmentStrings
+ */
+ public void computeNodes(Collection inputSegmentStrings)
+ {
+ this.nodedSegStrings = inputSegmentStrings;
+ snapRound(inputSegmentStrings, li);
+
+ // testing purposes only - remove in final version
+ //checkCorrectness(inputSegmentStrings);
+ }
+
+ private void checkCorrectness(Collection inputSegmentStrings)
+ {
+ Collection resultSegStrings = NodedSegmentString.getNodedSubstrings(inputSegmentStrings);
+ NodingValidator nv = new NodingValidator(resultSegStrings);
+ try {
+ nv.checkValid();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ private void snapRound(Collection segStrings, LineIntersector li)
+ {
+ List intersections = findInteriorIntersections(segStrings, li);
+ computeSnaps(segStrings, intersections);
+ computeVertexSnaps(segStrings);
+ }
+
+ /**
+ * Computes all interior intersections in the collection of {@link SegmentString}s,
+ * and returns their {@link Coordinate}s.
+ *
+ * Does NOT node the segStrings.
+ *
+ * @return a list of Coordinates for the intersections
+ */
+ private List findInteriorIntersections(Collection segStrings, LineIntersector li)
+ {
+ InteriorIntersectionFinderAdder intFinderAdder = new InteriorIntersectionFinderAdder(li);
+ SinglePassNoder noder = new MCIndexNoder();
+ noder.setSegmentIntersector(intFinderAdder);
+ noder.computeNodes(segStrings);
+ return intFinderAdder.getInteriorIntersections();
+ }
+
+
+ /**
+ * Computes nodes introduced as a result of snapping segments to snap points (hot pixels)
+ * @param li
+ */
+ private void computeSnaps(Collection segStrings, Collection snapPts)
+ {
+ for (Iterator i0 = segStrings.iterator(); i0.hasNext(); ) {
+ NodedSegmentString ss = (NodedSegmentString) i0.next();
+ computeSnaps(ss, snapPts);
+ }
+ }
+
+ private void computeSnaps(NodedSegmentString ss, Collection snapPts)
+ {
+ for (Iterator it = snapPts.iterator(); it.hasNext(); ) {
+ Coordinate snapPt = (Coordinate) it.next();
+ HotPixel hotPixel = new HotPixel(snapPt, scaleFactor, li);
+ for (int i = 0; i < ss.size() - 1; i++) {
+ hotPixel.addSnappedNode(ss, i);
+ }
+ }
+ }
+
+ /**
+ * Computes nodes introduced as a result of
+ * snapping segments to vertices of other segments
+ *
+ * @param edges the list of segment strings to snap together
+ */
+ public void computeVertexSnaps(Collection edges)
+ {
+ for (Iterator i0 = edges.iterator(); i0.hasNext(); ) {
+ NodedSegmentString edge0 = (NodedSegmentString) i0.next();
+ for (Iterator i1 = edges.iterator(); i1.hasNext(); ) {
+ NodedSegmentString edge1 = (NodedSegmentString) i1.next();
+ computeVertexSnaps(edge0, edge1);
+ }
+ }
+ }
+
+ /**
+ * Performs a brute-force comparison of every segment in each {@link SegmentString}.
+ * This has n^2 performance.
+ */
+ private void computeVertexSnaps(NodedSegmentString e0, NodedSegmentString e1)
+ {
+ Coordinate[] pts0 = e0.getCoordinates();
+ Coordinate[] pts1 = e1.getCoordinates();
+ for (int i0 = 0; i0 < pts0.length - 1; i0++) {
+ HotPixel hotPixel = new HotPixel(pts0[i0], scaleFactor, li);
+ for (int i1 = 0; i1 < pts1.length - 1; i1++) {
+ // don't snap a vertex to itself
+ if (e0 == e1) {
+ if (i0 == i1) continue;
+ }
+ //System.out.println("trying " + pts0[i0] + " against " + pts1[i1] + pts1[i1 + 1]);
+ boolean isNodeAdded = hotPixel.addSnappedNode(e1, i1);
+ // if a node is created for a vertex, that vertex must be noded too
+ if (isNodeAdded) {
+ e0.addIntersection(pts0[i0], i0);
+ }
+ }
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/noding/snapround/package.html b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/package.html
new file mode 100644
index 0000000..a25101d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/noding/snapround/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes to implement the Snap Rounding algorithm for noding linestrings.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/BoundaryOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/BoundaryOp.java
new file mode 100644
index 0000000..29a1409
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/BoundaryOp.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * Computes the boundary of a {@link Geometry}.
+ * Allows specifying the {@link BoundaryNodeRule} to be used.
+ * This operation will always return a {@link Geometry} of the appropriate
+ * dimension for the boundary (even if the input geometry is empty).
+ * The boundary of zero-dimensional geometries (Points) is
+ * always the empty {@link GeometryCollection}.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+
+public class BoundaryOp
+{
+ public static Geometry getBoundary(Geometry g)
+ {
+ BoundaryOp bop = new BoundaryOp(g);
+ return bop.getBoundary();
+ }
+
+ public static Geometry getBoundary(Geometry g, BoundaryNodeRule bnRule)
+ {
+ BoundaryOp bop = new BoundaryOp(g, bnRule);
+ return bop.getBoundary();
+ }
+
+ private Geometry geom;
+ private GeometryFactory geomFact;
+ private BoundaryNodeRule bnRule;
+
+ public BoundaryOp(Geometry geom)
+ {
+ this(geom, BoundaryNodeRule.MOD2_BOUNDARY_RULE);
+ }
+
+ public BoundaryOp(Geometry geom, BoundaryNodeRule bnRule)
+ {
+ this.geom = geom;
+ geomFact = geom.getFactory();
+ this.bnRule = bnRule;
+ }
+
+ public Geometry getBoundary()
+ {
+ if (geom instanceof LineString) return boundaryLineString((LineString) geom);
+ if (geom instanceof MultiLineString) return boundaryMultiLineString((MultiLineString) geom);
+ return geom.getBoundary();
+ }
+
+ private MultiPoint getEmptyMultiPoint()
+ {
+ return geomFact.createMultiPoint();
+ }
+
+ private Geometry boundaryMultiLineString(MultiLineString mLine)
+ {
+ if (geom.isEmpty()) {
+ return getEmptyMultiPoint();
+ }
+
+ Coordinate[] bdyPts = computeBoundaryCoordinates(mLine);
+
+ // return Point or MultiPoint
+ if (bdyPts.length == 1) {
+ return geomFact.createPoint(bdyPts[0]);
+ }
+ // this handles 0 points case as well
+ return geomFact.createMultiPointFromCoords(bdyPts);
+ }
+
+/*
+// MD - superseded
+ private Coordinate[] computeBoundaryFromGeometryGraph(MultiLineString mLine)
+ {
+ GeometryGraph g = new GeometryGraph(0, mLine, bnRule);
+ Coordinate[] bdyPts = g.getBoundaryPoints();
+ return bdyPts;
+ }
+*/
+
+ private Map endpointMap;
+
+ private Coordinate[] computeBoundaryCoordinates(MultiLineString mLine)
+ {
+ List bdyPts = new ArrayList();
+ endpointMap = new TreeMap();
+ for (int i = 0; i < mLine.getNumGeometries(); i++) {
+ LineString line = (LineString) mLine.getGeometryN(i);
+ if (line.getNumPoints() == 0)
+ continue;
+ addEndpoint(line.getCoordinateN(0));
+ addEndpoint(line.getCoordinateN(line.getNumPoints() - 1));
+ }
+
+ for (Iterator it = endpointMap.entrySet().iterator(); it.hasNext(); ) {
+ Map.Entry entry = (Map.Entry) it.next();
+ Counter counter = (Counter) entry.getValue();
+ int valence = counter.count;
+ if (bnRule.isInBoundary(valence)) {
+ bdyPts.add(entry.getKey());
+ }
+ }
+
+ return CoordinateArrays.toCoordinateArray(bdyPts);
+ }
+
+ private void addEndpoint(Coordinate pt)
+ {
+ Counter counter = (Counter) endpointMap.get(pt);
+ if (counter == null) {
+ counter = new Counter();
+ endpointMap.put(pt, counter);
+ }
+ counter.count++;
+ }
+
+ private Geometry boundaryLineString(LineString line)
+ {
+ if (geom.isEmpty()) {
+ return getEmptyMultiPoint();
+ }
+
+ if (line.isClosed()) {
+ // check whether endpoints of valence 2 are on the boundary or not
+ boolean closedEndpointOnBoundary = bnRule.isInBoundary(2);
+ if (closedEndpointOnBoundary) {
+ return line.getStartPoint();
+ }
+ else {
+ return geomFact.createMultiPoint();
+ }
+ }
+ return geomFact.createMultiPoint(new Point[]{
+ line.getStartPoint(),
+ line.getEndPoint()
+ });
+ }
+}
+
+/**
+ * Stores an integer count, for use as a Map entry.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+class Counter
+{
+ /**
+ * The value of the count
+ */
+ int count;
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/GeometryGraphOperation.java b/modules/core/src/main/java/org/locationtech/jts/operation/GeometryGraphOperation.java
new file mode 100644
index 0000000..3f1a028
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/GeometryGraphOperation.java
@@ -0,0 +1,73 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+
+/**
+ * The base class for operations that require {@link GeometryGraph}s.
+ *
+ * @version 1.7
+ */
+public class GeometryGraphOperation
+{
+ protected final LineIntersector li = new RobustLineIntersector();
+ protected PrecisionModel resultPrecisionModel;
+
+ /**
+ * The operation args into an array so they can be accessed by index
+ */
+ protected GeometryGraph[] arg; // the arg(s) of the operation
+
+ public GeometryGraphOperation(Geometry g0, Geometry g1)
+ {
+ this(g0, g1,
+ BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE
+// BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE
+ );
+ }
+
+ public GeometryGraphOperation(Geometry g0, Geometry g1, BoundaryNodeRule boundaryNodeRule)
+ {
+ // use the most precise model for the result
+ if (g0.getPrecisionModel().compareTo(g1.getPrecisionModel()) >= 0)
+ setComputationPrecision(g0.getPrecisionModel());
+ else
+ setComputationPrecision(g1.getPrecisionModel());
+
+ arg = new GeometryGraph[2];
+ arg[0] = new GeometryGraph(0, g0, boundaryNodeRule);
+ arg[1] = new GeometryGraph(1, g1, boundaryNodeRule);
+ }
+
+ public GeometryGraphOperation(Geometry g0) {
+ setComputationPrecision(g0.getPrecisionModel());
+
+ arg = new GeometryGraph[1];
+ arg[0] = new GeometryGraph(0, g0);;
+ }
+
+ public Geometry getArgGeometry(int i) { return arg[i].getGeometry(); }
+
+ protected void setComputationPrecision(PrecisionModel pm)
+ {
+ resultPrecisionModel = pm;
+ li.setPrecisionModel(resultPrecisionModel);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/IsSimpleOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/IsSimpleOp.java
new file mode 100644
index 0000000..7be4b02
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/IsSimpleOp.java
@@ -0,0 +1,345 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Lineal;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeIntersection;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.geomgraph.index.SegmentIntersector;
+
+/**
+ * Tests whether a <code>Geometry</code> is simple.
+ * In general, the SFS specification of simplicity
+ * follows the rule:
+ * <ul>
+ * <li> A Geometry is simple if and only if the only self-intersections are at
+ * boundary points.
+ * </ul>
+ * <p>
+ * Simplicity is defined for each {@link Geometry} type as follows:
+ * <ul>
+ * <li><b>Polygonal</b> geometries are simple by definition, so
+ * <code>isSimple</code> trivially returns true.
+ * (Note: this means that <tt>isSimple</tt> cannot be used to test
+ * for (invalid) self-intersections in <tt>Polygon</tt>s.
+ * In order to check if a <tt>Polygonal</tt> geometry has self-intersections,
+ * use {@link Geometry#isValid()}).
+ * <li><b>Linear</b> geometries are simple iff they do <i>not</i> self-intersect at interior points
+ * (i.e. points other than boundary points).
+ * This is equivalent to saying that no two linear components satisfy the SFS {@link Geometry#touches(Geometry)}
+ * predicate.
+ * <li><b>Zero-dimensional (point)</b> geometries are simple if and only if they have no
+ * repeated points.
+ * <li><b>Empty</b> geometries are <i>always</i> simple, by definition
+ * </ul>
+ * For {@link Lineal} geometries the evaluation of simplicity
+ * can be customized by supplying a {@link BoundaryNodeRule}
+ * to define how boundary points are determined.
+ * The default is the SFS-standard {@link BoundaryNodeRule#MOD2_BOUNDARY_RULE}.
+ * Note that under the <tt>Mod-2</tt> rule, closed <tt>LineString</tt>s (rings)
+ * will never satisfy the <tt>touches</tt> predicate at their endpoints, since these are
+ * interior points, not boundary points.
+ * If it is required to test whether a set of <code>LineString</code>s touch
+ * only at their endpoints, use <code>IsSimpleOp</code> with {@link BoundaryNodeRule#ENDPOINT_BOUNDARY_RULE}.
+ * For example, this can be used to validate that a set of lines form a topologically valid
+ * linear network.
+ *
+ * @see BoundaryNodeRule
+ *
+ * @version 1.7
+ */
+public class IsSimpleOp
+{
+ private Geometry inputGeom;
+ private boolean isClosedEndpointsInInterior = true;
+ private Coordinate nonSimpleLocation = null;
+
+ /**
+ * Creates a simplicity checker using the default SFS Mod-2 Boundary Node Rule
+ *
+ * @deprecated use IsSimpleOp(Geometry)
+ */
+ public IsSimpleOp() {
+ }
+
+ /**
+ * Creates a simplicity checker using the default SFS Mod-2 Boundary Node Rule
+ *
+ * @param geom the geometry to test
+ */
+ public IsSimpleOp(Geometry geom) {
+ this.inputGeom = geom;
+ }
+
+ /**
+ * Creates a simplicity checker using a given {@link BoundaryNodeRule}
+ *
+ * @param geom the geometry to test
+ * @param boundaryNodeRule the rule to use.
+ */
+ public IsSimpleOp(Geometry geom, BoundaryNodeRule boundaryNodeRule)
+ {
+ this.inputGeom = geom;
+ isClosedEndpointsInInterior = ! boundaryNodeRule.isInBoundary(2);
+ }
+
+ /**
+ * Tests whether the geometry is simple.
+ *
+ * @return true if the geometry is simple
+ */
+ public boolean isSimple()
+ {
+ nonSimpleLocation = null;
+ return computeSimple(inputGeom);
+ }
+
+ private boolean computeSimple(Geometry geom)
+ {
+ nonSimpleLocation = null;
+ if (geom.isEmpty()) return true;
+ if (geom instanceof LineString) return isSimpleLinearGeometry(geom);
+ if (geom instanceof MultiLineString) return isSimpleLinearGeometry(geom);
+ if (geom instanceof MultiPoint) return isSimpleMultiPoint((MultiPoint) geom);
+ if (geom instanceof Polygonal) return isSimplePolygonal(geom);
+ if (geom instanceof GeometryCollection) return isSimpleGeometryCollection(geom);
+ // all other geometry types are simple by definition
+ return true;
+ }
+
+ /**
+ * Gets a coordinate for the location where the geometry
+ * fails to be simple.
+ * (i.e. where it has a non-boundary self-intersection).
+ * {@link #isSimple} must be called before this method is called.
+ *
+ * @return a coordinate for the location of the non-boundary self-intersection
+ * or null if the geometry is simple
+ */
+ public Coordinate getNonSimpleLocation()
+ {
+ return nonSimpleLocation;
+ }
+
+ /**
+ * Reports whether a {@link LineString} is simple.
+ *
+ * @param geom the lineal geometry to test
+ * @return true if the geometry is simple
+ * @deprecated use isSimple()
+ */
+ public boolean isSimple(LineString geom)
+ {
+ return isSimpleLinearGeometry(geom);
+ }
+
+ /**
+ * Reports whether a {@link MultiLineString} geometry is simple.
+ *
+ * @param geom the lineal geometry to test
+ * @return true if the geometry is simple
+ * @deprecated use isSimple()
+ */
+ public boolean isSimple(MultiLineString geom)
+ {
+ return isSimpleLinearGeometry(geom);
+ }
+
+ /**
+ * A MultiPoint is simple iff it has no repeated points
+ * @deprecated use isSimple()
+ */
+ public boolean isSimple(MultiPoint mp)
+ {
+ return isSimpleMultiPoint(mp);
+ }
+
+ private boolean isSimpleMultiPoint(MultiPoint mp)
+ {
+ if (mp.isEmpty()) return true;
+ Set points = new TreeSet();
+ for (int i = 0; i < mp.getNumGeometries(); i++) {
+ Point pt = (Point) mp.getGeometryN(i);
+ Coordinate p = pt.getCoordinate();
+ if (points.contains(p)) {
+ nonSimpleLocation = p;
+ return false;
+ }
+ points.add(p);
+ }
+ return true;
+ }
+
+ /**
+ * Computes simplicity for polygonal geometries.
+ * Polygonal geometries are simple if and only if
+ * all of their component rings are simple.
+ *
+ * @param geom a Polygonal geometry
+ * @return true if the geometry is simple
+ */
+ private boolean isSimplePolygonal(Geometry geom)
+ {
+ List rings = LinearComponentExtracter.getLines(geom);
+ for (Iterator i = rings.iterator(); i.hasNext(); ) {
+ LinearRing ring = (LinearRing) i.next();
+ if (! isSimpleLinearGeometry(ring))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Semantics for GeometryCollection is
+ * simple iff all components are simple.
+ *
+ * @param geom
+ * @return true if the geometry is simple
+ */
+ private boolean isSimpleGeometryCollection(Geometry geom)
+ {
+ for (int i = 0; i < geom.getNumGeometries(); i++ ) {
+ Geometry comp = geom.getGeometryN(i);
+ if (! computeSimple(comp))
+ return false;
+ }
+ return true;
+ }
+
+ private boolean isSimpleLinearGeometry(Geometry geom)
+ {
+ if (geom.isEmpty()) return true;
+ GeometryGraph graph = new GeometryGraph(0, geom);
+ LineIntersector li = new RobustLineIntersector();
+ SegmentIntersector si = graph.computeSelfNodes(li, true);
+ // if no self-intersection, must be simple
+ if (! si.hasIntersection()) return true;
+ if (si.hasProperIntersection()) {
+ nonSimpleLocation = si.getProperIntersectionPoint();
+ return false;
+ }
+ if (hasNonEndpointIntersection(graph)) return false;
+ if (isClosedEndpointsInInterior) {
+ if (hasClosedEndpointIntersection(graph)) return false;
+ }
+ return true;
+ }
+
+ /**
+ * For all edges, check if there are any intersections which are NOT at an endpoint.
+ * The Geometry is not simple if there are intersections not at endpoints.
+ */
+ private boolean hasNonEndpointIntersection(GeometryGraph graph)
+ {
+ for (Iterator i = graph.getEdgeIterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ int maxSegmentIndex = e.getMaximumSegmentIndex();
+ for (Iterator eiIt = e.getEdgeIntersectionList().iterator(); eiIt.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) eiIt.next();
+ if (! ei.isEndPoint(maxSegmentIndex)) {
+ nonSimpleLocation = ei.getCoordinate();
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private static class EndpointInfo {
+ Coordinate pt;
+ boolean isClosed;
+ int degree;
+
+ public EndpointInfo(Coordinate pt)
+ {
+ this.pt = pt;
+ isClosed = false;
+ degree = 0;
+ }
+
+ public Coordinate getCoordinate() { return pt; }
+
+ public void addEndpoint(boolean isClosed)
+ {
+ degree++;
+ this.isClosed |= isClosed;
+ }
+ }
+
+ /**
+ * Tests that no edge intersection is the endpoint of a closed line.
+ * This ensures that closed lines are not touched at their endpoint,
+ * which is an interior point according to the Mod-2 rule
+ * To check this we compute the degree of each endpoint.
+ * The degree of endpoints of closed lines
+ * must be exactly 2.
+ */
+ private boolean hasClosedEndpointIntersection(GeometryGraph graph)
+ {
+ Map endPoints = new TreeMap();
+ for (Iterator i = graph.getEdgeIterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ int maxSegmentIndex = e.getMaximumSegmentIndex();
+ boolean isClosed = e.isClosed();
+ Coordinate p0 = e.getCoordinate(0);
+ addEndpoint(endPoints, p0, isClosed);
+ Coordinate p1 = e.getCoordinate(e.getNumPoints() - 1);
+ addEndpoint(endPoints, p1, isClosed);
+ }
+
+ for (Iterator i = endPoints.values().iterator(); i.hasNext(); ) {
+ EndpointInfo eiInfo = (EndpointInfo) i.next();
+ if (eiInfo.isClosed && eiInfo.degree != 2) {
+ nonSimpleLocation = eiInfo.getCoordinate();
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Add an endpoint to the map, creating an entry for it if none exists
+ */
+ private void addEndpoint(Map endPoints, Coordinate p, boolean isClosed)
+ {
+ EndpointInfo eiInfo = (EndpointInfo) endPoints.get(p);
+ if (eiInfo == null) {
+ eiInfo = new EndpointInfo(p);
+ endPoints.put(p, eiInfo);
+ }
+ eiInfo.addEndpoint(isClosed);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferBuilder.java
new file mode 100644
index 0000000..52c29b2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferBuilder.java
@@ -0,0 +1,325 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+/**
+ * @version 1.7
+ */
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeList;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.PlanarGraph;
+import org.locationtech.jts.geomgraph.Position;
+import org.locationtech.jts.noding.IntersectionAdder;
+import org.locationtech.jts.noding.MCIndexNoder;
+import org.locationtech.jts.noding.Noder;
+import org.locationtech.jts.noding.SegmentString;
+import org.locationtech.jts.operation.overlay.OverlayNodeFactory;
+import org.locationtech.jts.operation.overlay.PolygonBuilder;
+
+
+
+/**
+ * Builds the buffer geometry for a given input geometry and precision model.
+ * Allows setting the level of approximation for circular arcs,
+ * and the precision model in which to carry out the computation.
+ * <p>
+ * When computing buffers in floating point double-precision
+ * it can happen that the process of iterated noding can fail to converge (terminate).
+ * In this case a {@link TopologyException} will be thrown.
+ * Retrying the computation in a fixed precision
+ * can produce more robust results.
+ *
+ * @version 1.7
+ */
+class BufferBuilder
+{
+ /**
+ * Compute the change in depth as an edge is crossed from R to L
+ */
+ private static int depthDelta(Label label)
+ {
+ int lLoc = label.getLocation(0, Position.LEFT);
+ int rLoc = label.getLocation(0, Position.RIGHT);
+ if (lLoc == Location.INTERIOR && rLoc == Location.EXTERIOR)
+ return 1;
+ else if (lLoc == Location.EXTERIOR && rLoc == Location.INTERIOR)
+ return -1;
+ return 0;
+ }
+
+ private BufferParameters bufParams;
+
+ private PrecisionModel workingPrecisionModel;
+ private Noder workingNoder;
+ private GeometryFactory geomFact;
+ private PlanarGraph graph;
+ private EdgeList edgeList = new EdgeList();
+
+ /**
+ * Creates a new BufferBuilder
+ */
+ public BufferBuilder(BufferParameters bufParams)
+ {
+ this.bufParams = bufParams;
+ }
+
+ /**
+ * Sets the precision model to use during the curve computation and noding,
+ * if it is different to the precision model of the Geometry.
+ * If the precision model is less than the precision of the Geometry precision model,
+ * the Geometry must have previously been rounded to that precision.
+ *
+ * @param pm the precision model to use
+ */
+ public void setWorkingPrecisionModel(PrecisionModel pm)
+ {
+ workingPrecisionModel = pm;
+ }
+
+ /**
+ * Sets the {@link Noder} to use during noding.
+ * This allows choosing fast but non-robust noding, or slower
+ * but robust noding.
+ *
+ * @param noder the noder to use
+ */
+ public void setNoder(Noder noder) { workingNoder = noder; }
+
+
+ public Geometry buffer(Geometry g, double distance)
+ {
+ PrecisionModel precisionModel = workingPrecisionModel;
+ if (precisionModel == null)
+ precisionModel = g.getPrecisionModel();
+
+ // factory must be the same as the one used by the input
+ geomFact = g.getFactory();
+
+ OffsetCurveBuilder curveBuilder = new OffsetCurveBuilder(precisionModel, bufParams);
+
+ OffsetCurveSetBuilder curveSetBuilder = new OffsetCurveSetBuilder(g, distance, curveBuilder);
+
+ List bufferSegStrList = curveSetBuilder.getCurves();
+
+ // short-circuit test
+ if (bufferSegStrList.size() <= 0) {
+ return createEmptyResultGeometry();
+ }
+
+//BufferDebug.runCount++;
+//String filename = "run" + BufferDebug.runCount + "_curves";
+//System.out.println("saving " + filename);
+//BufferDebug.saveEdges(bufferEdgeList, filename);
+// DEBUGGING ONLY
+//WKTWriter wktWriter = new WKTWriter();
+//Debug.println("Rings: " + wktWriter.write(convertSegStrings(bufferSegStrList.iterator())));
+//wktWriter.setMaxCoordinatesPerLine(10);
+//System.out.println(wktWriter.writeFormatted(convertSegStrings(bufferSegStrList.iterator())));
+
+ computeNodedEdges(bufferSegStrList, precisionModel);
+ graph = new PlanarGraph(new OverlayNodeFactory());
+ graph.addEdges(edgeList.getEdges());
+
+ List subgraphList = createSubgraphs(graph);
+ PolygonBuilder polyBuilder = new PolygonBuilder(geomFact);
+ buildSubgraphs(subgraphList, polyBuilder);
+ List resultPolyList = polyBuilder.getPolygons();
+
+ // just in case...
+ if (resultPolyList.size() <= 0) {
+ return createEmptyResultGeometry();
+ }
+
+ Geometry resultGeom = geomFact.buildGeometry(resultPolyList);
+ return resultGeom;
+ }
+
+ private Noder getNoder(PrecisionModel precisionModel)
+ {
+ if (workingNoder != null) return workingNoder;
+
+ // otherwise use a fast (but non-robust) noder
+ MCIndexNoder noder = new MCIndexNoder();
+ LineIntersector li = new RobustLineIntersector();
+ li.setPrecisionModel(precisionModel);
+ noder.setSegmentIntersector(new IntersectionAdder(li));
+// Noder noder = new IteratedNoder(precisionModel);
+ return noder;
+// Noder noder = new SimpleSnapRounder(precisionModel);
+// Noder noder = new MCIndexSnapRounder(precisionModel);
+// Noder noder = new ScaledNoder(new MCIndexSnapRounder(new PrecisionModel(1.0)),
+// precisionModel.getScale());
+ }
+
+ private void computeNodedEdges(List bufferSegStrList, PrecisionModel precisionModel)
+ {
+ Noder noder = getNoder(precisionModel);
+ noder.computeNodes(bufferSegStrList);
+ Collection nodedSegStrings = noder.getNodedSubstrings();
+// DEBUGGING ONLY
+//BufferDebug.saveEdges(nodedEdges, "run" + BufferDebug.runCount + "_nodedEdges");
+
+ for (Iterator i = nodedSegStrings.iterator(); i.hasNext(); ) {
+ SegmentString segStr = (SegmentString) i.next();
+
+ /**
+ * Discard edges which have zero length,
+ * since they carry no information and cause problems with topology building
+ */
+ Coordinate[] pts = segStr.getCoordinates();
+ if (pts.length == 2 && pts[0].equals2D(pts[1]))
+ continue;
+
+ Label oldLabel = (Label) segStr.getData();
+ Edge edge = new Edge(segStr.getCoordinates(), new Label(oldLabel));
+ insertUniqueEdge(edge);
+ }
+ //saveEdges(edgeList.getEdges(), "run" + runCount + "_collapsedEdges");
+ }
+
+
+ /**
+ * Inserted edges are checked to see if an identical edge already exists.
+ * If so, the edge is not inserted, but its label is merged
+ * with the existing edge.
+ */
+ protected void insertUniqueEdge(Edge e)
+ {
+//<FIX> MD 8 Oct 03 speed up identical edge lookup
+ // fast lookup
+ Edge existingEdge = edgeList.findEqualEdge(e);
+
+ // If an identical edge already exists, simply update its label
+ if (existingEdge != null) {
+ Label existingLabel = existingEdge.getLabel();
+
+ Label labelToMerge = e.getLabel();
+ // check if new edge is in reverse direction to existing edge
+ // if so, must flip the label before merging it
+ if (! existingEdge.isPointwiseEqual(e)) {
+ labelToMerge = new Label(e.getLabel());
+ labelToMerge.flip();
+ }
+ existingLabel.merge(labelToMerge);
+
+ // compute new depth delta of sum of edges
+ int mergeDelta = depthDelta(labelToMerge);
+ int existingDelta = existingEdge.getDepthDelta();
+ int newDelta = existingDelta + mergeDelta;
+ existingEdge.setDepthDelta(newDelta);
+ }
+ else { // no matching existing edge was found
+ // add this new edge to the list of edges in this graph
+ //e.setName(name + edges.size());
+ edgeList.add(e);
+ e.setDepthDelta(depthDelta(e.getLabel()));
+ }
+ }
+
+ private List createSubgraphs(PlanarGraph graph)
+ {
+ List subgraphList = new ArrayList();
+ for (Iterator i = graph.getNodes().iterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ if (! node.isVisited()) {
+ BufferSubgraph subgraph = new BufferSubgraph();
+ subgraph.create(node);
+ subgraphList.add(subgraph);
+ }
+ }
+ /**
+ * Sort the subgraphs in descending order of their rightmost coordinate.
+ * This ensures that when the Polygons for the subgraphs are built,
+ * subgraphs for shells will have been built before the subgraphs for
+ * any holes they contain.
+ */
+ Collections.sort(subgraphList, Collections.reverseOrder());
+ return subgraphList;
+ }
+
+ /**
+ * Completes the building of the input subgraphs by depth-labelling them,
+ * and adds them to the PolygonBuilder.
+ * The subgraph list must be sorted in rightmost-coordinate order.
+ *
+ * @param subgraphList the subgraphs to build
+ * @param polyBuilder the PolygonBuilder which will build the final polygons
+ */
+ private void buildSubgraphs(List subgraphList, PolygonBuilder polyBuilder)
+ {
+ List processedGraphs = new ArrayList();
+ for (Iterator i = subgraphList.iterator(); i.hasNext(); ) {
+ BufferSubgraph subgraph = (BufferSubgraph) i.next();
+ Coordinate p = subgraph.getRightmostCoordinate();
+// int outsideDepth = 0;
+// if (polyBuilder.containsPoint(p))
+// outsideDepth = 1;
+ SubgraphDepthLocater locater = new SubgraphDepthLocater(processedGraphs);
+ int outsideDepth = locater.getDepth(p);
+// try {
+ subgraph.computeDepth(outsideDepth);
+// }
+// catch (RuntimeException ex) {
+// // debugging only
+// //subgraph.saveDirEdges();
+// throw ex;
+// }
+ subgraph.findResultEdges();
+ processedGraphs.add(subgraph);
+ polyBuilder.add(subgraph.getDirectedEdges(), subgraph.getNodes());
+ }
+ }
+
+ private static Geometry convertSegStrings(Iterator it)
+ {
+ GeometryFactory fact = new GeometryFactory();
+ List lines = new ArrayList();
+ while (it.hasNext()) {
+ SegmentString ss = (SegmentString) it.next();
+ LineString line = fact.createLineString(ss.getCoordinates());
+ lines.add(line);
+ }
+ return fact.buildGeometry(lines);
+ }
+
+ /**
+ * Gets the standard result for an empty buffer.
+ * Since buffer always returns a polygonal result,
+ * this is chosen to be an empty polygon.
+ *
+ * @return the empty result geometry
+ */
+ private Geometry createEmptyResultGeometry()
+ {
+ Geometry emptyGeom = geomFact.createPolygon();
+ return emptyGeom;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferInputLineSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferInputLineSimplifier.java
new file mode 100644
index 0000000..02392ef
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferInputLineSimplifier.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+
+/**
+ * Simplifies a buffer input line to
+ * remove concavities with shallow depth.
+ * <p>
+ * The most important benefit of doing this
+ * is to reduce the number of points and the complexity of
+ * shape which will be buffered.
+ * It also reduces the risk of gores created by
+ * the quantized fillet arcs (although this issue
+ * should be eliminated in any case by the
+ * offset curve generation logic).
+ * <p>
+ * A key aspect of the simplification is that it
+ * affects inside (concave or inward) corners only.
+ * Convex (outward) corners are preserved, since they
+ * are required to ensure that the generated buffer curve
+ * lies at the correct distance from the input geometry.
+ * <p>
+ * Another important heuristic used is that the end segments
+ * of the input are never simplified. This ensures that
+ * the client buffer code is able to generate end caps faithfully.
+ * <p>
+ * No attempt is made to avoid self-intersections in the output.
+ * This is acceptable for use for generating a buffer offset curve,
+ * since the buffer algorithm is insensitive to invalid polygonal
+ * geometry. However,
+ * this means that this algorithm
+ * cannot be used as a general-purpose polygon simplification technique.
+ *
+ * @author Martin Davis
+ *
+ */
+public class BufferInputLineSimplifier
+{
+ /**
+ * Simplify the input coordinate list.
+ * If the distance tolerance is positive,
+ * concavities on the LEFT side of the line are simplified.
+ * If the supplied distance tolerance is negative,
+ * concavities on the RIGHT side of the line are simplified.
+ *
+ * @param inputLine the coordinate list to simplify
+ * @param distanceTol simplification distance tolerance to use
+ * @return the simplified coordinate list
+ */
+ public static Coordinate[] simplify(Coordinate[] inputLine, double distanceTol)
+ {
+ BufferInputLineSimplifier simp = new BufferInputLineSimplifier(inputLine);
+ return simp.simplify(distanceTol);
+ }
+
+ private static final int INIT = 0;
+ private static final int DELETE = 1;
+ private static final int KEEP = 1;
+
+
+ private Coordinate[] inputLine;
+ private double distanceTol;
+ private byte[] isDeleted;
+ private int angleOrientation = Orientation.COUNTERCLOCKWISE;
+
+ public BufferInputLineSimplifier(Coordinate[] inputLine) {
+ this.inputLine = inputLine;
+ }
+
+ /**
+ * Simplify the input coordinate list.
+ * If the distance tolerance is positive,
+ * concavities on the LEFT side of the line are simplified.
+ * If the supplied distance tolerance is negative,
+ * concavities on the RIGHT side of the line are simplified.
+ *
+ * @param distanceTol simplification distance tolerance to use
+ * @return the simplified coordinate list
+ */
+ public Coordinate[] simplify(double distanceTol)
+ {
+ this.distanceTol = Math.abs(distanceTol);
+ if (distanceTol < 0)
+ angleOrientation = Orientation.CLOCKWISE;
+
+ // rely on fact that boolean array is filled with false value
+ isDeleted = new byte[inputLine.length];
+
+ boolean isChanged = false;
+ do {
+ isChanged = deleteShallowConcavities();
+ } while (isChanged);
+
+ return collapseLine();
+ }
+
+ /**
+ * Uses a sliding window containing 3 vertices to detect shallow angles
+ * in which the middle vertex can be deleted, since it does not
+ * affect the shape of the resulting buffer in a significant way.
+ * @return
+ */
+ private boolean deleteShallowConcavities()
+ {
+ /**
+ * Do not simplify end line segments of the line string.
+ * This ensures that end caps are generated consistently.
+ */
+ int index = 1;
+ int maxIndex = inputLine.length - 1;
+
+ int midIndex = findNextNonDeletedIndex(index);
+ int lastIndex = findNextNonDeletedIndex(midIndex);
+
+ boolean isChanged = false;
+ while (lastIndex < inputLine.length) {
+ // test triple for shallow concavity
+ boolean isMiddleVertexDeleted = false;
+ if (isDeletable(index, midIndex, lastIndex,
+ distanceTol)) {
+ isDeleted[midIndex] = DELETE;
+ isMiddleVertexDeleted = true;
+ isChanged = true;
+ }
+ // move simplification window forward
+ if (isMiddleVertexDeleted)
+ index = lastIndex;
+ else
+ index = midIndex;
+
+ midIndex = findNextNonDeletedIndex(index);
+ lastIndex = findNextNonDeletedIndex(midIndex);
+ }
+ return isChanged;
+ }
+
+ /**
+ * Finds the next non-deleted index, or the end of the point array if none
+ * @param index
+ * @return the next non-deleted index, if any
+ * or inputLine.length if there are no more non-deleted indices
+ */
+ private int findNextNonDeletedIndex(int index)
+ {
+ int next = index + 1;
+ while (next < inputLine.length && isDeleted[next] == DELETE)
+ next++;
+ return next;
+ }
+
+ private Coordinate[] collapseLine()
+ {
+ CoordinateList coordList = new CoordinateList();
+ for (int i = 0; i < inputLine.length; i++) {
+ if (isDeleted[i] != DELETE)
+ coordList.add(inputLine[i]);
+ }
+// if (coordList.size() < inputLine.length) System.out.println("Simplified " + (inputLine.length - coordList.size()) + " pts");
+ return coordList.toCoordinateArray();
+ }
+
+ private boolean isDeletable(int i0, int i1, int i2, double distanceTol)
+ {
+ Coordinate p0 = inputLine[i0];
+ Coordinate p1 = inputLine[i1];
+ Coordinate p2 = inputLine[i2];
+
+ if (! isConcave(p0, p1, p2)) return false;
+ if (! isShallow(p0, p1, p2, distanceTol)) return false;
+
+ // MD - don't use this heuristic - it's too restricting
+// if (p0.distance(p2) > distanceTol) return false;
+
+ return isShallowSampled(p0, p1, i0, i2, distanceTol);
+ }
+
+ private boolean isShallowConcavity(Coordinate p0, Coordinate p1, Coordinate p2, double distanceTol)
+ {
+ int orientation = Orientation.index(p0, p1, p2);
+ boolean isAngleToSimplify = (orientation == angleOrientation);
+ if (! isAngleToSimplify)
+ return false;
+
+ double dist = Distance.pointToSegment(p1, p0, p2);
+ return dist < distanceTol;
+ }
+
+ private static final int NUM_PTS_TO_CHECK = 10;
+
+ /**
+ * Checks for shallowness over a sample of points in the given section.
+ * This helps prevents the simplification from incrementally
+ * "skipping" over points which are in fact non-shallow.
+ *
+ * @param p0 start coordinate of section
+ * @param p2 end coordinate of section
+ * @param i0 start index of section
+ * @param i2 end index of section
+ * @param distanceTol distance tolerance
+ * @return
+ */
+ private boolean isShallowSampled(Coordinate p0, Coordinate p2, int i0, int i2, double distanceTol)
+ {
+ // check every n'th point to see if it is within tolerance
+ int inc = (i2 - i0) / NUM_PTS_TO_CHECK;
+ if (inc <= 0) inc = 1;
+
+ for (int i = i0; i < i2; i += inc) {
+ if (! isShallow(p0, p2, inputLine[i], distanceTol)) return false;
+ }
+ return true;
+ }
+
+ private boolean isShallow(Coordinate p0, Coordinate p1, Coordinate p2, double distanceTol)
+ {
+ double dist = Distance.pointToSegment(p1, p0, p2);
+ return dist < distanceTol;
+ }
+
+
+ private boolean isConcave(Coordinate p0, Coordinate p1, Coordinate p2)
+ {
+ int orientation = Orientation.index(p0, p1, p2);
+ boolean isConcave = (orientation == angleOrientation);
+ return isConcave;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferOp.java
new file mode 100644
index 0000000..8effa6a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferOp.java
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+/**
+ * @version 1.7
+ */
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.math.MathUtil;
+import org.locationtech.jts.noding.Noder;
+import org.locationtech.jts.noding.ScaledNoder;
+import org.locationtech.jts.noding.snapround.MCIndexSnapRounder;
+
+//import debug.*;
+
+/**
+ * Computes the buffer of a geometry, for both positive and negative buffer distances.
+ * <p>
+ * In GIS, the positive (or negative) buffer of a geometry is defined as
+ * the Minkowski sum (or difference) of the geometry
+ * with a circle of radius equal to the absolute value of the buffer distance.
+ * In the CAD/CAM world buffers are known as <i>offset curves</i>.
+ * In morphological analysis the
+ * operation of positive and negative buffering
+ * is referred to as <i>erosion</i> and <i>dilation</i>
+ * <p>
+ * The buffer operation always returns a polygonal result.
+ * The negative or zero-distance buffer of lines and points is always an empty {@link Polygon}.
+ * <p>
+ * Since true buffer curves may contain circular arcs,
+ * computed buffer polygons are only approximations to the true geometry.
+ * The user can control the accuracy of the approximation by specifying
+ * the number of linear segments used to approximate arcs.
+ * This is specified via {@link BufferParameters#setQuadrantSegments(int)} or {@link #setQuadrantSegments(int)}.
+ * <p>
+ * The <b>end cap style</b> of a linear buffer may be {@link BufferParameters#setEndCapStyle(int) specified}. The
+ * following end cap styles are supported:
+ * <ul>
+ * <li>{@link BufferParameters#CAP_ROUND} - the usual round end caps
+ * <li>{@link BufferParameters#CAP_FLAT} - end caps are truncated flat at the line ends
+ * <li>{@link BufferParameters#CAP_SQUARE} - end caps are squared off at the buffer distance beyond the line ends
+ * </ul>
+ * <p>
+ * The <b>join style</b> of the corners in a buffer may be {@link BufferParameters#setJoinStyle(int) specified}. The
+ * following join styles are supported:
+ * <ul>
+ * <li>{@link BufferParameters#JOIN_ROUND} - the usual round join
+ * <li>{@link BufferParameters#JOIN_MITRE} - corners are "sharp" (up to a {@link BufferParameters#getMitreLimit() distance limit})
+ * <li>{@link BufferParameters#JOIN_BEVEL} - corners are beveled (clipped off).
+ * </ul>
+ * <p>
+ * The buffer algorithm can perform simplification on the input to increase performance.
+ * The simplification is performed a way that always increases the buffer area
+ * (so that the simplified input covers the original input).
+ * The degree of simplification can be {@link BufferParameters#setSimplifyFactor(double) specified},
+ * with a {@link BufferParameters#DEFAULT_SIMPLIFY_FACTOR default} used otherwise.
+ * Note that if the buffer distance is zero then so is the computed simplify tolerance,
+ * no matter what the simplify factor.
+ *
+ * @version 1.7
+ */
+public class BufferOp
+{
+ /**
+ * Specifies a round line buffer end cap style.
+ * @deprecated use BufferParameters
+ */
+ public static final int CAP_ROUND = BufferParameters.CAP_ROUND;
+ /**
+ * Specifies a butt (or flat) line buffer end cap style.
+ * @deprecated use BufferParameters
+ */
+ public static final int CAP_BUTT = BufferParameters.CAP_FLAT;
+
+ /**
+ * Specifies a butt (or flat) line buffer end cap style.
+ * @deprecated use BufferParameters
+ */
+ public static final int CAP_FLAT = BufferParameters.CAP_FLAT;
+ /**
+ * Specifies a square line buffer end cap style.
+ * @deprecated use BufferParameters
+ */
+ public static final int CAP_SQUARE = BufferParameters.CAP_SQUARE;
+
+ /**
+ * A number of digits of precision which leaves some computational "headroom"
+ * for floating point operations.
+ *
+ * This value should be less than the decimal precision of double-precision values (16).
+ */
+ private static int MAX_PRECISION_DIGITS = 12;
+
+ /**
+ * Compute a scale factor to limit the precision of
+ * a given combination of Geometry and buffer distance.
+ * The scale factor is determined by
+ * the number of digits of precision in the (geometry + buffer distance),
+ * limited by the supplied <code>maxPrecisionDigits</code> value.
+ * <p>
+ * The scale factor is based on the absolute magnitude of the (geometry + buffer distance).
+ * since this determines the number of digits of precision which must be handled.
+ *
+ * @param g the Geometry being buffered
+ * @param distance the buffer distance
+ * @param maxPrecisionDigits the max # of digits that should be allowed by
+ * the precision determined by the computed scale factor
+ *
+ * @return a scale factor for the buffer computation
+ */
+ private static double precisionScaleFactor(Geometry g,
+ double distance,
+ int maxPrecisionDigits)
+ {
+ Envelope env = g.getEnvelopeInternal();
+ double envMax = MathUtil.max(
+ Math.abs(env.getMaxX()),
+ Math.abs(env.getMaxY()),
+ Math.abs(env.getMinX()),
+ Math.abs(env.getMinY())
+ );
+
+ double expandByDistance = distance > 0.0 ? distance : 0.0;
+ double bufEnvMax = envMax + 2 * expandByDistance;
+
+ // the smallest power of 10 greater than the buffer envelope
+ int bufEnvPrecisionDigits = (int) (Math.log(bufEnvMax) / Math.log(10) + 1.0);
+ int minUnitLog10 = maxPrecisionDigits - bufEnvPrecisionDigits;
+
+ double scaleFactor = Math.pow(10.0, minUnitLog10);
+ return scaleFactor;
+ }
+
+ /*
+ private static double OLDprecisionScaleFactor(Geometry g,
+ double distance,
+ int maxPrecisionDigits)
+ {
+ Envelope env = g.getEnvelopeInternal();
+ double envSize = Math.max(env.getHeight(), env.getWidth());
+ double expandByDistance = distance > 0.0 ? distance : 0.0;
+ double bufEnvSize = envSize + 2 * expandByDistance;
+
+ // the smallest power of 10 greater than the buffer envelope
+ int bufEnvLog10 = (int) (Math.log(bufEnvSize) / Math.log(10) + 1.0);
+ int minUnitLog10 = bufEnvLog10 - maxPrecisionDigits;
+ // scale factor is inverse of min Unit size, so flip sign of exponent
+ double scaleFactor = Math.pow(10.0, -minUnitLog10);
+ return scaleFactor;
+ }
+ */
+
+ /**
+ * Computes the buffer of a geometry for a given buffer distance.
+ *
+ * @param g the geometry to buffer
+ * @param distance the buffer distance
+ * @return the buffer of the input geometry
+ */
+ public static Geometry bufferOp(Geometry g, double distance)
+ {
+ BufferOp gBuf = new BufferOp(g);
+ Geometry geomBuf = gBuf.getResultGeometry(distance);
+//BufferDebug.saveBuffer(geomBuf);
+ //BufferDebug.runCount++;
+ return geomBuf;
+ }
+
+ /**
+ * Computes the buffer for a geometry for a given buffer distance
+ * and accuracy of approximation.
+ *
+ * @param g the geometry to buffer
+ * @param distance the buffer distance
+ * @param params the buffer parameters to use
+ * @return the buffer of the input geometry
+ *
+ */
+ public static Geometry bufferOp(Geometry g, double distance, BufferParameters params)
+ {
+ BufferOp bufOp = new BufferOp(g, params);
+ Geometry geomBuf = bufOp.getResultGeometry(distance);
+ return geomBuf;
+ }
+
+ /**
+ * Computes the buffer for a geometry for a given buffer distance
+ * and accuracy of approximation.
+ *
+ * @param g the geometry to buffer
+ * @param distance the buffer distance
+ * @param quadrantSegments the number of segments used to approximate a quarter circle
+ * @return the buffer of the input geometry
+ *
+ */
+ public static Geometry bufferOp(Geometry g, double distance, int quadrantSegments)
+ {
+ BufferOp bufOp = new BufferOp(g);
+ bufOp.setQuadrantSegments(quadrantSegments);
+ Geometry geomBuf = bufOp.getResultGeometry(distance);
+ return geomBuf;
+ }
+
+ /**
+ * Computes the buffer for a geometry for a given buffer distance
+ * and accuracy of approximation.
+ *
+ * @param g the geometry to buffer
+ * @param distance the buffer distance
+ * @param quadrantSegments the number of segments used to approximate a quarter circle
+ * @param endCapStyle the end cap style to use
+ * @return the buffer of the input geometry
+ *
+ */
+ public static Geometry bufferOp(Geometry g,
+ double distance,
+ int quadrantSegments,
+ int endCapStyle)
+ {
+ BufferOp bufOp = new BufferOp(g);
+ bufOp.setQuadrantSegments(quadrantSegments);
+ bufOp.setEndCapStyle(endCapStyle);
+ Geometry geomBuf = bufOp.getResultGeometry(distance);
+ return geomBuf;
+ }
+
+ private Geometry argGeom;
+ private double distance;
+
+ private BufferParameters bufParams = new BufferParameters();
+
+ private Geometry resultGeometry = null;
+ private RuntimeException saveException; // debugging only
+
+ /**
+ * Initializes a buffer computation for the given geometry
+ *
+ * @param g the geometry to buffer
+ */
+ public BufferOp(Geometry g) {
+ argGeom = g;
+ }
+
+ /**
+ * Initializes a buffer computation for the given geometry
+ * with the given set of parameters
+ *
+ * @param g the geometry to buffer
+ * @param bufParams the buffer parameters to use
+ */
+ public BufferOp(Geometry g, BufferParameters bufParams) {
+ argGeom = g;
+ this.bufParams = bufParams;
+ }
+
+ /**
+ * Specifies the end cap style of the generated buffer.
+ * The styles supported are {@link BufferParameters#CAP_ROUND}, {@link BufferParameters#CAP_FLAT}, and {@link BufferParameters#CAP_SQUARE}.
+ * The default is CAP_ROUND.
+ *
+ * @param endCapStyle the end cap style to specify
+ */
+ public void setEndCapStyle(int endCapStyle)
+ {
+ bufParams.setEndCapStyle(endCapStyle);
+ }
+
+ /**
+ * Sets the number of segments used to approximate a angle fillet
+ *
+ * @param quadrantSegments the number of segments in a fillet for a quadrant
+ */
+ public void setQuadrantSegments(int quadrantSegments)
+ {
+ bufParams.setQuadrantSegments(quadrantSegments);
+ }
+
+ /**
+ * Returns the buffer computed for a geometry for a given buffer distance.
+ *
+ * @param distance the buffer distance
+ * @return the buffer of the input geometry
+ */
+ public Geometry getResultGeometry(double distance)
+ {
+ this.distance = distance;
+ computeGeometry();
+ return resultGeometry;
+ }
+
+ private void computeGeometry()
+ {
+ bufferOriginalPrecision();
+ if (resultGeometry != null) return;
+
+ PrecisionModel argPM = argGeom.getFactory().getPrecisionModel();
+ if (argPM.getType() == PrecisionModel.FIXED)
+ bufferFixedPrecision(argPM);
+ else
+ bufferReducedPrecision();
+ }
+
+ private void bufferReducedPrecision()
+ {
+ // try and compute with decreasing precision
+ for (int precDigits = MAX_PRECISION_DIGITS; precDigits >= 0; precDigits--) {
+ try {
+ bufferReducedPrecision(precDigits);
+ }
+ catch (TopologyException ex) {
+ // update the saved exception to reflect the new input geometry
+ saveException = ex;
+ // don't propagate the exception - it will be detected by fact that resultGeometry is null
+ }
+ if (resultGeometry != null) return;
+ }
+
+ // tried everything - have to bail
+ throw saveException;
+ }
+
+ private void bufferOriginalPrecision()
+ {
+ try {
+ // use fast noding by default
+ BufferBuilder bufBuilder = new BufferBuilder(bufParams);
+ resultGeometry = bufBuilder.buffer(argGeom, distance);
+ }
+ catch (RuntimeException ex) {
+ saveException = ex;
+ // don't propagate the exception - it will be detected by fact that resultGeometry is null
+
+ // testing ONLY - propagate exception
+ //throw ex;
+ }
+ }
+
+ private void bufferReducedPrecision(int precisionDigits)
+ {
+ double sizeBasedScaleFactor = precisionScaleFactor(argGeom, distance, precisionDigits);
+// System.out.println("recomputing with precision scale factor = " + sizeBasedScaleFactor);
+
+ PrecisionModel fixedPM = new PrecisionModel(sizeBasedScaleFactor);
+ bufferFixedPrecision(fixedPM);
+ }
+
+ private void bufferFixedPrecision(PrecisionModel fixedPM)
+ {
+ Noder noder = new ScaledNoder(new MCIndexSnapRounder(new PrecisionModel(1.0)),
+ fixedPM.getScale());
+
+ BufferBuilder bufBuilder = new BufferBuilder(bufParams);
+ bufBuilder.setWorkingPrecisionModel(fixedPM);
+ bufBuilder.setNoder(noder);
+ // this may throw an exception, if robustness errors are encountered
+ resultGeometry = bufBuilder.buffer(argGeom, distance);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferParameters.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferParameters.java
new file mode 100644
index 0000000..050ed3e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferParameters.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+/**
+ * A value class containing the parameters which
+ * specify how a buffer should be constructed.
+ * <p>
+ * The parameters allow control over:
+ * <ul>
+ * <li>Quadrant segments (accuracy of approximation for circular arcs)
+ * <li>End Cap style
+ * <li>Join style
+ * <li>Mitre limit
+ * <li>whether the buffer is single-sided
+ * </ul>
+ *
+ * @author Martin Davis
+ *
+ */
+public class BufferParameters
+{
+ /**
+ * Specifies a round line buffer end cap style.
+ */
+ public static final int CAP_ROUND = 1;
+ /**
+ * Specifies a flat line buffer end cap style.
+ */
+ public static final int CAP_FLAT = 2;
+ /**
+ * Specifies a square line buffer end cap style.
+ */
+ public static final int CAP_SQUARE = 3;
+
+ /**
+ * Specifies a round join style.
+ */
+ public static final int JOIN_ROUND = 1;
+ /**
+ * Specifies a mitre join style.
+ */
+ public static final int JOIN_MITRE = 2;
+ /**
+ * Specifies a bevel join style.
+ */
+ public static final int JOIN_BEVEL = 3;
+
+ /**
+ * The default number of facets into which to divide a fillet of 90 degrees.
+ * A value of 8 gives less than 2% max error in the buffer distance.
+ * For a max error of < 1%, use QS = 12.
+ * For a max error of < 0.1%, use QS = 18.
+ */
+ public static final int DEFAULT_QUADRANT_SEGMENTS = 8;
+
+ /**
+ * The default mitre limit
+ * Allows fairly pointy mitres.
+ */
+ public static final double DEFAULT_MITRE_LIMIT = 5.0;
+
+ /**
+ * The default simplify factor
+ * Provides an accuracy of about 1%, which matches the accuracy of the default Quadrant Segments parameter.
+ */
+ public static final double DEFAULT_SIMPLIFY_FACTOR = 0.01;
+
+
+ private int quadrantSegments = DEFAULT_QUADRANT_SEGMENTS;
+ private int endCapStyle = CAP_ROUND;
+ private int joinStyle = JOIN_ROUND;
+ private double mitreLimit = DEFAULT_MITRE_LIMIT;
+ private boolean isSingleSided = false;
+ private double simplifyFactor = DEFAULT_SIMPLIFY_FACTOR;
+
+ /**
+ * Creates a default set of parameters
+ *
+ */
+ public BufferParameters() {
+ }
+
+ /**
+ * Creates a set of parameters with the
+ * given quadrantSegments value.
+ *
+ * @param quadrantSegments the number of quadrant segments to use
+ */
+ public BufferParameters(int quadrantSegments)
+ {
+ setQuadrantSegments(quadrantSegments);
+ }
+
+ /**
+ * Creates a set of parameters with the
+ * given quadrantSegments and endCapStyle values.
+ *
+ * @param quadrantSegments the number of quadrant segments to use
+ * @param endCapStyle the end cap style to use
+ */
+ public BufferParameters(int quadrantSegments,
+ int endCapStyle)
+ {
+ setQuadrantSegments(quadrantSegments);
+ setEndCapStyle(endCapStyle);
+ }
+
+ /**
+ * Creates a set of parameters with the
+ * given parameter values.
+ *
+ * @param quadrantSegments the number of quadrant segments to use
+ * @param endCapStyle the end cap style to use
+ * @param joinStyle the join style to use
+ * @param mitreLimit the mitre limit to use
+ */
+ public BufferParameters(int quadrantSegments,
+ int endCapStyle,
+ int joinStyle,
+ double mitreLimit)
+ {
+ setQuadrantSegments(quadrantSegments);
+ setEndCapStyle(endCapStyle);
+ setJoinStyle(joinStyle);
+ setMitreLimit(mitreLimit);
+ }
+
+ /**
+ * Gets the number of quadrant segments which will be used
+ *
+ * @return the number of quadrant segments
+ */
+ public int getQuadrantSegments()
+ {
+ return quadrantSegments;
+ }
+
+ /**
+ * Sets the number of line segments used to approximate an angle fillet.
+ * <ul>
+ * <li>If <tt>quadSegs</tt> >= 1, joins are round, and <tt>quadSegs</tt> indicates the number of
+ * segments to use to approximate a quarter-circle.
+ * <li>If <tt>quadSegs</tt> = 0, joins are bevelled (flat)
+ * <li>If <tt>quadSegs</tt> < 0, joins are mitred, and the value of qs
+ * indicates the mitre ration limit as
+ * <pre>
+ * mitreLimit = |<tt>quadSegs</tt>|
+ * </pre>
+ * </ul>
+ * For round joins, <tt>quadSegs</tt> determines the maximum
+ * error in the approximation to the true buffer curve.
+ * The default value of 8 gives less than 2% max error in the buffer distance.
+ * For a max error of < 1%, use QS = 12.
+ * For a max error of < 0.1%, use QS = 18.
+ * The error is always less than the buffer distance
+ * (in other words, the computed buffer curve is always inside the true
+ * curve).
+ *
+ * @param quadSegs the number of segments in a fillet for a quadrant
+ */
+ public void setQuadrantSegments(int quadSegs)
+ {
+ quadrantSegments = quadSegs;
+
+ /**
+ * Indicates how to construct fillets.
+ * If qs >= 1, fillet is round, and qs indicates number of
+ * segments to use to approximate a quarter-circle.
+ * If qs = 0, fillet is bevelled flat (i.e. no filleting is performed)
+ * If qs < 0, fillet is mitred, and absolute value of qs
+ * indicates maximum length of mitre according to
+ *
+ * mitreLimit = |qs|
+ */
+ if (quadrantSegments == 0)
+ joinStyle = JOIN_BEVEL;
+ if (quadrantSegments < 0) {
+ joinStyle = JOIN_MITRE;
+ mitreLimit = Math.abs(quadrantSegments);
+ }
+
+ if (quadSegs <= 0) {
+ quadrantSegments = 1;
+ }
+
+ /**
+ * If join style was set by the quadSegs value,
+ * use the default for the actual quadrantSegments value.
+ */
+ if (joinStyle != JOIN_ROUND) {
+ quadrantSegments = DEFAULT_QUADRANT_SEGMENTS;
+ }
+ }
+
+ /**
+ * Computes the maximum distance error due to a given level
+ * of approximation to a true arc.
+ *
+ * @param quadSegs the number of segments used to approximate a quarter-circle
+ * @return the error of approximation
+ */
+ public static double bufferDistanceError(int quadSegs)
+ {
+ double alpha = Math.PI / 2.0 / quadSegs;
+ return 1 - Math.cos(alpha / 2.0);
+ }
+
+ /**
+ * Gets the end cap style.
+ *
+ * @return the end cap style
+ */
+ public int getEndCapStyle()
+ {
+ return endCapStyle;
+ }
+
+ /**
+ * Specifies the end cap style of the generated buffer.
+ * The styles supported are {@link #CAP_ROUND}, {@link #CAP_FLAT}, and {@link #CAP_SQUARE}.
+ * The default is CAP_ROUND.
+ *
+ * @param endCapStyle the end cap style to specify
+ */
+ public void setEndCapStyle(int endCapStyle)
+ {
+ this.endCapStyle = endCapStyle;
+ }
+
+ /**
+ * Gets the join style
+ *
+ * @return the join style code
+ */
+ public int getJoinStyle()
+ {
+ return joinStyle;
+ }
+
+ /**
+ * Sets the join style for outside (reflex) corners between line segments.
+ * Allowable values are {@link #JOIN_ROUND} (which is the default),
+ * {@link #JOIN_MITRE} and {link JOIN_BEVEL}.
+ *
+ * @param joinStyle the code for the join style
+ */
+ public void setJoinStyle(int joinStyle)
+ {
+ this.joinStyle = joinStyle;
+ }
+
+ /**
+ * Gets the mitre ratio limit.
+ *
+ * @return the limit value
+ */
+ public double getMitreLimit()
+ {
+ return mitreLimit;
+ }
+
+ /**
+ * Sets the limit on the mitre ratio used for very sharp corners.
+ * The mitre ratio is the ratio of the distance from the corner
+ * to the end of the mitred offset corner.
+ * When two line segments meet at a sharp angle,
+ * a miter join will extend far beyond the original geometry.
+ * (and in the extreme case will be infinitely far.)
+ * To prevent unreasonable geometry, the mitre limit
+ * allows controlling the maximum length of the join corner.
+ * Corners with a ratio which exceed the limit will be beveled.
+ *
+ * @param mitreLimit the mitre ratio limit
+ */
+ public void setMitreLimit(double mitreLimit)
+ {
+ this.mitreLimit = mitreLimit;
+ }
+
+ /**
+ * Sets whether the computed buffer should be single-sided.
+ * A single-sided buffer is constructed on only one side of each input line.
+ * <p>
+ * The side used is determined by the sign of the buffer distance:
+ * <ul>
+ * <li>a positive distance indicates the left-hand side
+ * <li>a negative distance indicates the right-hand side
+ * </ul>
+ * The single-sided buffer of point geometries is
+ * the same as the regular buffer.
+ * <p>
+ * The End Cap Style for single-sided buffers is
+ * always ignored,
+ * and forced to the equivalent of <tt>CAP_FLAT</tt>.
+ *
+ * @param isSingleSided true if a single-sided buffer should be constructed
+ */
+ public void setSingleSided(boolean isSingleSided)
+ {
+ this.isSingleSided = isSingleSided;
+ }
+
+ /**
+ * Tests whether the buffer is to be generated on a single side only.
+ *
+ * @return true if the generated buffer is to be single-sided
+ */
+ public boolean isSingleSided() {
+ return isSingleSided;
+ }
+
+ /**
+ * Gets the simplify factor.
+ *
+ * @return the simplify factor
+ */
+ public double getSimplifyFactor() {
+ return simplifyFactor;
+ }
+
+ /**
+ * Sets the factor used to determine the simplify distance tolerance
+ * for input simplification.
+ * Simplifying can increase the performance of computing buffers.
+ * Generally the simplify factor should be greater than 0.
+ * Values between 0.01 and .1 produce relatively good accuracy for the generate buffer.
+ * Larger values sacrifice accuracy in return for performance.
+ *
+ * @param simplifyFactor a value greater than or equal to zero.
+ */
+ public void setSimplifyFactor(double simplifyFactor)
+ {
+ this.simplifyFactor = simplifyFactor < 0 ? 0 : simplifyFactor;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferSubgraph.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferSubgraph.java
new file mode 100644
index 0000000..af543fb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/BufferSubgraph.java
@@ -0,0 +1,318 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+/**
+ * @version 1.7
+ */
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.Stack;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.DirectedEdgeStar;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.Position;
+
+/**
+ * A connected subset of the graph of
+ * {@link DirectedEdge}s and {@link Node}s.
+ * Its edges will generate either
+ * <ul>
+ * <li> a single polygon in the complete buffer, with zero or more holes, or
+ * <li> one or more connected holes
+ * </ul>
+ *
+ *
+ * @version 1.7
+ */
+class BufferSubgraph
+ implements Comparable
+{
+ private RightmostEdgeFinder finder;
+ private List dirEdgeList = new ArrayList();
+ private List nodes = new ArrayList();
+ private Coordinate rightMostCoord = null;
+ private Envelope env = null;
+
+ public BufferSubgraph()
+ {
+ finder = new RightmostEdgeFinder();
+ }
+
+ public List getDirectedEdges() { return dirEdgeList; }
+ public List getNodes() { return nodes; }
+
+ /**
+ * Computes the envelope of the edges in the subgraph.
+ * The envelope is cached after being computed.
+ *
+ * @return the envelope of the graph.
+ */
+ public Envelope getEnvelope()
+ {
+ if (env == null) {
+ Envelope edgeEnv = new Envelope();
+ for (Iterator it = dirEdgeList.iterator(); it.hasNext(); ) {
+ DirectedEdge dirEdge = (DirectedEdge) it.next();
+ Coordinate[] pts = dirEdge.getEdge().getCoordinates();
+ for (int i = 0; i < pts.length - 1; i++) {
+ edgeEnv.expandToInclude(pts[i]);
+ }
+ }
+ env = edgeEnv;
+ }
+ return env;
+ }
+
+ /**
+ * Gets the rightmost coordinate in the edges of the subgraph
+ */
+ public Coordinate getRightmostCoordinate()
+ {
+ return rightMostCoord;
+ }
+
+ /**
+ * Creates the subgraph consisting of all edges reachable from this node.
+ * Finds the edges in the graph and the rightmost coordinate.
+ *
+ * @param node a node to start the graph traversal from
+ */
+ public void create(Node node)
+ {
+ addReachable(node);
+ finder.findEdge(dirEdgeList);
+ rightMostCoord = finder.getCoordinate();
+ }
+
+ /**
+ * Adds all nodes and edges reachable from this node to the subgraph.
+ * Uses an explicit stack to avoid a large depth of recursion.
+ *
+ * @param node a node known to be in the subgraph
+ */
+ private void addReachable(Node startNode)
+ {
+ Stack nodeStack = new Stack();
+ nodeStack.add(startNode);
+ while (! nodeStack.empty()) {
+ Node node = (Node) nodeStack.pop();
+ add(node, nodeStack);
+ }
+ }
+
+ /**
+ * Adds the argument node and all its out edges to the subgraph
+ * @param node the node to add
+ * @param nodeStack the current set of nodes being traversed
+ */
+ private void add(Node node, Stack nodeStack)
+ {
+ node.setVisited(true);
+ nodes.add(node);
+ for (Iterator i = ((DirectedEdgeStar) node.getEdges()).iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ dirEdgeList.add(de);
+ DirectedEdge sym = de.getSym();
+ Node symNode = sym.getNode();
+ /**
+ * NOTE: this is a depth-first traversal of the graph.
+ * This will cause a large depth of recursion.
+ * It might be better to do a breadth-first traversal.
+ */
+ if (! symNode.isVisited()) nodeStack.push(symNode);
+ }
+ }
+
+ private void clearVisitedEdges()
+ {
+ for (Iterator it = dirEdgeList.iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ de.setVisited(false);
+ }
+ }
+
+ public void computeDepth(int outsideDepth)
+ {
+ clearVisitedEdges();
+ // find an outside edge to assign depth to
+ DirectedEdge de = finder.getEdge();
+ Node n = de.getNode();
+ Label label = de.getLabel();
+ // right side of line returned by finder is on the outside
+ de.setEdgeDepths(Position.RIGHT, outsideDepth);
+ copySymDepths(de);
+
+ //computeNodeDepth(n, de);
+ computeDepths(de);
+ }
+
+ /**
+ * Compute depths for all dirEdges via breadth-first traversal of nodes in graph
+ * @param startEdge edge to start processing with
+ */
+ // <FIX> MD - use iteration & queue rather than recursion, for speed and robustness
+ private void computeDepths(DirectedEdge startEdge)
+ {
+ Set nodesVisited = new HashSet();
+ LinkedList nodeQueue = new LinkedList();
+
+ Node startNode = startEdge.getNode();
+ nodeQueue.addLast(startNode);
+ nodesVisited.add(startNode);
+ startEdge.setVisited(true);
+
+ while (! nodeQueue.isEmpty()) {
+//System.out.println(nodes.size() + " queue: " + nodeQueue.size());
+ Node n = (Node) nodeQueue.removeFirst();
+ nodesVisited.add(n);
+ // compute depths around node, starting at this edge since it has depths assigned
+ computeNodeDepth(n);
+
+ // add all adjacent nodes to process queue,
+ // unless the node has been visited already
+ for (Iterator i = ((DirectedEdgeStar) n.getEdges()).iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ DirectedEdge sym = de.getSym();
+ if (sym.isVisited()) continue;
+ Node adjNode = sym.getNode();
+ if (! (nodesVisited.contains(adjNode)) ) {
+ nodeQueue.addLast(adjNode);
+ nodesVisited.add(adjNode);
+ }
+ }
+ }
+ }
+
+ private void computeNodeDepth(Node n)
+ {
+ // find a visited dirEdge to start at
+ DirectedEdge startEdge = null;
+ for (Iterator i = ((DirectedEdgeStar) n.getEdges()).iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ if (de.isVisited() || de.getSym().isVisited()) {
+ startEdge = de;
+ break;
+ }
+ }
+ // MD - testing Result: breaks algorithm
+ //if (startEdge == null) return;
+
+ // only compute string append if assertion would fail
+ if (startEdge == null)
+ throw new TopologyException("unable to find edge to compute depths at " + n.getCoordinate());
+
+ ((DirectedEdgeStar) n.getEdges()).computeDepths(startEdge);
+
+ // copy depths to sym edges
+ for (Iterator i = ((DirectedEdgeStar) n.getEdges()).iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ de.setVisited(true);
+ copySymDepths(de);
+ }
+ }
+
+ private void copySymDepths(DirectedEdge de)
+ {
+ DirectedEdge sym = de.getSym();
+ sym.setDepth(Position.LEFT, de.getDepth(Position.RIGHT));
+ sym.setDepth(Position.RIGHT, de.getDepth(Position.LEFT));
+ }
+
+ /**
+ * Find all edges whose depths indicates that they are in the result area(s).
+ * Since we want polygon shells to be
+ * oriented CW, choose dirEdges with the interior of the result on the RHS.
+ * Mark them as being in the result.
+ * Interior Area edges are the result of dimensional collapses.
+ * They do not form part of the result area boundary.
+ */
+ public void findResultEdges()
+ {
+ for (Iterator it = dirEdgeList.iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ /**
+ * Select edges which have an interior depth on the RHS
+ * and an exterior depth on the LHS.
+ * Note that because of weird rounding effects there may be
+ * edges which have negative depths! Negative depths
+ * count as "outside".
+ */
+ // <FIX> - handle negative depths
+ if ( de.getDepth(Position.RIGHT) >= 1
+ && de.getDepth(Position.LEFT) <= 0
+ && ! de.isInteriorAreaEdge()) {
+ de.setInResult(true);
+//Debug.print("in result "); Debug.println(de);
+ }
+ }
+ }
+
+ /**
+ * BufferSubgraphs are compared on the x-value of their rightmost Coordinate.
+ * This defines a partial ordering on the graphs such that:
+ * <p>
+ * g1 >= g2 <==> Ring(g2) does not contain Ring(g1)
+ * <p>
+ * where Polygon(g) is the buffer polygon that is built from g.
+ * <p>
+ * This relationship is used to sort the BufferSubgraphs so that shells are guaranteed to
+ * be built before holes.
+ */
+ public int compareTo(Object o) {
+ BufferSubgraph graph = (BufferSubgraph) o;
+ if (this.rightMostCoord.x < graph.rightMostCoord.x) {
+ return -1;
+ }
+ if (this.rightMostCoord.x > graph.rightMostCoord.x) {
+ return 1;
+ }
+ return 0;
+ }
+
+/*
+// DEBUGGING only - comment out
+ private static final String SAVE_DIREDGES = "saveDirEdges";
+ private static int saveCount = 0;
+ public void saveDirEdges()
+ {
+ GeometryFactory fact = new GeometryFactory();
+ for (Iterator it = dirEdgeList.iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ double dx = de.getDx();
+ double dy = de.getDy();
+ Coordinate p0 = de.getCoordinate();
+ double ang = Math.atan2(dy, dx);
+ Coordinate p1 = new Coordinate(
+ p0.x + .4 * Math.cos(ang),
+ p0.y + .4 * Math.sin(ang));
+// DebugFeature.add(SAVE_DIREDGES,
+// fact.createLineString(new Coordinate[] { p0, p1 } ),
+// de.getDepth(Position.LEFT) + "/" + de.getDepth(Position.RIGHT)
+// );
+ }
+ String filepath = "x:\\jts\\testBuffer\\dirEdges" + saveCount++ + ".jml";
+ DebugFeature.saveFeatures(SAVE_DIREDGES, filepath);
+ }
+ */
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetCurveBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetCurveBuilder.java
new file mode 100644
index 0000000..77253e0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetCurveBuilder.java
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geomgraph.Position;
+
+/**
+ * Computes the raw offset curve for a
+ * single {@link Geometry} component (ring, line or point).
+ * A raw offset curve line is not noded -
+ * it may contain self-intersections (and usually will).
+ * The final buffer polygon is computed by forming a topological graph
+ * of all the noded raw curves and tracing outside contours.
+ * The points in the raw curve are rounded
+ * to a given {@link PrecisionModel}.
+ *
+ * @version 1.7
+ */
+public class OffsetCurveBuilder
+{
+ private double distance = 0.0;
+ private PrecisionModel precisionModel;
+ private BufferParameters bufParams;
+
+ public OffsetCurveBuilder(
+ PrecisionModel precisionModel,
+ BufferParameters bufParams
+ )
+ {
+ this.precisionModel = precisionModel;
+ this.bufParams = bufParams;
+ }
+
+ /**
+ * Gets the buffer parameters being used to generate the curve.
+ *
+ * @return the buffer parameters being used
+ */
+ public BufferParameters getBufferParameters()
+ {
+ return bufParams;
+ }
+
+ /**
+ * This method handles single points as well as LineStrings.
+ * LineStrings are assumed <b>not</b> to be closed (the function will not
+ * fail for closed lines, but will generate superfluous line caps).
+ *
+ * @param inputPts the vertices of the line to offset
+ * @param distance the offset distance
+ *
+ * @return a Coordinate array representing the curve
+ * or null if the curve is empty
+ */
+ public Coordinate[] getLineCurve(Coordinate[] inputPts, double distance)
+ {
+ this.distance = distance;
+
+ // a zero or negative width buffer of a line/point is empty
+ if (distance < 0.0 && ! bufParams.isSingleSided()) return null;
+ if (distance == 0.0) return null;
+
+ double posDistance = Math.abs(distance);
+ OffsetSegmentGenerator segGen = getSegGen(posDistance);
+ if (inputPts.length <= 1) {
+ computePointCurve(inputPts[0], segGen);
+ }
+ else {
+ if (bufParams.isSingleSided()) {
+ boolean isRightSide = distance < 0.0;
+ computeSingleSidedBufferCurve(inputPts, isRightSide, segGen);
+ }
+ else
+ computeLineBufferCurve(inputPts, segGen);
+ }
+
+ Coordinate[] lineCoord = segGen.getCoordinates();
+ return lineCoord;
+ }
+
+ /**
+ * This method handles the degenerate cases of single points and lines,
+ * as well as rings.
+ *
+ * @return a Coordinate array representing the curve
+ * or null if the curve is empty
+ */
+ public Coordinate[] getRingCurve(Coordinate[] inputPts, int side, double distance)
+ {
+ this.distance = distance;
+ if (inputPts.length <= 2)
+ return getLineCurve(inputPts, distance);
+
+ // optimize creating ring for for zero distance
+ if (distance == 0.0) {
+ return copyCoordinates(inputPts);
+ }
+ OffsetSegmentGenerator segGen = getSegGen(distance);
+ computeRingBufferCurve(inputPts, side, segGen);
+ return segGen.getCoordinates();
+ }
+
+ public Coordinate[] getOffsetCurve(Coordinate[] inputPts, double distance)
+ {
+ this.distance = distance;
+
+ // a zero width offset curve is empty
+ if (distance == 0.0) return null;
+
+ boolean isRightSide = distance < 0.0;
+ double posDistance = Math.abs(distance);
+ OffsetSegmentGenerator segGen = getSegGen(posDistance);
+ if (inputPts.length <= 1) {
+ computePointCurve(inputPts[0], segGen);
+ }
+ else {
+ computeOffsetCurve(inputPts, isRightSide, segGen);
+ }
+ Coordinate[] curvePts = segGen.getCoordinates();
+ // for right side line is traversed in reverse direction, so have to reverse generated line
+ if (isRightSide)
+ CoordinateArrays.reverse(curvePts);
+ return curvePts;
+ }
+
+ private static Coordinate[] copyCoordinates(Coordinate[] pts)
+ {
+ Coordinate[] copy = new Coordinate[pts.length];
+ for (int i = 0; i < copy.length; i++) {
+ copy[i] = new Coordinate(pts[i]);
+ }
+ return copy;
+ }
+
+ private OffsetSegmentGenerator getSegGen(double distance)
+ {
+ return new OffsetSegmentGenerator(precisionModel, bufParams, distance);
+ }
+
+ /**
+ * Computes the distance tolerance to use during input
+ * line simplification.
+ *
+ * @param distance the buffer distance
+ * @return the simplification tolerance
+ */
+ private double simplifyTolerance(double bufDistance)
+ {
+ return bufDistance * bufParams.getSimplifyFactor();
+ }
+
+ private void computePointCurve(Coordinate pt, OffsetSegmentGenerator segGen) {
+ switch (bufParams.getEndCapStyle()) {
+ case BufferParameters.CAP_ROUND:
+ segGen.createCircle(pt);
+ break;
+ case BufferParameters.CAP_SQUARE:
+ segGen.createSquare(pt);
+ break;
+ // otherwise curve is empty (e.g. for a butt cap);
+ }
+ }
+
+ private void computeLineBufferCurve(Coordinate[] inputPts, OffsetSegmentGenerator segGen)
+ {
+ double distTol = simplifyTolerance(distance);
+
+ //--------- compute points for left side of line
+ // Simplify the appropriate side of the line before generating
+ Coordinate[] simp1 = BufferInputLineSimplifier.simplify(inputPts, distTol);
+ // MD - used for testing only (to eliminate simplification)
+// Coordinate[] simp1 = inputPts;
+
+ int n1 = simp1.length - 1;
+ segGen.initSideSegments(simp1[0], simp1[1], Position.LEFT);
+ for (int i = 2; i <= n1; i++) {
+ segGen.addNextSegment(simp1[i], true);
+ }
+ segGen.addLastSegment();
+ // add line cap for end of line
+ segGen.addLineEndCap(simp1[n1 - 1], simp1[n1]);
+
+ //---------- compute points for right side of line
+ // Simplify the appropriate side of the line before generating
+ Coordinate[] simp2 = BufferInputLineSimplifier.simplify(inputPts, -distTol);
+ // MD - used for testing only (to eliminate simplification)
+// Coordinate[] simp2 = inputPts;
+ int n2 = simp2.length - 1;
+
+ // since we are traversing line in opposite order, offset position is still LEFT
+ segGen.initSideSegments(simp2[n2], simp2[n2 - 1], Position.LEFT);
+ for (int i = n2 - 2; i >= 0; i--) {
+ segGen.addNextSegment(simp2[i], true);
+ }
+ segGen.addLastSegment();
+ // add line cap for start of line
+ segGen.addLineEndCap(simp2[1], simp2[0]);
+
+ segGen.closeRing();
+ }
+
+ /*
+ private void OLDcomputeLineBufferCurve(Coordinate[] inputPts)
+ {
+ int n = inputPts.length - 1;
+
+ // compute points for left side of line
+ initSideSegments(inputPts[0], inputPts[1], Position.LEFT);
+ for (int i = 2; i <= n; i++) {
+ addNextSegment(inputPts[i], true);
+ }
+ addLastSegment();
+ // add line cap for end of line
+ addLineEndCap(inputPts[n - 1], inputPts[n]);
+
+ // compute points for right side of line
+ initSideSegments(inputPts[n], inputPts[n - 1], Position.LEFT);
+ for (int i = n - 2; i >= 0; i--) {
+ addNextSegment(inputPts[i], true);
+ }
+ addLastSegment();
+ // add line cap for start of line
+ addLineEndCap(inputPts[1], inputPts[0]);
+
+ vertexList.closeRing();
+ }
+ */
+
+ private void computeSingleSidedBufferCurve(Coordinate[] inputPts, boolean isRightSide, OffsetSegmentGenerator segGen)
+ {
+ double distTol = simplifyTolerance(distance);
+
+ if (isRightSide) {
+ // add original line
+ segGen.addSegments(inputPts, true);
+
+ //---------- compute points for right side of line
+ // Simplify the appropriate side of the line before generating
+ Coordinate[] simp2 = BufferInputLineSimplifier.simplify(inputPts, -distTol);
+ // MD - used for testing only (to eliminate simplification)
+ // Coordinate[] simp2 = inputPts;
+ int n2 = simp2.length - 1;
+
+ // since we are traversing line in opposite order, offset position is still LEFT
+ segGen.initSideSegments(simp2[n2], simp2[n2 - 1], Position.LEFT);
+ segGen.addFirstSegment();
+ for (int i = n2 - 2; i >= 0; i--) {
+ segGen.addNextSegment(simp2[i], true);
+ }
+ }
+ else {
+ // add original line
+ segGen.addSegments(inputPts, false);
+
+ //--------- compute points for left side of line
+ // Simplify the appropriate side of the line before generating
+ Coordinate[] simp1 = BufferInputLineSimplifier.simplify(inputPts, distTol);
+ // MD - used for testing only (to eliminate simplification)
+// Coordinate[] simp1 = inputPts;
+
+ int n1 = simp1.length - 1;
+ segGen.initSideSegments(simp1[0], simp1[1], Position.LEFT);
+ segGen.addFirstSegment();
+ for (int i = 2; i <= n1; i++) {
+ segGen.addNextSegment(simp1[i], true);
+ }
+ }
+ segGen.addLastSegment();
+ segGen.closeRing();
+ }
+
+ private void computeOffsetCurve(Coordinate[] inputPts, boolean isRightSide, OffsetSegmentGenerator segGen)
+ {
+ double distTol = simplifyTolerance(distance);
+
+ if (isRightSide) {
+ //---------- compute points for right side of line
+ // Simplify the appropriate side of the line before generating
+ Coordinate[] simp2 = BufferInputLineSimplifier.simplify(inputPts, -distTol);
+ // MD - used for testing only (to eliminate simplification)
+ // Coordinate[] simp2 = inputPts;
+ int n2 = simp2.length - 1;
+
+ // since we are traversing line in opposite order, offset position is still LEFT
+ segGen.initSideSegments(simp2[n2], simp2[n2 - 1], Position.LEFT);
+ segGen.addFirstSegment();
+ for (int i = n2 - 2; i >= 0; i--) {
+ segGen.addNextSegment(simp2[i], true);
+ }
+ }
+ else {
+ //--------- compute points for left side of line
+ // Simplify the appropriate side of the line before generating
+ Coordinate[] simp1 = BufferInputLineSimplifier.simplify(inputPts, distTol);
+ // MD - used for testing only (to eliminate simplification)
+// Coordinate[] simp1 = inputPts;
+
+ int n1 = simp1.length - 1;
+ segGen.initSideSegments(simp1[0], simp1[1], Position.LEFT);
+ segGen.addFirstSegment();
+ for (int i = 2; i <= n1; i++) {
+ segGen.addNextSegment(simp1[i], true);
+ }
+ }
+ segGen.addLastSegment();
+ }
+
+ private void computeRingBufferCurve(Coordinate[] inputPts, int side, OffsetSegmentGenerator segGen)
+ {
+ // simplify input line to improve performance
+ double distTol = simplifyTolerance(distance);
+ // ensure that correct side is simplified
+ if (side == Position.RIGHT)
+ distTol = -distTol;
+ Coordinate[] simp = BufferInputLineSimplifier.simplify(inputPts, distTol);
+// Coordinate[] simp = inputPts;
+
+ int n = simp.length - 1;
+ segGen.initSideSegments(simp[n - 1], simp[0], side);
+ for (int i = 1; i <= n; i++) {
+ boolean addStartPoint = i != 1;
+ segGen.addNextSegment(simp[i], addStartPoint);
+ }
+ segGen.closeRing();
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetCurveSetBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetCurveSetBuilder.java
new file mode 100644
index 0000000..938f481
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetCurveSetBuilder.java
@@ -0,0 +1,308 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+/**
+ * @version 1.7
+ */
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Triangle;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Position;
+import org.locationtech.jts.noding.NodedSegmentString;
+import org.locationtech.jts.noding.SegmentString;
+
+/**
+ * Creates all the raw offset curves for a buffer of a {@link Geometry}.
+ * Raw curves need to be noded together and polygonized to form the final buffer area.
+ *
+ * @version 1.7
+ */
+public class OffsetCurveSetBuilder {
+
+
+ private Geometry inputGeom;
+ private double distance;
+ private OffsetCurveBuilder curveBuilder;
+
+ private List curveList = new ArrayList();
+
+ public OffsetCurveSetBuilder(
+ Geometry inputGeom,
+ double distance,
+ OffsetCurveBuilder curveBuilder)
+ {
+ this.inputGeom = inputGeom;
+ this.distance = distance;
+ this.curveBuilder = curveBuilder;
+ }
+
+ /**
+ * Computes the set of raw offset curves for the buffer.
+ * Each offset curve has an attached {@link Label} indicating
+ * its left and right location.
+ *
+ * @return a Collection of SegmentStrings representing the raw buffer curves
+ */
+ public List getCurves()
+ {
+ add(inputGeom);
+ return curveList;
+ }
+
+ /**
+ * Creates a {@link SegmentString} for a coordinate list which is a raw offset curve,
+ * and adds it to the list of buffer curves.
+ * The SegmentString is tagged with a Label giving the topology of the curve.
+ * The curve may be oriented in either direction.
+ * If the curve is oriented CW, the locations will be:
+ * <br>Left: Location.EXTERIOR
+ * <br>Right: Location.INTERIOR
+ */
+ private void addCurve(Coordinate[] coord, int leftLoc, int rightLoc)
+ {
+ // don't add null or trivial curves
+ if (coord == null || coord.length < 2) return;
+ // add the edge for a coordinate list which is a raw offset curve
+ SegmentString e = new NodedSegmentString(coord,
+ new Label(0, Location.BOUNDARY, leftLoc, rightLoc));
+ curveList.add(e);
+ }
+
+
+ private void add(Geometry g)
+ {
+ if (g.isEmpty()) return;
+
+ if (g instanceof Polygon) addPolygon((Polygon) g);
+ // LineString also handles LinearRings
+ else if (g instanceof LineString) addLineString((LineString) g);
+ else if (g instanceof Point) addPoint((Point) g);
+ else if (g instanceof MultiPoint) addCollection((MultiPoint) g);
+ else if (g instanceof MultiLineString) addCollection((MultiLineString) g);
+ else if (g instanceof MultiPolygon) addCollection((MultiPolygon) g);
+ else if (g instanceof GeometryCollection) addCollection((GeometryCollection) g);
+ else throw new UnsupportedOperationException(g.getClass().getName());
+ }
+ private void addCollection(GeometryCollection gc)
+ {
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = gc.getGeometryN(i);
+ add(g);
+ }
+ }
+ /**
+ * Add a Point to the graph.
+ */
+ private void addPoint(Point p)
+ {
+ // a zero or negative width buffer of a line/point is empty
+ if (distance <= 0.0)
+ return;
+ Coordinate[] coord = p.getCoordinates();
+ Coordinate[] curve = curveBuilder.getLineCurve(coord, distance);
+ addCurve(curve, Location.EXTERIOR, Location.INTERIOR);
+ }
+
+ private void addLineString(LineString line)
+ {
+ // a zero or negative width buffer of a line/point is empty
+ if (distance <= 0.0 && ! curveBuilder.getBufferParameters().isSingleSided())
+ return;
+ Coordinate[] coord = CoordinateArrays.removeRepeatedPoints(line.getCoordinates());
+ Coordinate[] curve = curveBuilder.getLineCurve(coord, distance);
+ addCurve(curve, Location.EXTERIOR, Location.INTERIOR);
+
+ // TESTING
+ //Coordinate[] curveTrim = BufferCurveLoopPruner.prune(curve);
+ //addCurve(curveTrim, Location.EXTERIOR, Location.INTERIOR);
+ }
+
+ private void addPolygon(Polygon p)
+ {
+ double offsetDistance = distance;
+ int offsetSide = Position.LEFT;
+ if (distance < 0.0) {
+ offsetDistance = -distance;
+ offsetSide = Position.RIGHT;
+ }
+
+ LinearRing shell = (LinearRing) p.getExteriorRing();
+ Coordinate[] shellCoord = CoordinateArrays.removeRepeatedPoints(shell.getCoordinates());
+ // optimization - don't bother computing buffer
+ // if the polygon would be completely eroded
+ if (distance < 0.0 && isErodedCompletely(shell, distance))
+ return;
+ // don't attemtp to buffer a polygon with too few distinct vertices
+ if (distance <= 0.0 && shellCoord.length < 3)
+ return;
+
+ addPolygonRing(
+ shellCoord,
+ offsetDistance,
+ offsetSide,
+ Location.EXTERIOR,
+ Location.INTERIOR);
+
+ for (int i = 0; i < p.getNumInteriorRing(); i++) {
+
+ LinearRing hole = (LinearRing) p.getInteriorRingN(i);
+ Coordinate[] holeCoord = CoordinateArrays.removeRepeatedPoints(hole.getCoordinates());
+
+ // optimization - don't bother computing buffer for this hole
+ // if the hole would be completely covered
+ if (distance > 0.0 && isErodedCompletely(hole, -distance))
+ continue;
+
+ // Holes are topologically labelled opposite to the shell, since
+ // the interior of the polygon lies on their opposite side
+ // (on the left, if the hole is oriented CCW)
+ addPolygonRing(
+ holeCoord,
+ offsetDistance,
+ Position.opposite(offsetSide),
+ Location.INTERIOR,
+ Location.EXTERIOR);
+ }
+ }
+
+ /**
+ * Adds an offset curve for a polygon ring.
+ * The side and left and right topological location arguments
+ * assume that the ring is oriented CW.
+ * If the ring is in the opposite orientation,
+ * the left and right locations must be interchanged and the side flipped.
+ *
+ * @param coord the coordinates of the ring (must not contain repeated points)
+ * @param offsetDistance the distance at which to create the buffer
+ * @param side the side of the ring on which to construct the buffer line
+ * @param cwLeftLoc the location on the L side of the ring (if it is CW)
+ * @param cwRightLoc the location on the R side of the ring (if it is CW)
+ */
+ private void addPolygonRing(Coordinate[] coord, double offsetDistance, int side, int cwLeftLoc, int cwRightLoc)
+ {
+ // don't bother adding ring if it is "flat" and will disappear in the output
+ if (offsetDistance == 0.0 && coord.length < LinearRing.MINIMUM_VALID_SIZE)
+ return;
+
+ int leftLoc = cwLeftLoc;
+ int rightLoc = cwRightLoc;
+ if (coord.length >= LinearRing.MINIMUM_VALID_SIZE
+ && Orientation.isCCW(coord)) {
+ leftLoc = cwRightLoc;
+ rightLoc = cwLeftLoc;
+ side = Position.opposite(side);
+ }
+ Coordinate[] curve = curveBuilder.getRingCurve(coord, side, offsetDistance);
+ addCurve(curve, leftLoc, rightLoc);
+ }
+
+ /**
+ * The ringCoord is assumed to contain no repeated points.
+ * It may be degenerate (i.e. contain only 1, 2, or 3 points).
+ * In this case it has no area, and hence has a minimum diameter of 0.
+ *
+ * @param ringCoord
+ * @param offsetDistance
+ * @return
+ */
+ private boolean isErodedCompletely(LinearRing ring, double bufferDistance)
+ {
+ Coordinate[] ringCoord = ring.getCoordinates();
+ double minDiam = 0.0;
+ // degenerate ring has no area
+ if (ringCoord.length < 4)
+ return bufferDistance < 0;
+
+ // important test to eliminate inverted triangle bug
+ // also optimizes erosion test for triangles
+ if (ringCoord.length == 4)
+ return isTriangleErodedCompletely(ringCoord, bufferDistance);
+
+ // if envelope is narrower than twice the buffer distance, ring is eroded
+ Envelope env = ring.getEnvelopeInternal();
+ double envMinDimension = Math.min(env.getHeight(), env.getWidth());
+ if (bufferDistance < 0.0
+ && 2 * Math.abs(bufferDistance) > envMinDimension)
+ return true;
+
+ return false;
+ /**
+ * The following is a heuristic test to determine whether an
+ * inside buffer will be eroded completely.
+ * It is based on the fact that the minimum diameter of the ring pointset
+ * provides an upper bound on the buffer distance which would erode the
+ * ring.
+ * If the buffer distance is less than the minimum diameter, the ring
+ * may still be eroded, but this will be determined by
+ * a full topological computation.
+ *
+ */
+//System.out.println(ring);
+/* MD 7 Feb 2005 - there's an unknown bug in the MD code, so disable this for now
+ MinimumDiameter md = new MinimumDiameter(ring);
+ minDiam = md.getLength();
+ //System.out.println(md.getDiameter());
+ return minDiam < 2 * Math.abs(bufferDistance);
+ */
+ }
+
+ /**
+ * Tests whether a triangular ring would be eroded completely by the given
+ * buffer distance.
+ * This is a precise test. It uses the fact that the inner buffer of a
+ * triangle converges on the inCentre of the triangle (the point
+ * equidistant from all sides). If the buffer distance is greater than the
+ * distance of the inCentre from a side, the triangle will be eroded completely.
+ *
+ * This test is important, since it removes a problematic case where
+ * the buffer distance is slightly larger than the inCentre distance.
+ * In this case the triangle buffer curve "inverts" with incorrect topology,
+ * producing an incorrect hole in the buffer.
+ *
+ * @param triangleCoord
+ * @param bufferDistance
+ * @return
+ */
+ private boolean isTriangleErodedCompletely(
+ Coordinate[] triangleCoord,
+ double bufferDistance)
+ {
+ Triangle tri = new Triangle(triangleCoord[0], triangleCoord[1], triangleCoord[2]);
+ Coordinate inCentre = tri.inCentre();
+ double distToCentre = Distance.pointToSegment(inCentre, tri.p0, tri.p1);
+ return distToCentre < Math.abs(bufferDistance);
+ }
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetSegmentGenerator.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetSegmentGenerator.java
new file mode 100644
index 0000000..c157864
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetSegmentGenerator.java
@@ -0,0 +1,656 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import org.locationtech.jts.algorithm.Angle;
+import org.locationtech.jts.algorithm.HCoordinate;
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.NotRepresentableException;
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geomgraph.Position;
+
+/**
+ * Generates segments which form an offset curve.
+ * Supports all end cap and join options
+ * provided for buffering.
+ * This algorithm implements various heuristics to
+ * produce smoother, simpler curves which are
+ * still within a reasonable tolerance of the
+ * true curve.
+ *
+ * @author Martin Davis
+ *
+ */
+class OffsetSegmentGenerator
+{
+
+ /**
+ * Factor which controls how close offset segments can be to
+ * skip adding a filler or mitre.
+ */
+ private static final double OFFSET_SEGMENT_SEPARATION_FACTOR = 1.0E-3;
+
+ /**
+ * Factor which controls how close curve vertices on inside turns can be to be snapped
+ */
+ private static final double INSIDE_TURN_VERTEX_SNAP_DISTANCE_FACTOR = 1.0E-3;
+
+ /**
+ * Factor which controls how close curve vertices can be to be snapped
+ */
+ private static final double CURVE_VERTEX_SNAP_DISTANCE_FACTOR = 1.0E-6;
+
+ /**
+ * Factor which determines how short closing segs can be for round buffers
+ */
+ private static final int MAX_CLOSING_SEG_LEN_FACTOR = 80;
+
+ /**
+ * the max error of approximation (distance) between a quad segment and the true fillet curve
+ */
+ private double maxCurveSegmentError = 0.0;
+
+ /**
+ * The angle quantum with which to approximate a fillet curve
+ * (based on the input # of quadrant segments)
+ */
+ private double filletAngleQuantum;
+
+ /**
+ * The Closing Segment Length Factor controls how long
+ * "closing segments" are. Closing segments are added
+ * at the middle of inside corners to ensure a smoother
+ * boundary for the buffer offset curve.
+ * In some cases (particularly for round joins with default-or-better
+ * quantization) the closing segments can be made quite short.
+ * This substantially improves performance (due to fewer intersections being created).
+ *
+ * A closingSegFactor of 0 results in lines to the corner vertex
+ * A closingSegFactor of 1 results in lines halfway to the corner vertex
+ * A closingSegFactor of 80 results in lines 1/81 of the way to the corner vertex
+ * (this option is reasonable for the very common default situation of round joins
+ * and quadrantSegs >= 8)
+ */
+ private int closingSegLengthFactor = 1;
+
+ private OffsetSegmentString segList;
+ private double distance = 0.0;
+ private PrecisionModel precisionModel;
+ private BufferParameters bufParams;
+ private LineIntersector li;
+
+ private Coordinate s0, s1, s2;
+ private LineSegment seg0 = new LineSegment();
+ private LineSegment seg1 = new LineSegment();
+ private LineSegment offset0 = new LineSegment();
+ private LineSegment offset1 = new LineSegment();
+ private int side = 0;
+ private boolean hasNarrowConcaveAngle = false;
+
+ public OffsetSegmentGenerator(PrecisionModel precisionModel,
+ BufferParameters bufParams, double distance) {
+ this.precisionModel = precisionModel;
+ this.bufParams = bufParams;
+
+ // compute intersections in full precision, to provide accuracy
+ // the points are rounded as they are inserted into the curve line
+ li = new RobustLineIntersector();
+ filletAngleQuantum = Math.PI / 2.0 / bufParams.getQuadrantSegments();
+
+ /**
+ * Non-round joins cause issues with short closing segments, so don't use
+ * them. In any case, non-round joins only really make sense for relatively
+ * small buffer distances.
+ */
+ if (bufParams.getQuadrantSegments() >= 8
+ && bufParams.getJoinStyle() == BufferParameters.JOIN_ROUND)
+ closingSegLengthFactor = MAX_CLOSING_SEG_LEN_FACTOR;
+ init(distance);
+ }
+
+ /**
+ * Tests whether the input has a narrow concave angle
+ * (relative to the offset distance).
+ * In this case the generated offset curve will contain self-intersections
+ * and heuristic closing segments.
+ * This is expected behaviour in the case of Buffer curves.
+ * For pure Offset Curves,
+ * the output needs to be further treated
+ * before it can be used.
+ *
+ * @return true if the input has a narrow concave angle
+ */
+ public boolean hasNarrowConcaveAngle()
+ {
+ return hasNarrowConcaveAngle;
+ }
+
+ private void init(double distance)
+ {
+ this.distance = distance;
+ maxCurveSegmentError = distance * (1 - Math.cos(filletAngleQuantum / 2.0));
+ segList = new OffsetSegmentString();
+ segList.setPrecisionModel(precisionModel);
+ /**
+ * Choose the min vertex separation as a small fraction of the offset distance.
+ */
+ segList.setMinimumVertexDistance(distance * CURVE_VERTEX_SNAP_DISTANCE_FACTOR);
+ }
+
+
+ public void initSideSegments(Coordinate s1, Coordinate s2, int side)
+ {
+ this.s1 = s1;
+ this.s2 = s2;
+ this.side = side;
+ seg1.setCoordinates(s1, s2);
+ computeOffsetSegment(seg1, side, distance, offset1);
+ }
+
+ public Coordinate[] getCoordinates()
+ {
+ Coordinate[] pts = segList.getCoordinates();
+ return pts;
+ }
+
+ public void closeRing()
+ {
+ segList.closeRing();
+ }
+
+ public void addSegments(Coordinate[] pt, boolean isForward)
+ {
+ segList.addPts(pt, isForward);
+ }
+
+ public void addFirstSegment()
+ {
+ segList.addPt(offset1.p0);
+ }
+
+ /**
+ * Add last offset point
+ */
+ public void addLastSegment()
+ {
+ segList.addPt(offset1.p1);
+ }
+
+ //private static double MAX_CLOSING_SEG_LEN = 3.0;
+
+ public void addNextSegment(Coordinate p, boolean addStartPoint)
+ {
+ // s0-s1-s2 are the coordinates of the previous segment and the current one
+ s0 = s1;
+ s1 = s2;
+ s2 = p;
+ seg0.setCoordinates(s0, s1);
+ computeOffsetSegment(seg0, side, distance, offset0);
+ seg1.setCoordinates(s1, s2);
+ computeOffsetSegment(seg1, side, distance, offset1);
+
+ // do nothing if points are equal
+ if (s1.equals(s2)) return;
+
+ int orientation = Orientation.index(s0, s1, s2);
+ boolean outsideTurn =
+ (orientation == Orientation.CLOCKWISE && side == Position.LEFT)
+ || (orientation == Orientation.COUNTERCLOCKWISE && side == Position.RIGHT);
+
+ if (orientation == 0) { // lines are collinear
+ addCollinear(addStartPoint);
+ }
+ else if (outsideTurn)
+ {
+ addOutsideTurn(orientation, addStartPoint);
+ }
+ else { // inside turn
+ addInsideTurn(orientation, addStartPoint);
+ }
+ }
+
+ private void addCollinear(boolean addStartPoint)
+ {
+ /**
+ * This test could probably be done more efficiently,
+ * but the situation of exact collinearity should be fairly rare.
+ */
+ li.computeIntersection(s0, s1, s1, s2);
+ int numInt = li.getIntersectionNum();
+ /**
+ * if numInt is < 2, the lines are parallel and in the same direction. In
+ * this case the point can be ignored, since the offset lines will also be
+ * parallel.
+ */
+ if (numInt >= 2) {
+ /**
+ * segments are collinear but reversing.
+ * Add an "end-cap" fillet
+ * all the way around to other direction This case should ONLY happen
+ * for LineStrings, so the orientation is always CW. (Polygons can never
+ * have two consecutive segments which are parallel but reversed,
+ * because that would be a self intersection.
+ *
+ */
+ if (bufParams.getJoinStyle() == BufferParameters.JOIN_BEVEL
+ || bufParams.getJoinStyle() == BufferParameters.JOIN_MITRE) {
+ if (addStartPoint) segList.addPt(offset0.p1);
+ segList.addPt(offset1.p0);
+ }
+ else {
+ addCornerFillet(s1, offset0.p1, offset1.p0, Orientation.CLOCKWISE, distance);
+ }
+ }
+ }
+
+ /**
+ * Adds the offset points for an outside (convex) turn
+ *
+ * @param orientation
+ * @param addStartPoint
+ */
+ private void addOutsideTurn(int orientation, boolean addStartPoint)
+ {
+ /**
+ * Heuristic: If offset endpoints are very close together,
+ * just use one of them as the corner vertex.
+ * This avoids problems with computing mitre corners in the case
+ * where the two segments are almost parallel
+ * (which is hard to compute a robust intersection for).
+ */
+ if (offset0.p1.distance(offset1.p0) < distance * OFFSET_SEGMENT_SEPARATION_FACTOR) {
+ segList.addPt(offset0.p1);
+ return;
+ }
+
+ if (bufParams.getJoinStyle() == BufferParameters.JOIN_MITRE) {
+ addMitreJoin(s1, offset0, offset1, distance);
+ }
+ else if (bufParams.getJoinStyle() == BufferParameters.JOIN_BEVEL){
+ addBevelJoin(offset0, offset1);
+ }
+ else {
+ // add a circular fillet connecting the endpoints of the offset segments
+ if (addStartPoint) segList.addPt(offset0.p1);
+ // TESTING - comment out to produce beveled joins
+ addCornerFillet(s1, offset0.p1, offset1.p0, orientation, distance);
+ segList.addPt(offset1.p0);
+ }
+ }
+
+ /**
+ * Adds the offset points for an inside (concave) turn.
+ *
+ * @param orientation
+ * @param addStartPoint
+ */
+ private void addInsideTurn(int orientation, boolean addStartPoint) {
+ /**
+ * add intersection point of offset segments (if any)
+ */
+ li.computeIntersection(offset0.p0, offset0.p1, offset1.p0, offset1.p1);
+ if (li.hasIntersection()) {
+ segList.addPt(li.getIntersection(0));
+ }
+ else {
+ /**
+ * If no intersection is detected,
+ * it means the angle is so small and/or the offset so
+ * large that the offsets segments don't intersect.
+ * In this case we must
+ * add a "closing segment" to make sure the buffer curve is continuous,
+ * fairly smooth (e.g. no sharp reversals in direction)
+ * and tracks the buffer correctly around the corner. The curve connects
+ * the endpoints of the segment offsets to points
+ * which lie toward the centre point of the corner.
+ * The joining curve will not appear in the final buffer outline, since it
+ * is completely internal to the buffer polygon.
+ *
+ * In complex buffer cases the closing segment may cut across many other
+ * segments in the generated offset curve. In order to improve the
+ * performance of the noding, the closing segment should be kept as short as possible.
+ * (But not too short, since that would defeat its purpose).
+ * This is the purpose of the closingSegFactor heuristic value.
+ */
+
+ /**
+ * The intersection test above is vulnerable to robustness errors; i.e. it
+ * may be that the offsets should intersect very close to their endpoints,
+ * but aren't reported as such due to rounding. To handle this situation
+ * appropriately, we use the following test: If the offset points are very
+ * close, don't add closing segments but simply use one of the offset
+ * points
+ */
+ hasNarrowConcaveAngle = true;
+ //System.out.println("NARROW ANGLE - distance = " + distance);
+ if (offset0.p1.distance(offset1.p0) < distance
+ * INSIDE_TURN_VERTEX_SNAP_DISTANCE_FACTOR) {
+ segList.addPt(offset0.p1);
+ } else {
+ // add endpoint of this segment offset
+ segList.addPt(offset0.p1);
+
+ /**
+ * Add "closing segment" of required length.
+ */
+ if (closingSegLengthFactor > 0) {
+ Coordinate mid0 = new Coordinate((closingSegLengthFactor * offset0.p1.x + s1.x)/(closingSegLengthFactor + 1),
+ (closingSegLengthFactor*offset0.p1.y + s1.y)/(closingSegLengthFactor + 1));
+ segList.addPt(mid0);
+ Coordinate mid1 = new Coordinate((closingSegLengthFactor*offset1.p0.x + s1.x)/(closingSegLengthFactor + 1),
+ (closingSegLengthFactor*offset1.p0.y + s1.y)/(closingSegLengthFactor + 1));
+ segList.addPt(mid1);
+ }
+ else {
+ /**
+ * This branch is not expected to be used except for testing purposes.
+ * It is equivalent to the JTS 1.9 logic for closing segments
+ * (which results in very poor performance for large buffer distances)
+ */
+ segList.addPt(s1);
+ }
+
+ //*/
+ // add start point of next segment offset
+ segList.addPt(offset1.p0);
+ }
+ }
+ }
+
+
+ /**
+ * Compute an offset segment for an input segment on a given side and at a given distance.
+ * The offset points are computed in full double precision, for accuracy.
+ *
+ * @param seg the segment to offset
+ * @param side the side of the segment ({@link Position}) the offset lies on
+ * @param distance the offset distance
+ * @param offset the points computed for the offset segment
+ */
+ private void computeOffsetSegment(LineSegment seg, int side, double distance, LineSegment offset)
+ {
+ int sideSign = side == Position.LEFT ? 1 : -1;
+ double dx = seg.p1.x - seg.p0.x;
+ double dy = seg.p1.y - seg.p0.y;
+ double len = Math.sqrt(dx * dx + dy * dy);
+ // u is the vector that is the length of the offset, in the direction of the segment
+ double ux = sideSign * distance * dx / len;
+ double uy = sideSign * distance * dy / len;
+ offset.p0.x = seg.p0.x - uy;
+ offset.p0.y = seg.p0.y + ux;
+ offset.p1.x = seg.p1.x - uy;
+ offset.p1.y = seg.p1.y + ux;
+ }
+
+ /**
+ * Add an end cap around point p1, terminating a line segment coming from p0
+ */
+ public void addLineEndCap(Coordinate p0, Coordinate p1)
+ {
+ LineSegment seg = new LineSegment(p0, p1);
+
+ LineSegment offsetL = new LineSegment();
+ computeOffsetSegment(seg, Position.LEFT, distance, offsetL);
+ LineSegment offsetR = new LineSegment();
+ computeOffsetSegment(seg, Position.RIGHT, distance, offsetR);
+
+ double dx = p1.x - p0.x;
+ double dy = p1.y - p0.y;
+ double angle = Math.atan2(dy, dx);
+
+ switch (bufParams.getEndCapStyle()) {
+ case BufferParameters.CAP_ROUND:
+ // add offset seg points with a fillet between them
+ segList.addPt(offsetL.p1);
+ addDirectedFillet(p1, angle + Math.PI / 2, angle - Math.PI / 2, Orientation.CLOCKWISE, distance);
+ segList.addPt(offsetR.p1);
+ break;
+ case BufferParameters.CAP_FLAT:
+ // only offset segment points are added
+ segList.addPt(offsetL.p1);
+ segList.addPt(offsetR.p1);
+ break;
+ case BufferParameters.CAP_SQUARE:
+ // add a square defined by extensions of the offset segment endpoints
+ Coordinate squareCapSideOffset = new Coordinate();
+ squareCapSideOffset.x = Math.abs(distance) * Math.cos(angle);
+ squareCapSideOffset.y = Math.abs(distance) * Math.sin(angle);
+
+ Coordinate squareCapLOffset = new Coordinate(
+ offsetL.p1.x + squareCapSideOffset.x,
+ offsetL.p1.y + squareCapSideOffset.y);
+ Coordinate squareCapROffset = new Coordinate(
+ offsetR.p1.x + squareCapSideOffset.x,
+ offsetR.p1.y + squareCapSideOffset.y);
+ segList.addPt(squareCapLOffset);
+ segList.addPt(squareCapROffset);
+ break;
+
+ }
+ }
+ /**
+ * Adds a mitre join connecting the two reflex offset segments.
+ * The mitre will be beveled if it exceeds the mitre ratio limit.
+ *
+ * @param offset0 the first offset segment
+ * @param offset1 the second offset segment
+ * @param distance the offset distance
+ */
+ private void addMitreJoin(Coordinate p,
+ LineSegment offset0,
+ LineSegment offset1,
+ double distance)
+ {
+ boolean isMitreWithinLimit = true;
+ Coordinate intPt = null;
+
+ /**
+ * This computation is unstable if the offset segments are nearly collinear.
+ * However, this situation should have been eliminated earlier by the check for
+ * whether the offset segment endpoints are almost coincident
+ */
+ try {
+ intPt = HCoordinate.intersection(offset0.p0,
+ offset0.p1, offset1.p0, offset1.p1);
+
+ double mitreRatio = distance <= 0.0 ? 1.0
+ : intPt.distance(p) / Math.abs(distance);
+
+ if (mitreRatio > bufParams.getMitreLimit())
+ isMitreWithinLimit = false;
+ }
+ catch (NotRepresentableException ex) {
+ intPt = new Coordinate(0,0);
+ isMitreWithinLimit = false;
+ }
+
+ if (isMitreWithinLimit) {
+ segList.addPt(intPt);
+ }
+ else {
+ addLimitedMitreJoin(offset0, offset1, distance, bufParams.getMitreLimit());
+// addBevelJoin(offset0, offset1);
+ }
+ }
+
+
+ /**
+ * Adds a limited mitre join connecting the two reflex offset segments.
+ * A limited mitre is a mitre which is beveled at the distance
+ * determined by the mitre ratio limit.
+ *
+ * @param offset0 the first offset segment
+ * @param offset1 the second offset segment
+ * @param distance the offset distance
+ * @param mitreLimit the mitre limit ratio
+ */
+ private void addLimitedMitreJoin(
+ LineSegment offset0,
+ LineSegment offset1,
+ double distance,
+ double mitreLimit)
+ {
+ Coordinate basePt = seg0.p1;
+
+ double ang0 = Angle.angle(basePt, seg0.p0);
+ double ang1 = Angle.angle(basePt, seg1.p1);
+
+ // oriented angle between segments
+ double angDiff = Angle.angleBetweenOriented(seg0.p0, basePt, seg1.p1);
+ // half of the interior angle
+ double angDiffHalf = angDiff / 2;
+
+ // angle for bisector of the interior angle between the segments
+ double midAng = Angle.normalize(ang0 + angDiffHalf);
+ // rotating this by PI gives the bisector of the reflex angle
+ double mitreMidAng = Angle.normalize(midAng + Math.PI);
+
+ // the miterLimit determines the distance to the mitre bevel
+ double mitreDist = mitreLimit * distance;
+ // the bevel delta is the difference between the buffer distance
+ // and half of the length of the bevel segment
+ double bevelDelta = mitreDist * Math.abs(Math.sin(angDiffHalf));
+ double bevelHalfLen = distance - bevelDelta;
+
+ // compute the midpoint of the bevel segment
+ double bevelMidX = basePt.x + mitreDist * Math.cos(mitreMidAng);
+ double bevelMidY = basePt.y + mitreDist * Math.sin(mitreMidAng);
+ Coordinate bevelMidPt = new Coordinate(bevelMidX, bevelMidY);
+
+ // compute the mitre midline segment from the corner point to the bevel segment midpoint
+ LineSegment mitreMidLine = new LineSegment(basePt, bevelMidPt);
+
+ // finally the bevel segment endpoints are computed as offsets from
+ // the mitre midline
+ Coordinate bevelEndLeft = mitreMidLine.pointAlongOffset(1.0, bevelHalfLen);
+ Coordinate bevelEndRight = mitreMidLine.pointAlongOffset(1.0, -bevelHalfLen);
+
+ if (side == Position.LEFT) {
+ segList.addPt(bevelEndLeft);
+ segList.addPt(bevelEndRight);
+ }
+ else {
+ segList.addPt(bevelEndRight);
+ segList.addPt(bevelEndLeft);
+ }
+ }
+
+ /**
+ * Adds a bevel join connecting the two offset segments
+ * around a reflex corner.
+ *
+ * @param offset0 the first offset segment
+ * @param offset1 the second offset segment
+ */
+ private void addBevelJoin(
+ LineSegment offset0,
+ LineSegment offset1)
+ {
+ segList.addPt(offset0.p1);
+ segList.addPt(offset1.p0);
+ }
+
+
+ /**
+ * Add points for a circular fillet around a reflex corner.
+ * Adds the start and end points
+ *
+ * @param p base point of curve
+ * @param p0 start point of fillet curve
+ * @param p1 endpoint of fillet curve
+ * @param direction the orientation of the fillet
+ * @param radius the radius of the fillet
+ */
+ private void addCornerFillet(Coordinate p, Coordinate p0, Coordinate p1, int direction, double radius)
+ {
+ double dx0 = p0.x - p.x;
+ double dy0 = p0.y - p.y;
+ double startAngle = Math.atan2(dy0, dx0);
+ double dx1 = p1.x - p.x;
+ double dy1 = p1.y - p.y;
+ double endAngle = Math.atan2(dy1, dx1);
+
+ if (direction == Orientation.CLOCKWISE) {
+ if (startAngle <= endAngle) startAngle += 2.0 * Math.PI;
+ }
+ else { // direction == COUNTERCLOCKWISE
+ if (startAngle >= endAngle) startAngle -= 2.0 * Math.PI;
+ }
+ segList.addPt(p0);
+ addDirectedFillet(p, startAngle, endAngle, direction, radius);
+ segList.addPt(p1);
+ }
+
+ /**
+ * Adds points for a circular fillet arc
+ * between two specified angles.
+ * The start and end point for the fillet are not added -
+ * the caller must add them if required.
+ *
+ * @param direction is -1 for a CW angle, 1 for a CCW angle
+ * @param radius the radius of the fillet
+ */
+ private void addDirectedFillet(Coordinate p, double startAngle, double endAngle, int direction, double radius)
+ {
+ int directionFactor = direction == Orientation.CLOCKWISE ? -1 : 1;
+
+ double totalAngle = Math.abs(startAngle - endAngle);
+ int nSegs = (int) (totalAngle / filletAngleQuantum + 0.5);
+
+ if (nSegs < 1) return; // no segments because angle is less than increment - nothing to do!
+
+ double initAngle, currAngleInc;
+
+ // choose angle increment so that each segment has equal length
+ initAngle = 0.0;
+ currAngleInc = totalAngle / nSegs;
+
+ double currAngle = initAngle;
+ Coordinate pt = new Coordinate();
+ while (currAngle < totalAngle) {
+ double angle = startAngle + directionFactor * currAngle;
+ pt.x = p.x + radius * Math.cos(angle);
+ pt.y = p.y + radius * Math.sin(angle);
+ segList.addPt(pt);
+ currAngle += currAngleInc;
+ }
+ }
+
+
+ /**
+ * Creates a CW circle around a point
+ */
+ public void createCircle(Coordinate p)
+ {
+ // add start point
+ Coordinate pt = new Coordinate(p.x + distance, p.y);
+ segList.addPt(pt);
+ addDirectedFillet(p, 0.0, 2.0 * Math.PI, -1, distance);
+ segList.closeRing();
+ }
+
+ /**
+ * Creates a CW square around a point
+ */
+ public void createSquare(Coordinate p)
+ {
+ segList.addPt(new Coordinate(p.x + distance, p.y + distance));
+ segList.addPt(new Coordinate(p.x + distance, p.y - distance));
+ segList.addPt(new Coordinate(p.x - distance, p.y - distance));
+ segList.addPt(new Coordinate(p.x - distance, p.y + distance));
+ segList.closeRing();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetSegmentString.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetSegmentString.java
new file mode 100644
index 0000000..a15ca31
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetSegmentString.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import java.util.ArrayList;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+
+/**
+ * A dynamic list of the vertices in a constructed offset curve.
+ * Automatically removes adjacent vertices
+ * which are closer than a given tolerance.
+ *
+ * @author Martin Davis
+ *
+ */
+class OffsetSegmentString
+{
+ private static final Coordinate[] COORDINATE_ARRAY_TYPE = new Coordinate[0];
+
+ private ArrayList ptList;
+ private PrecisionModel precisionModel = null;
+
+ /**
+ * The distance below which two adjacent points on the curve
+ * are considered to be coincident.
+ * This is chosen to be a small fraction of the offset distance.
+ */
+ private double minimimVertexDistance = 0.0;
+
+ public OffsetSegmentString()
+ {
+ ptList = new ArrayList();
+ }
+
+ public void setPrecisionModel(PrecisionModel precisionModel)
+ {
+ this.precisionModel = precisionModel;
+ }
+
+ public void setMinimumVertexDistance(double minimimVertexDistance)
+ {
+ this.minimimVertexDistance = minimimVertexDistance;
+ }
+
+ public void addPt(Coordinate pt)
+ {
+ Coordinate bufPt = new Coordinate(pt);
+ precisionModel.makePrecise(bufPt);
+ // don't add duplicate (or near-duplicate) points
+ if (isRedundant(bufPt))
+ return;
+ ptList.add(bufPt);
+//System.out.println(bufPt);
+ }
+
+ public void addPts(Coordinate[] pt, boolean isForward)
+ {
+ if (isForward) {
+ for (int i = 0; i < pt.length; i++) {
+ addPt(pt[i]);
+ }
+ }
+ else {
+ for (int i = pt.length - 1; i >= 0; i--) {
+ addPt(pt[i]);
+ }
+ }
+ }
+
+ /**
+ * Tests whether the given point is redundant
+ * relative to the previous
+ * point in the list (up to tolerance).
+ *
+ * @param pt
+ * @return true if the point is redundant
+ */
+ private boolean isRedundant(Coordinate pt)
+ {
+ if (ptList.size() < 1)
+ return false;
+ Coordinate lastPt = (Coordinate) ptList.get(ptList.size() - 1);
+ double ptDist = pt.distance(lastPt);
+ if (ptDist < minimimVertexDistance)
+ return true;
+ return false;
+ }
+
+ public void closeRing()
+ {
+ if (ptList.size() < 1) return;
+ Coordinate startPt = new Coordinate((Coordinate) ptList.get(0));
+ Coordinate lastPt = (Coordinate) ptList.get(ptList.size() - 1);
+ Coordinate last2Pt = null;
+ if (ptList.size() >= 2)
+ last2Pt = (Coordinate) ptList.get(ptList.size() - 2);
+ if (startPt.equals(lastPt)) return;
+ ptList.add(startPt);
+ }
+
+ public void reverse()
+ {
+
+ }
+
+ public Coordinate[] getCoordinates()
+ {
+ /*
+ // check that points are a ring - add the startpoint again if they are not
+ if (ptList.size() > 1) {
+ Coordinate start = (Coordinate) ptList.get(0);
+ Coordinate end = (Coordinate) ptList.get(ptList.size() - 1);
+ if (! start.equals(end) ) addPt(start);
+ }
+ */
+ Coordinate[] coord = (Coordinate[]) ptList.toArray(COORDINATE_ARRAY_TYPE);
+ return coord;
+ }
+
+ public String toString()
+ {
+ GeometryFactory fact = new GeometryFactory();
+ LineString line = fact.createLineString(getCoordinates());
+ return line.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/RightmostEdgeFinder.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/RightmostEdgeFinder.java
new file mode 100644
index 0000000..bc078d7
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/RightmostEdgeFinder.java
@@ -0,0 +1,171 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+/**
+ * @version 1.7
+ */
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.DirectedEdgeStar;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.Position;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A RightmostEdgeFinder find the DirectedEdge in a list which has the highest coordinate,
+ * and which is oriented L to R at that point. (I.e. the right side is on the RHS of the edge.)
+ *
+ * @version 1.7
+ */
+class RightmostEdgeFinder {
+
+ //private Coordinate extremeCoord;
+ private int minIndex = -1;
+ private Coordinate minCoord = null;
+ private DirectedEdge minDe = null;
+ private DirectedEdge orientedDe = null;
+ /**
+ * A RightmostEdgeFinder finds the DirectedEdge with the rightmost coordinate.
+ * The DirectedEdge returned is guaranteed to have the R of the world on its RHS.
+ */
+ public RightmostEdgeFinder()
+ {
+ }
+
+ public DirectedEdge getEdge() { return orientedDe; }
+ public Coordinate getCoordinate() { return minCoord; }
+
+ public void findEdge(List dirEdgeList)
+ {
+ /**
+ * Check all forward DirectedEdges only. This is still general,
+ * because each edge has a forward DirectedEdge.
+ */
+ for (Iterator i = dirEdgeList.iterator(); i.hasNext();) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ if (! de.isForward())
+ continue;
+ checkForRightmostCoordinate(de);
+ }
+
+ /**
+ * If the rightmost point is a node, we need to identify which of
+ * the incident edges is rightmost.
+ */
+ Assert.isTrue(minIndex != 0 || minCoord.equals(minDe.getCoordinate()) , "inconsistency in rightmost processing");
+ if (minIndex == 0 ) {
+ findRightmostEdgeAtNode();
+ }
+ else {
+ findRightmostEdgeAtVertex();
+ }
+ /**
+ * now check that the extreme side is the R side.
+ * If not, use the sym instead.
+ */
+ orientedDe = minDe;
+ int rightmostSide = getRightmostSide(minDe, minIndex);
+ if (rightmostSide == Position.LEFT) {
+ orientedDe = minDe.getSym();
+ }
+ }
+ private void findRightmostEdgeAtNode()
+ {
+ Node node = minDe.getNode();
+ DirectedEdgeStar star = (DirectedEdgeStar) node.getEdges();
+ minDe = star.getRightmostEdge();
+ // the DirectedEdge returned by the previous call is not
+ // necessarily in the forward direction. Use the sym edge if it isn't.
+ if (! minDe.isForward()) {
+ minDe = minDe.getSym();
+ minIndex = minDe.getEdge().getCoordinates().length - 1;
+ }
+ }
+ private void findRightmostEdgeAtVertex()
+ {
+ /**
+ * The rightmost point is an interior vertex, so it has a segment on either side of it.
+ * If these segments are both above or below the rightmost point, we need to
+ * determine their relative orientation to decide which is rightmost.
+ */
+ Coordinate[] pts = minDe.getEdge().getCoordinates();
+ Assert.isTrue(minIndex > 0 && minIndex < pts.length, "rightmost point expected to be interior vertex of edge");
+ Coordinate pPrev = pts[minIndex - 1];
+ Coordinate pNext = pts[minIndex + 1];
+ int orientation = Orientation.index(minCoord, pNext, pPrev);
+ boolean usePrev = false;
+ // both segments are below min point
+ if (pPrev.y < minCoord.y && pNext.y < minCoord.y
+ && orientation == Orientation.COUNTERCLOCKWISE) {
+ usePrev = true;
+ }
+ else if (pPrev.y > minCoord.y && pNext.y > minCoord.y
+ && orientation == Orientation.CLOCKWISE) {
+ usePrev = true;
+ }
+ // if both segments are on the same side, do nothing - either is safe
+ // to select as a rightmost segment
+ if (usePrev) {
+ minIndex = minIndex - 1;
+ }
+ }
+ private void checkForRightmostCoordinate(DirectedEdge de)
+ {
+ Coordinate[] coord = de.getEdge().getCoordinates();
+ for (int i = 0; i < coord.length - 1; i++) {
+ // only check vertices which are the start or end point of a non-horizontal segment
+ // <FIX> MD 19 Sep 03 - NO! we can test all vertices, since the rightmost must have a non-horiz segment adjacent to it
+ if (minCoord == null || coord[i].x > minCoord.x ) {
+ minDe = de;
+ minIndex = i;
+ minCoord = coord[i];
+ }
+ //}
+ }
+ }
+
+ private int getRightmostSide(DirectedEdge de, int index)
+ {
+ int side = getRightmostSideOfSegment(de, index);
+ if (side < 0)
+ side = getRightmostSideOfSegment(de, index - 1);
+ if (side < 0) {
+ // reaching here can indicate that segment is horizontal
+ //Assert.shouldNeverReachHere("problem with finding rightmost side of segment at " + de.getCoordinate());
+ // testing only
+ minCoord = null;
+ checkForRightmostCoordinate(de);
+ }
+ return side;
+ }
+
+ private int getRightmostSideOfSegment(DirectedEdge de, int i)
+ {
+ Edge e = de.getEdge();
+ Coordinate coord[] = e.getCoordinates();
+
+ if (i < 0 || i + 1 >= coord.length) return -1;
+ if (coord[i].y == coord[i + 1].y) return -1; // indicates edge is parallel to x-axis
+
+ int pos = Position.LEFT;
+ if (coord[i].y < coord[i + 1].y) pos = Position.RIGHT;
+ return pos;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/SubgraphDepthLocater.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/SubgraphDepthLocater.java
new file mode 100644
index 0000000..5bf3124
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/SubgraphDepthLocater.java
@@ -0,0 +1,245 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.Position;
+
+/**
+ * Locates a subgraph inside a set of subgraphs,
+ * in order to determine the outside depth of the subgraph.
+ * The input subgraphs are assumed to have had depths
+ * already calculated for their edges.
+ *
+ * @version 1.7
+ */
+class SubgraphDepthLocater
+{
+ private Collection subgraphs;
+ private LineSegment seg = new LineSegment();
+
+ public SubgraphDepthLocater(List subgraphs)
+ {
+ this.subgraphs = subgraphs;
+ }
+
+ public int getDepth(Coordinate p)
+ {
+ List stabbedSegments = findStabbedSegments(p);
+ // if no segments on stabbing line subgraph must be outside all others.
+ if (stabbedSegments.size() == 0)
+ return 0;
+ DepthSegment ds = (DepthSegment) Collections.min(stabbedSegments);
+ return ds.leftDepth;
+ }
+
+ /**
+ * Finds all non-horizontal segments intersecting the stabbing line.
+ * The stabbing line is the ray to the right of stabbingRayLeftPt.
+ *
+ * @param stabbingRayLeftPt the left-hand origin of the stabbing line
+ * @return a List of {@link DepthSegments} intersecting the stabbing line
+ */
+ private List findStabbedSegments(Coordinate stabbingRayLeftPt)
+ {
+ List stabbedSegments = new ArrayList();
+ for (Iterator i = subgraphs.iterator(); i.hasNext(); ) {
+ BufferSubgraph bsg = (BufferSubgraph) i.next();
+
+ // optimization - don't bother checking subgraphs which the ray does not intersect
+ Envelope env = bsg.getEnvelope();
+ if (stabbingRayLeftPt.y < env.getMinY()
+ || stabbingRayLeftPt.y > env.getMaxY())
+ continue;
+
+ findStabbedSegments(stabbingRayLeftPt, bsg.getDirectedEdges(), stabbedSegments);
+ }
+ return stabbedSegments;
+ }
+
+ /**
+ * Finds all non-horizontal segments intersecting the stabbing line
+ * in the list of dirEdges.
+ * The stabbing line is the ray to the right of stabbingRayLeftPt.
+ *
+ * @param stabbingRayLeftPt the left-hand origin of the stabbing line
+ * @param stabbedSegments the current list of {@link DepthSegments} intersecting the stabbing line
+ */
+ private void findStabbedSegments(Coordinate stabbingRayLeftPt,
+ List dirEdges,
+ List stabbedSegments)
+ {
+ /**
+ * Check all forward DirectedEdges only. This is still general,
+ * because each Edge has a forward DirectedEdge.
+ */
+ for (Iterator i = dirEdges.iterator(); i.hasNext();) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ if (! de.isForward())
+ continue;
+ findStabbedSegments(stabbingRayLeftPt, de, stabbedSegments);
+ }
+ }
+
+ /**
+ * Finds all non-horizontal segments intersecting the stabbing line
+ * in the input dirEdge.
+ * The stabbing line is the ray to the right of stabbingRayLeftPt.
+ *
+ * @param stabbingRayLeftPt the left-hand origin of the stabbing line
+ * @param stabbedSegments the current list of {@link DepthSegments} intersecting the stabbing line
+ */
+ private void findStabbedSegments(Coordinate stabbingRayLeftPt,
+ DirectedEdge dirEdge,
+ List stabbedSegments)
+ {
+ Coordinate[] pts = dirEdge.getEdge().getCoordinates();
+ for (int i = 0; i < pts.length - 1; i++) {
+ seg.p0 = pts[i];
+ seg.p1 = pts[i + 1];
+ // ensure segment always points upwards
+ if (seg.p0.y > seg.p1.y)
+ seg.reverse();
+
+ // skip segment if it is left of the stabbing line
+ double maxx = Math.max(seg.p0.x, seg.p1.x);
+ if (maxx < stabbingRayLeftPt.x)
+ continue;
+
+ // skip horizontal segments (there will be a non-horizontal one carrying the same depth info
+ if (seg.isHorizontal())
+ continue;
+
+ // skip if segment is above or below stabbing line
+ if (stabbingRayLeftPt.y < seg.p0.y || stabbingRayLeftPt.y > seg.p1.y)
+ continue;
+
+ // skip if stabbing ray is right of the segment
+ if (Orientation.index(seg.p0, seg.p1, stabbingRayLeftPt)
+ == Orientation.RIGHT)
+ continue;
+
+ // stabbing line cuts this segment, so record it
+ int depth = dirEdge.getDepth(Position.LEFT);
+ // if segment direction was flipped, use RHS depth instead
+ if (! seg.p0.equals(pts[i]))
+ depth = dirEdge.getDepth(Position.RIGHT);
+ DepthSegment ds = new DepthSegment(seg, depth);
+ stabbedSegments.add(ds);
+ }
+ }
+
+
+ /**
+ * A segment from a directed edge which has been assigned a depth value
+ * for its sides.
+ */
+ static class DepthSegment
+ implements Comparable
+ {
+ private LineSegment upwardSeg;
+ private int leftDepth;
+
+ public DepthSegment(LineSegment seg, int depth)
+ {
+ // input seg is assumed to be normalized
+ upwardSeg = new LineSegment(seg);
+ //upwardSeg.normalize();
+ this.leftDepth = depth;
+ }
+ /**
+ * Defines a comparison operation on DepthSegments
+ * which orders them left to right.
+ * Assumes the segments are normalized.
+ * <p>
+ * The definition of the ordering is:
+ * <ul>
+ * <li>-1 : if DS1.seg is left of or below DS2.seg (DS1 < DS2)
+ * <li>1 : if DS1.seg is right of or above DS2.seg (DS1 > DS2)
+ * <li>0 : if the segments are identical
+ * </ul>
+ *
+ * KNOWN BUGS:
+ * <ul>
+ * <li>The logic does not obey the {@link Comparator.compareTo} contract.
+ * This is acceptable for the intended usage, but may cause problems if used with some
+ * utilities in the Java standard library (e.g. {@link Collections.sort()}.
+ * </ul>
+ *
+ * @param obj a DepthSegment
+ * @return the comparison value
+ */
+ public int compareTo(Object obj)
+ {
+ DepthSegment other = (DepthSegment) obj;
+
+ // fast check if segments are trivially ordered along X
+ if (upwardSeg.minX() >= other.upwardSeg.maxX()) return 1;
+ if (upwardSeg.maxX() <= other.upwardSeg.minX()) return -1;
+
+ /**
+ * try and compute a determinate orientation for the segments.
+ * Test returns 1 if other is left of this (i.e. this > other)
+ */
+ int orientIndex = upwardSeg.orientationIndex(other.upwardSeg);
+ if (orientIndex != 0) return orientIndex;
+
+ /**
+ * If comparison between this and other is indeterminate,
+ * try the opposite call order.
+ * The sign of the result needs to be flipped.
+ */
+ orientIndex = -1 * other.upwardSeg.orientationIndex(upwardSeg);
+ if (orientIndex != 0) return orientIndex;
+
+ // otherwise, use standard lexocographic segment ordering
+ return upwardSeg.compareTo(other.upwardSeg);
+ }
+
+ /**
+ * Compare two collinear segments for left-most ordering.
+ * If segs are vertical, use vertical ordering for comparison.
+ * If segs are equal, return 0.
+ * Segments are assumed to be directed so that the second coordinate is >= to the first
+ * (e.g. up and to the right).
+ *
+ * @param seg0 a segment to compare
+ * @param seg1 a segment to compare
+ * @return
+ */
+ private int compareX(LineSegment seg0, LineSegment seg1)
+ {
+ int compare0 = seg0.p0.compareTo(seg1.p0);
+ if (compare0 != 0)
+ return compare0;
+ return seg0.p1.compareTo(seg1.p1);
+
+ }
+
+ public String toString()
+ {
+ return upwardSeg.toString();
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/package.html
new file mode 100644
index 0000000..1dec4cc
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Provides classes for computing buffers of geometries
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferCurveMaximumDistanceFinder.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferCurveMaximumDistanceFinder.java
new file mode 100644
index 0000000..ff6dc3c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferCurveMaximumDistanceFinder.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer.validate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Finds the approximate maximum distance from a buffer curve to
+ * the originating geometry.
+ * This is similar to the Discrete Oriented Hausdorff distance
+ * from the buffer curve to the input.
+ * <p>
+ * The approximate maximum distance is determined by testing
+ * all vertices in the buffer curve, as well
+ * as midpoints of the curve segments.
+ * Due to the way buffer curves are constructed, this
+ * should be a very close approximation.
+ *
+ * @author mbdavis
+ *
+ */
+public class BufferCurveMaximumDistanceFinder
+{
+ private Geometry inputGeom;
+ private PointPairDistance maxPtDist = new PointPairDistance();
+
+ public BufferCurveMaximumDistanceFinder(Geometry inputGeom)
+ {
+ this.inputGeom = inputGeom;
+ }
+
+ public double findDistance(Geometry bufferCurve)
+ {
+ computeMaxVertexDistance(bufferCurve);
+ computeMaxMidpointDistance(bufferCurve);
+ return maxPtDist.getDistance();
+ }
+
+ public PointPairDistance getDistancePoints()
+ {
+ return maxPtDist;
+ }
+ private void computeMaxVertexDistance(Geometry curve)
+ {
+ MaxPointDistanceFilter distFilter = new MaxPointDistanceFilter(inputGeom);
+ curve.apply(distFilter);
+ maxPtDist.setMaximum(distFilter.getMaxPointDistance());
+ }
+
+ private void computeMaxMidpointDistance(Geometry curve)
+ {
+ MaxMidpointDistanceFilter distFilter = new MaxMidpointDistanceFilter(inputGeom);
+ curve.apply(distFilter);
+ maxPtDist.setMaximum(distFilter.getMaxPointDistance());
+ }
+
+ public static class MaxPointDistanceFilter implements CoordinateFilter {
+ private PointPairDistance maxPtDist = new PointPairDistance();
+ private PointPairDistance minPtDist = new PointPairDistance();
+ private Geometry geom;
+
+ public MaxPointDistanceFilter(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public void filter(Coordinate pt) {
+ minPtDist.initialize();
+ DistanceToPointFinder.computeDistance(geom, pt, minPtDist);
+ maxPtDist.setMaximum(minPtDist);
+ }
+
+ public PointPairDistance getMaxPointDistance() {
+ return maxPtDist;
+ }
+ }
+
+ public static class MaxMidpointDistanceFilter
+ implements CoordinateSequenceFilter
+ {
+ private PointPairDistance maxPtDist = new PointPairDistance();
+ private PointPairDistance minPtDist = new PointPairDistance();
+ private Geometry geom;
+
+ public MaxMidpointDistanceFilter(Geometry geom) {
+ this.geom = geom;
+ }
+
+ public void filter(CoordinateSequence seq, int index)
+ {
+ if (index == 0)
+ return;
+
+ Coordinate p0 = seq.getCoordinate(index - 1);
+ Coordinate p1 = seq.getCoordinate(index);
+ Coordinate midPt = new Coordinate(
+ (p0.x + p1.x)/2,
+ (p0.y + p1.y)/2);
+
+ minPtDist.initialize();
+ DistanceToPointFinder.computeDistance(geom, midPt, minPtDist);
+ maxPtDist.setMaximum(minPtDist);
+ }
+
+ public boolean isGeometryChanged() { return false; }
+
+ public boolean isDone() { return false; }
+
+ public PointPairDistance getMaxPointDistance() {
+ return maxPtDist;
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferDistanceValidator.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferDistanceValidator.java
new file mode 100644
index 0000000..59a3450
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferDistanceValidator.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer.validate;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.distance.DiscreteHausdorffDistance;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.geom.util.PolygonExtracter;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.operation.distance.DistanceOp;
+
+/**
+ * Validates that a given buffer curve lies an appropriate distance
+ * from the input generating it.
+ * Useful only for round buffers (cap and join).
+ * Can be used for either positive or negative distances.
+ * <p>
+ * This is a heuristic test, and may return false positive results
+ * (I.e. it may fail to detect an invalid result.)
+ * It should never return a false negative result, however
+ * (I.e. it should never report a valid result as invalid.)
+ *
+ * @author mbdavis
+ *
+ */
+public class BufferDistanceValidator
+{
+ private static boolean VERBOSE = false;
+ /**
+ * Maximum allowable fraction of buffer distance the
+ * actual distance can differ by.
+ * 1% sometimes causes an error - 1.2% should be safe.
+ */
+ private static final double MAX_DISTANCE_DIFF_FRAC = .012;
+
+ private Geometry input;
+ private double bufDistance;
+ private Geometry result;
+
+ private double minValidDistance;
+ private double maxValidDistance;
+
+ private double minDistanceFound;
+ private double maxDistanceFound;
+
+ private boolean isValid = true;
+ private String errMsg = null;
+ private Coordinate errorLocation = null;
+ private Geometry errorIndicator = null;
+
+ public BufferDistanceValidator(Geometry input, double bufDistance, Geometry result)
+ {
+ this.input = input;
+ this.bufDistance = bufDistance;
+ this.result = result;
+ }
+
+ public boolean isValid()
+ {
+ double posDistance = Math.abs(bufDistance);
+ double distDelta = MAX_DISTANCE_DIFF_FRAC * posDistance;
+ minValidDistance = posDistance - distDelta;
+ maxValidDistance = posDistance + distDelta;
+
+ // can't use this test if either is empty
+ if (input.isEmpty() || result.isEmpty())
+ return true;
+
+ if (bufDistance > 0.0) {
+ checkPositiveValid();
+ }
+ else {
+ checkNegativeValid();
+ }
+ if (VERBOSE) {
+ System.out.println("Min Dist= " + minDistanceFound + " err= "
+ + (1.0 - minDistanceFound / bufDistance)
+ + " Max Dist= " + maxDistanceFound + " err= "
+ + (maxDistanceFound / bufDistance - 1.0)
+ );
+ }
+ return isValid;
+ }
+
+ public String getErrorMessage()
+ {
+ return errMsg;
+ }
+
+ public Coordinate getErrorLocation()
+ {
+ return errorLocation;
+ }
+
+ /**
+ * Gets a geometry which indicates the location and nature of a validation failure.
+ * <p>
+ * The indicator is a line segment showing the location and size
+ * of the distance discrepancy.
+ *
+ * @return a geometric error indicator
+ * or null if no error was found
+ */
+ public Geometry getErrorIndicator()
+ {
+ return errorIndicator;
+ }
+
+ private void checkPositiveValid()
+ {
+ Geometry bufCurve = result.getBoundary();
+ checkMinimumDistance(input, bufCurve, minValidDistance);
+ if (! isValid) return;
+
+ checkMaximumDistance(input, bufCurve, maxValidDistance);
+ }
+
+ private void checkNegativeValid()
+ {
+ // Assert: only polygonal inputs can be checked for negative buffers
+
+ // MD - could generalize this to handle GCs too
+ if (! (input instanceof Polygon
+ || input instanceof MultiPolygon
+ || input instanceof GeometryCollection
+ )) {
+ return;
+ }
+ Geometry inputCurve = getPolygonLines(input);
+ checkMinimumDistance(inputCurve, result, minValidDistance);
+ if (! isValid) return;
+
+ checkMaximumDistance(inputCurve, result, maxValidDistance);
+ }
+
+ private Geometry getPolygonLines(Geometry g)
+ {
+ List lines = new ArrayList();
+ LinearComponentExtracter lineExtracter = new LinearComponentExtracter(lines);
+ List polys = PolygonExtracter.getPolygons(g);
+ for (Iterator i = polys.iterator(); i.hasNext(); ) {
+ Polygon poly = (Polygon) i.next();
+ poly.apply(lineExtracter);
+ }
+ return g.getFactory().buildGeometry(lines);
+ }
+
+ /**
+ * Checks that two geometries are at least a minimum distance apart.
+ *
+ * @param g1 a geometry
+ * @param g2 a geometry
+ * @param minDist the minimum distance the geometries should be separated by
+ */
+ private void checkMinimumDistance(Geometry g1, Geometry g2, double minDist)
+ {
+ DistanceOp distOp = new DistanceOp(g1, g2, minDist);
+ minDistanceFound = distOp.distance();
+
+
+ if (minDistanceFound < minDist) {
+ isValid = false;
+ Coordinate[] pts = distOp.nearestPoints();
+ errorLocation = distOp.nearestPoints()[1];
+ errorIndicator = g1.getFactory().createLineString(pts);
+ errMsg = "Distance between buffer curve and input is too small "
+ + "(" + minDistanceFound
+ + " at " + WKTWriter.toLineString(pts[0], pts[1]) +" )";
+ }
+ }
+
+ /**
+ * Checks that the furthest distance from the buffer curve to the input
+ * is less than the given maximum distance.
+ * This uses the Oriented Hausdorff distance metric.
+ * It corresponds to finding
+ * the point on the buffer curve which is furthest from <i>some</i> point on the input.
+ *
+ * @param input a geometry
+ * @param bufCurve a geometry
+ * @param maxDist the maximum distance that a buffer result can be from the input
+ */
+ private void checkMaximumDistance(Geometry input, Geometry bufCurve, double maxDist)
+ {
+// BufferCurveMaximumDistanceFinder maxDistFinder = new BufferCurveMaximumDistanceFinder(input);
+// maxDistanceFound = maxDistFinder.findDistance(bufCurve);
+
+ DiscreteHausdorffDistance haus = new DiscreteHausdorffDistance(bufCurve, input);
+ haus.setDensifyFraction(0.25);
+ maxDistanceFound = haus.orientedDistance();
+
+ if (maxDistanceFound > maxDist) {
+ isValid = false;
+ Coordinate[] pts = haus.getCoordinates();
+ errorLocation = pts[1];
+ errorIndicator = input.getFactory().createLineString(pts);
+ errMsg = "Distance between buffer curve and input is too large "
+ + "(" + maxDistanceFound
+ + " at " + WKTWriter.toLineString(pts[0], pts[1]) +")";
+ }
+ }
+
+ /*
+ private void OLDcheckMaximumDistance(Geometry input, Geometry bufCurve, double maxDist)
+ {
+ BufferCurveMaximumDistanceFinder maxDistFinder = new BufferCurveMaximumDistanceFinder(input);
+ maxDistanceFound = maxDistFinder.findDistance(bufCurve);
+
+
+ if (maxDistanceFound > maxDist) {
+ isValid = false;
+ PointPairDistance ptPairDist = maxDistFinder.getDistancePoints();
+ errorLocation = ptPairDist.getCoordinate(1);
+ errMsg = "Distance between buffer curve and input is too large "
+ + "(" + ptPairDist.getDistance()
+ + " at " + ptPairDist.toString() +")";
+ }
+ }
+ */
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferResultValidator.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferResultValidator.java
new file mode 100644
index 0000000..860877e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferResultValidator.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer.validate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Validates that the result of a buffer operation
+ * is geometrically correct, within a computed tolerance.
+ * <p>
+ * This is a heuristic test, and may return false positive results
+ * (I.e. it may fail to detect an invalid result.)
+ * It should never return a false negative result, however
+ * (I.e. it should never report a valid result as invalid.)
+ * <p>
+ * This test may be (much) more expensive than the original
+ * buffer computation.
+ *
+ * @author Martin Davis
+ */
+public class BufferResultValidator
+{
+ private static boolean VERBOSE = false;
+
+ /**
+ * Maximum allowable fraction of buffer distance the
+ * actual distance can differ by.
+ * 1% sometimes causes an error - 1.2% should be safe.
+ */
+ private static final double MAX_ENV_DIFF_FRAC = .012;
+
+ public static boolean isValid(Geometry g, double distance, Geometry result)
+ {
+ BufferResultValidator validator = new BufferResultValidator(g, distance, result);
+ if (validator.isValid())
+ return true;
+ return false;
+ }
+
+ /**
+ * Checks whether the geometry buffer is valid,
+ * and returns an error message if not.
+ *
+ * @param g
+ * @param distance
+ * @param result
+ * @return an appropriate error message
+ * or null if the buffer is valid
+ */
+ public static String isValidMsg(Geometry g, double distance, Geometry result)
+ {
+ BufferResultValidator validator = new BufferResultValidator(g, distance, result);
+ if (! validator.isValid())
+ return validator.getErrorMessage();
+ return null;
+ }
+
+ private Geometry input;
+ private double distance;
+ private Geometry result;
+ private boolean isValid = true;
+ private String errorMsg = null;
+ private Coordinate errorLocation = null;
+ private Geometry errorIndicator = null;
+
+ public BufferResultValidator(Geometry input, double distance, Geometry result)
+ {
+ this.input = input;
+ this.distance = distance;
+ this.result = result;
+ }
+
+ public boolean isValid()
+ {
+ checkPolygonal();
+ if (! isValid) return isValid;
+ checkExpectedEmpty();
+ if (! isValid) return isValid;
+ checkEnvelope();
+ if (! isValid) return isValid;
+ checkArea();
+ if (! isValid) return isValid;
+ checkDistance();
+ return isValid;
+ }
+
+ public String getErrorMessage()
+ {
+ return errorMsg;
+ }
+
+ public Coordinate getErrorLocation()
+ {
+ return errorLocation;
+ }
+
+ /**
+ * Gets a geometry which indicates the location and nature of a validation failure.
+ * <p>
+ * If the failure is due to the buffer curve being too far or too close
+ * to the input, the indicator is a line segment showing the location and size
+ * of the discrepancy.
+ *
+ * @return a geometric error indicator
+ * or null if no error was found
+ */
+ public Geometry getErrorIndicator()
+ {
+ return errorIndicator;
+ }
+
+ private void report(String checkName)
+ {
+ if (! VERBOSE) return;
+ System.out.println("Check " + checkName + ": "
+ + (isValid ? "passed" : "FAILED"));
+ }
+
+ private void checkPolygonal()
+ {
+ if (! (result instanceof Polygon
+ || result instanceof MultiPolygon))
+ isValid = false;
+ errorMsg = "Result is not polygonal";
+ errorIndicator = result;
+ report("Polygonal");
+ }
+
+ private void checkExpectedEmpty()
+ {
+ // can't check areal features
+ if (input.getDimension() >= 2) return;
+ // can't check positive distances
+ if (distance > 0.0) return;
+
+ // at this point can expect an empty result
+ if (! result.isEmpty()) {
+ isValid = false;
+ errorMsg = "Result is non-empty";
+ errorIndicator = result;
+ }
+ report("ExpectedEmpty");
+ }
+
+ private void checkEnvelope()
+ {
+ if (distance < 0.0) return;
+
+ double padding = distance * MAX_ENV_DIFF_FRAC;
+ if (padding == 0.0) padding = 0.001;
+
+ Envelope expectedEnv = new Envelope(input.getEnvelopeInternal());
+ expectedEnv.expandBy(distance);
+
+ Envelope bufEnv = new Envelope(result.getEnvelopeInternal());
+ bufEnv.expandBy(padding);
+
+ if (! bufEnv.contains(expectedEnv)) {
+ isValid = false;
+ errorMsg = "Buffer envelope is incorrect";
+ errorIndicator = input.getFactory().toGeometry(bufEnv);
+ }
+ report("Envelope");
+ }
+
+ private void checkArea()
+ {
+ double inputArea = input.getArea();
+ double resultArea = result.getArea();
+
+ if (distance > 0.0
+ && inputArea > resultArea) {
+ isValid = false;
+ errorMsg = "Area of positive buffer is smaller than input";
+ errorIndicator = result;
+ }
+ if (distance < 0.0
+ && inputArea < resultArea) {
+ isValid = false;
+ errorMsg = "Area of negative buffer is larger than input";
+ errorIndicator = result;
+ }
+ report("Area");
+ }
+
+ private void checkDistance()
+ {
+ BufferDistanceValidator distValid = new BufferDistanceValidator(input, distance, result);
+ if (! distValid.isValid()) {
+ isValid = false;
+ errorMsg = distValid.getErrorMessage();
+ errorLocation = distValid.getErrorLocation();
+ errorIndicator = distValid.getErrorIndicator();
+ }
+ report("Distance");
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/DistanceToPointFinder.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/DistanceToPointFinder.java
new file mode 100644
index 0000000..5a4c486
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/DistanceToPointFinder.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer.validate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Computes the Euclidean distance (L2 metric) from a Point to a Geometry.
+ * Also computes two points which are separated by the distance.
+ */
+public class DistanceToPointFinder {
+
+ public DistanceToPointFinder() {
+ }
+
+ public static void computeDistance(Geometry geom, Coordinate pt, PointPairDistance ptDist)
+ {
+ if (geom instanceof LineString) {
+ computeDistance((LineString) geom, pt, ptDist);
+ }
+ else if (geom instanceof Polygon) {
+ computeDistance((Polygon) geom, pt, ptDist);
+ }
+ else if (geom instanceof GeometryCollection) {
+ GeometryCollection gc = (GeometryCollection) geom;
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = gc.getGeometryN(i);
+ computeDistance(g, pt, ptDist);
+ }
+ }
+ else { // assume geom is Point
+ ptDist.setMinimum(geom.getCoordinate(), pt);
+ }
+ }
+ public static void computeDistance(LineString line, Coordinate pt, PointPairDistance ptDist)
+ {
+ Coordinate[] coords = line.getCoordinates();
+ LineSegment tempSegment = new LineSegment();
+ for (int i = 0; i < coords.length - 1; i++) {
+ tempSegment.setCoordinates(coords[i], coords[i + 1]);
+ // this is somewhat inefficient - could do better
+ Coordinate closestPt = tempSegment.closestPoint(pt);
+ ptDist.setMinimum(closestPt, pt);
+ }
+ }
+
+ public static void computeDistance(LineSegment segment, Coordinate pt, PointPairDistance ptDist)
+ {
+ Coordinate closestPt = segment.closestPoint(pt);
+ ptDist.setMinimum(closestPt, pt);
+ }
+
+ public static void computeDistance(Polygon poly, Coordinate pt, PointPairDistance ptDist)
+ {
+ computeDistance(poly.getExteriorRing(), pt, ptDist);
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ computeDistance(poly.getInteriorRingN(i), pt, ptDist);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/PointPairDistance.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/PointPairDistance.java
new file mode 100644
index 0000000..af0d480
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/PointPairDistance.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer.validate;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Contains a pair of points and the distance between them.
+ * Provides methods to update with a new point pair with
+ * either maximum or minimum distance.
+ */
+public class PointPairDistance {
+
+ private Coordinate[] pt = { new Coordinate(), new Coordinate() };
+ private double distance = Double.NaN;
+ private boolean isNull = true;
+
+ public PointPairDistance()
+ {
+ }
+
+ public void initialize() { isNull = true; }
+
+ public void initialize(Coordinate p0, Coordinate p1)
+ {
+ pt[0].setCoordinate(p0);
+ pt[1].setCoordinate(p1);
+ distance = p0.distance(p1);
+ isNull = false;
+ }
+
+ /**
+ * Initializes the points, avoiding recomputing the distance.
+ * @param p0
+ * @param p1
+ * @param distance the distance between p0 and p1
+ */
+ private void initialize(Coordinate p0, Coordinate p1, double distance)
+ {
+ pt[0].setCoordinate(p0);
+ pt[1].setCoordinate(p1);
+ this.distance = distance;
+ isNull = false;
+ }
+
+ public double getDistance() { return distance; }
+
+ public Coordinate[] getCoordinates() { return pt; }
+
+ public Coordinate getCoordinate(int i) { return pt[i]; }
+
+ public void setMaximum(PointPairDistance ptDist)
+ {
+ setMaximum(ptDist.pt[0], ptDist.pt[1]);
+ }
+
+ public void setMaximum(Coordinate p0, Coordinate p1)
+ {
+ if (isNull) {
+ initialize(p0, p1);
+ return;
+ }
+ double dist = p0.distance(p1);
+ if (dist > distance)
+ initialize(p0, p1, dist);
+ }
+
+ public void setMinimum(PointPairDistance ptDist)
+ {
+ setMinimum(ptDist.pt[0], ptDist.pt[1]);
+ }
+
+ public void setMinimum(Coordinate p0, Coordinate p1)
+ {
+ if (isNull) {
+ initialize(p0, p1);
+ return;
+ }
+ double dist = p0.distance(p1);
+ if (dist < distance)
+ initialize(p0, p1, dist);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/package.html
new file mode 100644
index 0000000..ffca7a0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to perform validation of the results of buffer operations.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/ConnectedElementLocationFilter.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance/ConnectedElementLocationFilter.java
new file mode 100644
index 0000000..967c357
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/ConnectedElementLocationFilter.java
@@ -0,0 +1,65 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.distance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * A ConnectedElementPointFilter extracts a single point
+ * from each connected element in a Geometry
+ * (e.g. a polygon, linestring or point)
+ * and returns them in a list. The elements of the list are
+ * {@link org.locationtech.jts.operation.distance.GeometryLocation}s.
+ *
+ * @version 1.7
+ */
+public class ConnectedElementLocationFilter
+ implements GeometryFilter
+{
+
+ /**
+ * Returns a list containing a point from each Polygon, LineString, and Point
+ * found inside the specified geometry. Thus, if the specified geometry is
+ * not a GeometryCollection, an empty list will be returned. The elements of the list
+ * are {@link org.locationtech.jts.operation.distance.GeometryLocation}s.
+ */
+ public static List getLocations(Geometry geom)
+ {
+ List locations = new ArrayList();
+ geom.apply(new ConnectedElementLocationFilter(locations));
+ return locations;
+ }
+
+ private List locations;
+
+ ConnectedElementLocationFilter(List locations)
+ {
+ this.locations = locations;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (geom instanceof Point
+ || geom instanceof LineString
+ || geom instanceof Polygon )
+ locations.add(new GeometryLocation(geom, 0, geom.getCoordinate()));
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/ConnectedElementPointFilter.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance/ConnectedElementPointFilter.java
new file mode 100644
index 0000000..011409e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/ConnectedElementPointFilter.java
@@ -0,0 +1,63 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.distance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Extracts a single point
+ * from each connected element in a Geometry
+ * (e.g. a polygon, linestring or point)
+ * and returns them in a list
+ *
+ * @version 1.7
+ */
+public class ConnectedElementPointFilter
+ implements GeometryFilter
+{
+
+ /**
+ * Returns a list containing a Coordinate from each Polygon, LineString, and Point
+ * found inside the specified geometry. Thus, if the specified geometry is
+ * not a GeometryCollection, an empty list will be returned.
+ */
+ public static List getCoordinates(Geometry geom)
+ {
+ List pts = new ArrayList();
+ geom.apply(new ConnectedElementPointFilter(pts));
+ return pts;
+ }
+
+ private List pts;
+
+ ConnectedElementPointFilter(List pts)
+ {
+ this.pts = pts;
+ }
+
+ public void filter(Geometry geom)
+ {
+ if (geom instanceof Point
+ || geom instanceof LineString
+ || geom instanceof Polygon )
+ pts.add(geom.getCoordinate());
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/DistanceOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance/DistanceOp.java
new file mode 100644
index 0000000..e09c966
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/DistanceOp.java
@@ -0,0 +1,418 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.distance;
+
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.geom.util.PointExtracter;
+import org.locationtech.jts.geom.util.PolygonExtracter;
+
+/**
+ * Find two points on two {@link Geometry}s which lie
+ * within a given distance, or else are the nearest points
+ * on the geometries (in which case this also
+ * provides the distance between the geometries).
+ * <p>
+ * The distance computation also finds a pair of points in the input geometries
+ * which have the minimum distance between them.
+ * If a point lies in the interior of a line segment,
+ * the coordinate computed is a close
+ * approximation to the exact point.
+ * <p>
+ * The algorithms used are straightforward O(n^2)
+ * comparisons. This worst-case performance could be improved on
+ * by using Voronoi techniques or spatial indexes.
+ *
+ * @version 1.7
+ */
+public class DistanceOp
+{
+ /**
+ * Compute the distance between the nearest points of two geometries.
+ * @param g0 a {@link Geometry}
+ * @param g1 another {@link Geometry}
+ * @return the distance between the geometries
+ */
+ public static double distance(Geometry g0, Geometry g1)
+ {
+ DistanceOp distOp = new DistanceOp(g0, g1);
+ return distOp.distance();
+ }
+
+ /**
+ * Test whether two geometries lie within a given distance of each other.
+ * @param g0 a {@link Geometry}
+ * @param g1 another {@link Geometry}
+ * @param distance the distance to test
+ * @return true if g0.distance(g1) <= distance
+ */
+ public static boolean isWithinDistance(Geometry g0, Geometry g1, double distance)
+ {
+ DistanceOp distOp = new DistanceOp(g0, g1, distance);
+ return distOp.distance() <= distance;
+ }
+
+ /**
+ * Compute the the nearest points of two geometries.
+ * The points are presented in the same order as the input Geometries.
+ *
+ * @param g0 a {@link Geometry}
+ * @param g1 another {@link Geometry}
+ * @return the nearest points in the geometries
+ */
+ public static Coordinate[] nearestPoints(Geometry g0, Geometry g1)
+ {
+ DistanceOp distOp = new DistanceOp(g0, g1);
+ return distOp.nearestPoints();
+ }
+
+ /**
+ * Compute the the closest points of two geometries.
+ * The points are presented in the same order as the input Geometries.
+ *
+ * @param g0 a {@link Geometry}
+ * @param g1 another {@link Geometry}
+ * @return the closest points in the geometries
+ * @deprecated renamed to nearestPoints
+ */
+ public static Coordinate[] closestPoints(Geometry g0, Geometry g1)
+ {
+ DistanceOp distOp = new DistanceOp(g0, g1);
+ return distOp.nearestPoints();
+ }
+
+ // input
+ private Geometry[] geom;
+ private double terminateDistance = 0.0;
+ // working
+ private PointLocator ptLocator = new PointLocator();
+ private GeometryLocation[] minDistanceLocation;
+ private double minDistance = Double.MAX_VALUE;
+
+ /**
+ * Constructs a DistanceOp that computes the distance and nearest points between
+ * the two specified geometries.
+ * @param g0 a Geometry
+ * @param g1 a Geometry
+ */
+ public DistanceOp(Geometry g0, Geometry g1)
+ {
+ this(g0, g1, 0.0);
+ }
+
+ /**
+ * Constructs a DistanceOp that computes the distance and nearest points between
+ * the two specified geometries.
+ * @param g0 a Geometry
+ * @param g1 a Geometry
+ * @param terminateDistance the distance on which to terminate the search
+ */
+ public DistanceOp(Geometry g0, Geometry g1, double terminateDistance)
+ {
+ this.geom = new Geometry[2];
+ geom[0] = g0;
+ geom[1] = g1;
+ this.terminateDistance = terminateDistance;
+ }
+
+ /**
+ * Report the distance between the nearest points on the input geometries.
+ *
+ * @return the distance between the geometries
+ * or 0 if either input geometry is empty
+ * @throws IllegalArgumentException if either input geometry is null
+ */
+ public double distance()
+ {
+ if (geom[0] == null || geom[1] == null)
+ throw new IllegalArgumentException("null geometries are not supported");
+ if (geom[0].isEmpty() || geom[1].isEmpty())
+ return 0.0;
+
+ computeMinDistance();
+ return minDistance;
+ }
+
+ /**
+ * Report the coordinates of the nearest points in the input geometries.
+ * The points are presented in the same order as the input Geometries.
+ *
+ * @return a pair of {@link Coordinate}s of the nearest points
+ */
+ public Coordinate[] nearestPoints()
+ {
+ computeMinDistance();
+ Coordinate[] nearestPts
+ = new Coordinate[] {
+ minDistanceLocation[0].getCoordinate(),
+ minDistanceLocation[1].getCoordinate() };
+ return nearestPts;
+ }
+
+ /**
+ *
+ * @return a pair of {@link Coordinate}s of the nearest points
+ * @deprecated renamed to nearestPoints
+ */
+ public Coordinate[] closestPoints()
+ {
+ return nearestPoints();
+ }
+
+ /**
+ * Report the locations of the nearest points in the input geometries.
+ * The locations are presented in the same order as the input Geometries.
+ *
+ * @return a pair of {@link GeometryLocation}s for the nearest points
+ */
+ public GeometryLocation[] nearestLocations()
+ {
+ computeMinDistance();
+ return minDistanceLocation;
+ }
+
+ /**
+ *
+ * @return a pair of {@link GeometryLocation}s for the nearest points
+ * @deprecated renamed to nearestLocations
+ */
+ public GeometryLocation[] closestLocations()
+ {
+ return nearestLocations();
+ }
+
+ private void updateMinDistance(GeometryLocation[] locGeom, boolean flip)
+ {
+ // if not set then don't update
+ if (locGeom[0] == null) return;
+
+ if (flip) {
+ minDistanceLocation[0] = locGeom[1];
+ minDistanceLocation[1] = locGeom[0];
+ }
+ else {
+ minDistanceLocation[0] = locGeom[0];
+ minDistanceLocation[1] = locGeom[1];
+ }
+ }
+
+ private void computeMinDistance()
+ {
+ // only compute once!
+ if (minDistanceLocation != null) return;
+
+ minDistanceLocation = new GeometryLocation[2];
+ computeContainmentDistance();
+ if (minDistance <= terminateDistance) return;
+ computeFacetDistance();
+ }
+
+ private void computeContainmentDistance()
+ {
+ GeometryLocation[] locPtPoly = new GeometryLocation[2];
+ // test if either geometry has a vertex inside the other
+ computeContainmentDistance(0, locPtPoly);
+ if (minDistance <= terminateDistance) return;
+ computeContainmentDistance(1, locPtPoly);
+ }
+
+ private void computeContainmentDistance(int polyGeomIndex, GeometryLocation[] locPtPoly)
+ {
+ Geometry polyGeom = geom[polyGeomIndex];
+ // if no polygon then nothing to do
+ if (polyGeom.getDimension() < 2) return;
+
+ int locationsIndex = 1 - polyGeomIndex;
+ List polys = PolygonExtracter.getPolygons(polyGeom);
+ if (polys.size() > 0) {
+ List insideLocs = ConnectedElementLocationFilter.getLocations(geom[locationsIndex]);
+ computeContainmentDistance(insideLocs, polys, locPtPoly);
+ if (minDistance <= terminateDistance) {
+ // this assigment is determined by the order of the args in the computeInside call above
+ minDistanceLocation[locationsIndex] = locPtPoly[0];
+ minDistanceLocation[polyGeomIndex] = locPtPoly[1];
+ return;
+ }
+ }
+ }
+
+ private void computeContainmentDistance(List locs, List polys, GeometryLocation[] locPtPoly)
+ {
+ for (int i = 0; i < locs.size(); i++) {
+ GeometryLocation loc = (GeometryLocation) locs.get(i);
+ for (int j = 0; j < polys.size(); j++) {
+ computeContainmentDistance(loc, (Polygon) polys.get(j), locPtPoly);
+ if (minDistance <= terminateDistance) return;
+ }
+ }
+ }
+
+ private void computeContainmentDistance(GeometryLocation ptLoc,
+ Polygon poly,
+ GeometryLocation[] locPtPoly)
+ {
+ Coordinate pt = ptLoc.getCoordinate();
+ // if pt is not in exterior, distance to geom is 0
+ if (Location.EXTERIOR != ptLocator.locate(pt, poly)) {
+ minDistance = 0.0;
+ locPtPoly[0] = ptLoc;
+ locPtPoly[1] = new GeometryLocation(poly, pt);;
+ return;
+ }
+ }
+
+ /**
+ * Computes distance between facets (lines and points)
+ * of input geometries.
+ *
+ */
+ private void computeFacetDistance()
+ {
+ GeometryLocation[] locGeom = new GeometryLocation[2];
+
+ /**
+ * Geometries are not wholely inside, so compute distance from lines and points
+ * of one to lines and points of the other
+ */
+ List lines0 = LinearComponentExtracter.getLines(geom[0]);
+ List lines1 = LinearComponentExtracter.getLines(geom[1]);
+
+ List pts0 = PointExtracter.getPoints(geom[0]);
+ List pts1 = PointExtracter.getPoints(geom[1]);
+
+ // exit whenever minDistance goes LE than terminateDistance
+ computeMinDistanceLines(lines0, lines1, locGeom);
+ updateMinDistance(locGeom, false);
+ if (minDistance <= terminateDistance) return;
+
+ locGeom[0] = null;
+ locGeom[1] = null;
+ computeMinDistanceLinesPoints(lines0, pts1, locGeom);
+ updateMinDistance(locGeom, false);
+ if (minDistance <= terminateDistance) return;
+
+ locGeom[0] = null;
+ locGeom[1] = null;
+ computeMinDistanceLinesPoints(lines1, pts0, locGeom);
+ updateMinDistance(locGeom, true);
+ if (minDistance <= terminateDistance) return;
+
+ locGeom[0] = null;
+ locGeom[1] = null;
+ computeMinDistancePoints(pts0, pts1, locGeom);
+ updateMinDistance(locGeom, false);
+ }
+
+ private void computeMinDistanceLines(List lines0, List lines1, GeometryLocation[] locGeom)
+ {
+ for (int i = 0; i < lines0.size(); i++) {
+ LineString line0 = (LineString) lines0.get(i);
+ for (int j = 0; j < lines1.size(); j++) {
+ LineString line1 = (LineString) lines1.get(j);
+ computeMinDistance(line0, line1, locGeom);
+ if (minDistance <= terminateDistance) return;
+ }
+ }
+ }
+
+ private void computeMinDistancePoints(List points0, List points1, GeometryLocation[] locGeom)
+ {
+ for (int i = 0; i < points0.size(); i++) {
+ Point pt0 = (Point) points0.get(i);
+ for (int j = 0; j < points1.size(); j++) {
+ Point pt1 = (Point) points1.get(j);
+ double dist = pt0.getCoordinate().distance(pt1.getCoordinate());
+ if (dist < minDistance) {
+ minDistance = dist;
+ locGeom[0] = new GeometryLocation(pt0, 0, pt0.getCoordinate());
+ locGeom[1] = new GeometryLocation(pt1, 0, pt1.getCoordinate());
+ }
+ if (minDistance <= terminateDistance) return;
+ }
+ }
+ }
+
+ private void computeMinDistanceLinesPoints(List lines, List points,
+ GeometryLocation[] locGeom)
+ {
+ for (int i = 0; i < lines.size(); i++) {
+ LineString line = (LineString) lines.get(i);
+ for (int j = 0; j < points.size(); j++) {
+ Point pt = (Point) points.get(j);
+ computeMinDistance(line, pt, locGeom);
+ if (minDistance <= terminateDistance) return;
+ }
+ }
+ }
+
+ private void computeMinDistance(LineString line0, LineString line1,
+ GeometryLocation[] locGeom)
+ {
+ if (line0.getEnvelopeInternal().distance(line1.getEnvelopeInternal())
+ > minDistance)
+ return;
+ Coordinate[] coord0 = line0.getCoordinates();
+ Coordinate[] coord1 = line1.getCoordinates();
+ // brute force approach!
+ for (int i = 0; i < coord0.length - 1; i++) {
+ for (int j = 0; j < coord1.length - 1; j++) {
+ double dist = Distance.segmentToSegment(
+ coord0[i], coord0[i + 1],
+ coord1[j], coord1[j + 1] );
+ if (dist < minDistance) {
+ minDistance = dist;
+ LineSegment seg0 = new LineSegment(coord0[i], coord0[i + 1]);
+ LineSegment seg1 = new LineSegment(coord1[j], coord1[j + 1]);
+ Coordinate[] closestPt = seg0.closestPoints(seg1);
+ locGeom[0] = new GeometryLocation(line0, i, closestPt[0]);
+ locGeom[1] = new GeometryLocation(line1, j, closestPt[1]);
+ }
+ if (minDistance <= terminateDistance) return;
+ }
+ }
+ }
+
+ private void computeMinDistance(LineString line, Point pt,
+ GeometryLocation[] locGeom)
+ {
+ if (line.getEnvelopeInternal().distance(pt.getEnvelopeInternal())
+ > minDistance)
+ return;
+ Coordinate[] coord0 = line.getCoordinates();
+ Coordinate coord = pt.getCoordinate();
+ // brute force approach!
+ for (int i = 0; i < coord0.length - 1; i++) {
+ double dist = Distance.pointToSegment(
+ coord, coord0[i], coord0[i + 1] );
+ if (dist < minDistance) {
+ minDistance = dist;
+ LineSegment seg = new LineSegment(coord0[i], coord0[i + 1]);
+ Coordinate segClosestPoint = seg.closestPoint(coord);
+ locGeom[0] = new GeometryLocation(line, i, segClosestPoint);
+ locGeom[1] = new GeometryLocation(pt, 0, coord);
+ }
+ if (minDistance <= terminateDistance) return;
+
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetSequence.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetSequence.java
new file mode 100644
index 0000000..f699d18
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetSequence.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.distance;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Represents a sequence of facets (points or line segments)
+ * of a {@link Geometry}
+ * specified by a subsequence of a {@link CoordinateSequence}.
+ *
+ * @author Martin Davis
+ *
+ */
+public class FacetSequence
+{
+ private CoordinateSequence pts;
+ private int start;
+ private int end;
+
+ // temporary Coordinates to materialize points from the CoordinateSequence
+ private Coordinate pt = new Coordinate();
+ private Coordinate seqPt = new Coordinate();
+
+ /**
+ * Creates a new section based on a CoordinateSequence.
+ *
+ * @param pts the sequence holding the points in the section
+ * @param start the index of the start point
+ * @param end the index of the end point + 1
+ */
+ public FacetSequence(CoordinateSequence pts, int start, int end)
+ {
+ this.pts = pts;
+ this.start = start;
+ this.end = end;
+ }
+
+ /**
+ * Creates a new sequence for a single point from a CoordinateSequence.
+ *
+ * @param pts the sequence holding the points in the facet sequence
+ * @param start the index of the point
+ */
+ public FacetSequence(CoordinateSequence pts, int start)
+ {
+ this.pts = pts;
+ this.start = start;
+ this.end = start + 1;
+ }
+
+ public Envelope getEnvelope()
+ {
+ Envelope env = new Envelope();
+ for (int i = start; i < end; i++) {
+ env.expandToInclude(pts.getX(i), pts.getY(i));
+ }
+ return env;
+ }
+
+ public int size()
+ {
+ return end - start;
+ }
+
+ public Coordinate getCoordinate(int index)
+ {
+ return pts.getCoordinate(start + index);
+ }
+
+ public boolean isPoint()
+ {
+ return end - start == 1;
+ }
+
+
+ public double distance(FacetSequence facetSeq)
+ {
+ boolean isPoint = isPoint();
+ boolean isPointOther = facetSeq.isPoint();
+
+ if (isPoint && isPointOther) {
+ pts.getCoordinate(start, pt);
+ facetSeq.pts.getCoordinate(facetSeq.start, seqPt);
+ return pt.distance(seqPt);
+ }
+ else if (isPoint) {
+ pts.getCoordinate(start, pt);
+ return computePointLineDistance(pt, facetSeq);
+ }
+ else if (isPointOther) {
+ facetSeq.pts.getCoordinate(facetSeq.start, seqPt);
+ return computePointLineDistance(seqPt, this);
+ }
+ return computeLineLineDistance(facetSeq);
+
+ }
+
+ // temporary Coordinates to materialize points from the CoordinateSequence
+ private Coordinate p0 = new Coordinate();
+ private Coordinate p1 = new Coordinate();
+ private Coordinate q0 = new Coordinate();
+ private Coordinate q1 = new Coordinate();
+
+ private double computeLineLineDistance(FacetSequence facetSeq)
+ {
+ // both linear - compute minimum segment-segment distance
+ double minDistance = Double.MAX_VALUE;
+
+ for (int i = start; i < end - 1; i++) {
+ for (int j = facetSeq.start; j < facetSeq.end - 1; j++) {
+ pts.getCoordinate(i, p0);
+ pts.getCoordinate(i + 1, p1);
+ facetSeq.pts.getCoordinate(j, q0);
+ facetSeq.pts.getCoordinate(j + 1, q1);
+
+ double dist = Distance.segmentToSegment(p0, p1, q0, q1);
+ if (dist == 0.0)
+ return 0.0;
+ if (dist < minDistance) {
+ minDistance = dist;
+ }
+ }
+ }
+ return minDistance;
+ }
+
+ private double computePointLineDistance(Coordinate pt, FacetSequence facetSeq)
+ {
+ double minDistance = Double.MAX_VALUE;
+
+ for (int i = facetSeq.start; i < facetSeq.end - 1; i++) {
+ facetSeq.pts.getCoordinate(i, q0);
+ facetSeq.pts.getCoordinate(i + 1, q1);
+ double dist = Distance.pointToSegment(pt, q0, q1);
+ if (dist == 0.0) return 0.0;
+ if (dist < minDistance) {
+ minDistance = dist;
+ }
+ }
+ return minDistance;
+ }
+
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("LINESTRING ( ");
+ Coordinate p = new Coordinate();
+ for (int i = start; i < end; i++) {
+ if (i > start)
+ buf.append(", ");
+ pts.getCoordinate(i, p);
+ buf.append(p.x + " " + p.y);
+ }
+ buf.append(" )");
+ return buf.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetSequenceTreeBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetSequenceTreeBuilder.java
new file mode 100644
index 0000000..a1e9009
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetSequenceTreeBuilder.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.distance;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.index.strtree.STRtree;
+
+
+public class FacetSequenceTreeBuilder {
+ // 6 seems to be a good facet sequence size
+ private static final int FACET_SEQUENCE_SIZE = 6;
+
+ // Seems to be better to use a minimum node capacity
+ private static final int STR_TREE_NODE_CAPACITY = 4;
+
+ public static STRtree build(Geometry g) {
+ STRtree tree = new STRtree(STR_TREE_NODE_CAPACITY);
+ List sections = computeFacetSequences(g);
+ for (Iterator i = sections.iterator(); i.hasNext();) {
+ FacetSequence section = (FacetSequence) i.next();
+ tree.insert(section.getEnvelope(), section);
+ }
+ tree.build();
+ return tree;
+ }
+
+ /**
+ * Creates facet sequences
+ *
+ * @param g
+ * @return List<GeometryFacetSequence>
+ */
+ private static List computeFacetSequences(Geometry g) {
+ final List sections = new ArrayList();
+
+ g.apply(new GeometryComponentFilter() {
+
+ public void filter(Geometry geom) {
+ CoordinateSequence seq = null;
+ if (geom instanceof LineString) {
+ seq = ((LineString) geom).getCoordinateSequence();
+ addFacetSequences(seq, sections);
+ }
+ else if (geom instanceof Point) {
+ seq = ((Point) geom).getCoordinateSequence();
+ addFacetSequences(seq, sections);
+ }
+ }
+ });
+ return sections;
+ }
+
+ private static void addFacetSequences(CoordinateSequence pts, List sections) {
+ int i = 0;
+ int size = pts.size();
+ while (i <= size - 1) {
+ int end = i + FACET_SEQUENCE_SIZE + 1;
+ // if only one point remains after this section, include it in this
+ // section
+ if (end >= size - 1)
+ end = size;
+ FacetSequence sect = new FacetSequence(pts, i, end);
+ sections.add(sect);
+ i = i + FACET_SEQUENCE_SIZE;
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/GeometryLocation.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance/GeometryLocation.java
new file mode 100644
index 0000000..c77343f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/GeometryLocation.java
@@ -0,0 +1,92 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.distance;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Represents the location of a point on a Geometry.
+ * Maintains both the actual point location
+ * (which may not be exact, if the point is not a vertex)
+ * as well as information about the component
+ * and segment index where the point occurs.
+ * Locations inside area Geometrys will not have an associated segment index,
+ * so in this case the segment index will have the sentinel value of
+ * {@link #INSIDE_AREA}.
+ *
+ * @version 1.7
+ */
+public class GeometryLocation
+{
+ /**
+ * A special value of segmentIndex used for locations inside area geometries.
+ * These locations are not located on a segment,
+ * and thus do not have an associated segment index.
+ */
+ public static final int INSIDE_AREA = -1;
+
+ private Geometry component = null;
+ private int segIndex;
+ private Coordinate pt = null;
+
+ /**
+ * Constructs a GeometryLocation specifying a point on a geometry, as well as the
+ * segment that the point is on
+ * (or {@link #INSIDE_AREA} if the point is not on a segment).
+ *
+ * @param component the component of the geometry containing the point
+ * @param segIndex the segment index of the location, or INSIDE_AREA
+ * @param pt the coordinate of the location
+ */
+ public GeometryLocation(Geometry component, int segIndex, Coordinate pt)
+ {
+ this.component = component;
+ this.segIndex = segIndex;
+ this.pt = pt;
+ }
+
+ /**
+ * Constructs a GeometryLocation specifying a point inside an area geometry.
+ *
+ * @param component the component of the geometry containing the point
+ * @param pt the coordinate of the location
+ */
+ public GeometryLocation(Geometry component,Coordinate pt)
+ {
+ this(component, INSIDE_AREA, pt);
+ }
+
+ /**
+ * Returns the geometry component on (or in) which this location occurs.
+ */
+ public Geometry getGeometryComponent() { return component; }
+
+ /**
+ * Returns the segment index for this location. If the location is inside an
+ * area, the index will have the value {@link #INSIDE_AREA};
+ *
+ * @return the segment index for the location, or INSIDE_AREA
+ */
+ public int getSegmentIndex() { return segIndex; }
+
+ /**
+ * Returns the {@link Coordinate} of this location.
+ */
+ public Coordinate getCoordinate() { return pt; }
+
+ /**
+ * Tests whether this location represents a point inside an area geometry.
+ */
+ public boolean isInsideArea() { return segIndex == INSIDE_AREA; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/IndexedFacetDistance.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance/IndexedFacetDistance.java
new file mode 100644
index 0000000..6b62134
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/IndexedFacetDistance.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.distance;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Lineal;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.Puntal;
+import org.locationtech.jts.index.strtree.ItemBoundable;
+import org.locationtech.jts.index.strtree.ItemDistance;
+import org.locationtech.jts.index.strtree.STRtree;
+
+/**
+ * Computes the distance between the facets (segments and vertices)
+ * of two {@link Geometry}s
+ * using a Branch-and-Bound algorithm.
+ * The Branch-and-Bound algorithm operates over a
+ * traversal of R-trees built
+ * on the target and possibly also the query geometries.
+ * <p>
+ * This approach provides the following benefits:
+ * <ul>
+ * <li>Performance is improved due to the effects of the
+ * R-tree index
+ * and the pruning due to the Branch-and-Bound approach
+ * <li>The spatial index on the target geometry can be cached
+ * to allow reuse in an incremental query situation.
+ * </ul>
+ * Using this technique can be much more performant
+ * than using {@link #getDistance(Geometry)}
+ * when one or both
+ * input geometries are large,
+ * or when evaluating many distance computations against
+ * a single geometry.
+ * <p>
+ * This class is not thread-safe.
+ *
+ * @author Martin Davis
+ *
+ */
+public class IndexedFacetDistance
+{
+ /**
+ * Computes the distance between two geometries using
+ * the indexed approach.
+ * <p>
+ * For geometries with many segments or points,
+ * this can be faster than using a simple distance
+ * algorithm.
+ *
+ * @param g1 a geometry
+ * @param g2 a geometry
+ * @return the distance between the two geometries
+ */
+ public static double distance(Geometry g1, Geometry g2)
+ {
+ IndexedFacetDistance dist = new IndexedFacetDistance(g1);
+ return dist.getDistance(g2);
+ }
+
+ private STRtree cachedTree;
+
+ /**
+ * Creates a new distance-finding instance for a given target {@link Geometry}.
+ * <p>
+ * Distances will be computed to all facets of the input geometry.
+ * The facets of the geometry are the discrete segments and points
+ * contained in its components.
+ * In the case of {@link Lineal} and {@link Puntal} inputs,
+ * this is equivalent to computing the conventional distance.
+ * In the case of {@link Polygonal} inputs, this is equivalent
+ * to computing the distance to the polygons boundaries.
+ *
+ * @param g1 a Geometry, which may be of any type.
+ */
+ public IndexedFacetDistance(Geometry g1) {
+ cachedTree = FacetSequenceTreeBuilder.build(g1);
+ }
+
+ /**
+ * Computes the distance from the base geometry to
+ * the given geometry.
+ *
+ * @param g the geometry to compute the distance to
+ *
+ * @return the computed distance
+ */
+ public double getDistance(Geometry g)
+ {
+ STRtree tree2 = FacetSequenceTreeBuilder.build(g);
+ Object[] obj = cachedTree.nearestNeighbour(tree2,
+ new FacetSequenceDistance());
+ return facetDistance(obj);
+ }
+
+ private static double facetDistance(Object[] obj)
+ {
+ Object o1 = obj[0];
+ Object o2 = obj[1];
+ return ((FacetSequence) o1).distance((FacetSequence) o2);
+ }
+
+ /**
+ * Computes the distance from the base geometry to
+ * the given geometry, up to and including a given
+ * maximum distance.
+ *
+ * @param g the geometry to compute the distance to
+ * @param maximumDistance the maximum distance to compute.
+ *
+ * @return the computed distance,
+ * or <tt>maximumDistance</tt> if the true distance is determined to be greater
+ */
+ // TODO: implement this
+ /*
+ public double getDistanceWithin(Geometry g, double maximumDistance)
+ {
+ STRtree tree2 = FacetSequenceTreeBuilder.build(g);
+ Object[] obj = cachedTree.nearestNeighbours(tree2,
+ new FacetSequenceDistance());
+ return facetDistance(obj);
+ }
+ */
+
+
+ /**
+ * Tests whether the base geometry lies within
+ * a specified distance of the given geometry.
+ *
+// * @param g the geometry to test
+// * @param maximumDistance the maximum distance to test
+// * @return true if the geometry lies with the specified distance
+ */
+ // TODO: implement this
+ /*
+ public boolean isWithinDistance(Geometry g, double maximumDistance)
+ {
+ STRtree tree2 = FacetSequenceTreeBuilder.build(g);
+ double dist = findMinDistance(cachedTree.getRoot(), tree2.getRoot(), maximumDistance);
+ if (dist <= maximumDistance)
+ return false;
+ return true;
+ }
+ */
+
+ private static class FacetSequenceDistance
+ implements ItemDistance
+ {
+ public double distance(ItemBoundable item1, ItemBoundable item2) {
+ FacetSequence fs1 = (FacetSequence) item1.getItem();
+ FacetSequence fs2 = (FacetSequence) item2.getItem();
+ return fs1.distance(fs2);
+ }
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/distance/package.html
new file mode 100644
index 0000000..891a13b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Provides classes for computing the distance between geometries
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/AxisPlaneCoordinateSequence.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/AxisPlaneCoordinateSequence.java
new file mode 100644
index 0000000..2adb666
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/AxisPlaneCoordinateSequence.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.distance3d;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+
+/**
+ * A CoordinateSequence wrapper which
+ * projects 3D coordinates into one of the
+ * three Cartesian axis planes,
+ * using the standard orthonormal projection
+ * (i.e. simply selecting the appropriate ordinates into the XY ordinates).
+ * The projected data is represented as 2D coordinates.
+ *
+ * @author mdavis
+ *
+ */
+public class AxisPlaneCoordinateSequence implements CoordinateSequence {
+
+ /**
+ * Creates a wrapper projecting to the XY plane.
+ *
+ * @param seq the sequence to be projected
+ * @return a sequence which projects coordinates
+ */
+ public static CoordinateSequence projectToXY(CoordinateSequence seq)
+ {
+ /**
+ * This is just a no-op, but return a wrapper
+ * to allow better testing
+ */
+ return new AxisPlaneCoordinateSequence(seq, XY_INDEX);
+ }
+
+ /**
+ * Creates a wrapper projecting to the XZ plane.
+ *
+ * @param seq the sequence to be projected
+ * @return a sequence which projects coordinates
+ */
+ public static CoordinateSequence projectToXZ(CoordinateSequence seq)
+ {
+ return new AxisPlaneCoordinateSequence(seq, XZ_INDEX);
+ }
+
+ /**
+ * Creates a wrapper projecting to the YZ plane.
+ *
+ * @param seq the sequence to be projected
+ * @return a sequence which projects coordinates
+ */
+ public static CoordinateSequence projectToYZ(CoordinateSequence seq)
+ {
+ return new AxisPlaneCoordinateSequence(seq, YZ_INDEX);
+ }
+
+ private static final int[] XY_INDEX = new int[] { 0,1 };
+ private static final int[] XZ_INDEX = new int[] { 0,2 };
+ private static final int[] YZ_INDEX = new int[] { 1,2 };
+
+ private CoordinateSequence seq;
+ private int[] indexMap;
+
+ private AxisPlaneCoordinateSequence(CoordinateSequence seq, int[] indexMap) {
+ this.seq = seq;
+ this.indexMap = indexMap;
+ }
+
+ public int getDimension() {
+ return 2;
+ }
+
+ public Coordinate getCoordinate(int i) {
+ return getCoordinateCopy(i);
+ }
+
+ public Coordinate getCoordinateCopy(int i) {
+ return new Coordinate(getX(i), getY(i), getZ(i));
+ }
+
+ public void getCoordinate(int index, Coordinate coord) {
+ coord.x = getOrdinate(index, X);
+ coord.y = getOrdinate(index, Y);
+ coord.z = getOrdinate(index, Z);
+ }
+
+ public double getX(int index) {
+ return getOrdinate(index, X);
+ }
+
+ public double getY(int index) {
+ return getOrdinate(index, Y);
+ }
+
+ public double getZ(int index) {
+ return getOrdinate(index, Z);
+ }
+
+ public double getOrdinate(int index, int ordinateIndex) {
+ // Z ord is always 0
+ if (ordinateIndex > 1) return 0;
+ return seq.getOrdinate(index, indexMap[ordinateIndex]);
+ }
+
+ public int size() {
+ return seq.size();
+ }
+
+ public void setOrdinate(int index, int ordinateIndex, double value) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Coordinate[] toCoordinateArray() {
+ throw new UnsupportedOperationException();
+ }
+
+ public Envelope expandEnvelope(Envelope env) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object clone()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public AxisPlaneCoordinateSequence copy()
+ {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/Distance3DOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/Distance3DOp.java
new file mode 100644
index 0000000..db9d198
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/Distance3DOp.java
@@ -0,0 +1,566 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.distance3d;
+
+import org.locationtech.jts.algorithm.CGAlgorithms3D;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.operation.distance.GeometryLocation;
+
+/**
+ * Find two points on two 3D {@link Geometry}s which lie within a given distance,
+ * or else are the nearest points on the geometries (in which case this also
+ * provides the distance between the geometries).
+ * <p>
+ * 3D geometries have vertex Z ordinates defined.
+ * 3D {@link Polygon}s are assumed to lie in a single plane (which is enforced if not actually the case).
+ * 3D {@link LineString}s and {@link Point}s may have any configuration.
+ * <p>
+ * The distance computation also finds a pair of points in the input geometries
+ * which have the minimum distance between them. If a point lies in the interior
+ * of a line segment, the coordinate computed is a close approximation to the
+ * exact point.
+ * <p>
+ * The algorithms used are straightforward O(n^2) comparisons. This worst-case
+ * performance could be improved on by using Voronoi techniques or spatial
+ * indexes.
+ *
+ * @version 1.7
+ */
+public class Distance3DOp {
+ /**
+ * Compute the distance between the nearest points of two geometries.
+ *
+ * @param g0
+ * a {@link Geometry}
+ * @param g1
+ * another {@link Geometry}
+ * @return the distance between the geometries
+ */
+ public static double distance(Geometry g0, Geometry g1) {
+ Distance3DOp distOp = new Distance3DOp(g0, g1);
+ return distOp.distance();
+ }
+
+ /**
+ * Test whether two geometries lie within a given distance of each other.
+ *
+ * @param g0
+ * a {@link Geometry}
+ * @param g1
+ * another {@link Geometry}
+ * @param distance
+ * the distance to test
+ * @return true if g0.distance(g1) <= distance
+ */
+ public static boolean isWithinDistance(Geometry g0, Geometry g1,
+ double distance) {
+ Distance3DOp distOp = new Distance3DOp(g0, g1, distance);
+ return distOp.distance() <= distance;
+ }
+
+ /**
+ * Compute the the nearest points of two geometries. The points are
+ * presented in the same order as the input Geometries.
+ *
+ * @param g0
+ * a {@link Geometry}
+ * @param g1
+ * another {@link Geometry}
+ * @return the nearest points in the geometries
+ */
+ public static Coordinate[] nearestPoints(Geometry g0, Geometry g1) {
+ Distance3DOp distOp = new Distance3DOp(g0, g1);
+ return distOp.nearestPoints();
+ }
+
+ // input
+ private Geometry[] geom;
+ private double terminateDistance = 0.0;
+ // working
+ private GeometryLocation[] minDistanceLocation;
+ private double minDistance = Double.MAX_VALUE;
+ private boolean isDone = false;
+
+ /**
+ * Constructs a DistanceOp that computes the distance and nearest points
+ * between the two specified geometries.
+ *
+ * @param g0
+ * a Geometry
+ * @param g1
+ * a Geometry
+ */
+ public Distance3DOp(Geometry g0, Geometry g1) {
+ this(g0, g1, 0.0);
+ }
+
+ /**
+ * Constructs a DistanceOp that computes the distance and nearest points
+ * between the two specified geometries.
+ *
+ * @param g0
+ * a Geometry
+ * @param g1
+ * a Geometry
+ * @param terminateDistance
+ * the distance on which to terminate the search
+ */
+ public Distance3DOp(Geometry g0, Geometry g1, double terminateDistance) {
+ this.geom = new Geometry[2];
+ geom[0] = g0;
+ geom[1] = g1;
+ this.terminateDistance = terminateDistance;
+ }
+
+ /**
+ * Report the distance between the nearest points on the input geometries.
+ *
+ * @return the distance between the geometries, or 0 if either input geometry is empty
+ * @throws IllegalArgumentException
+ * if either input geometry is null
+ */
+ public double distance() {
+ if (geom[0] == null || geom[1] == null)
+ throw new IllegalArgumentException(
+ "null geometries are not supported");
+ if (geom[0].isEmpty() || geom[1].isEmpty())
+ return 0.0;
+
+ computeMinDistance();
+ return minDistance;
+ }
+
+ /**
+ * Report the coordinates of the nearest points in the input geometries. The
+ * points are presented in the same order as the input Geometries.
+ *
+ * @return a pair of {@link Coordinate}s of the nearest points
+ */
+ public Coordinate[] nearestPoints() {
+ computeMinDistance();
+ Coordinate[] nearestPts = new Coordinate[] {
+ minDistanceLocation[0].getCoordinate(),
+ minDistanceLocation[1].getCoordinate() };
+ return nearestPts;
+ }
+
+ /**
+ * Report the locations of the nearest points in the input geometries. The
+ * locations are presented in the same order as the input Geometries.
+ *
+ * @return a pair of {@link GeometryLocation}s for the nearest points
+ */
+ public GeometryLocation[] nearestLocations() {
+ computeMinDistance();
+ return minDistanceLocation;
+ }
+
+ private void updateDistance(double dist,
+ GeometryLocation loc0, GeometryLocation loc1,
+ boolean flip) {
+ this.minDistance = dist;
+ int index = flip ? 1 : 0;
+ minDistanceLocation[index] = loc0;
+ minDistanceLocation[1-index] = loc1;
+ if (minDistance < terminateDistance)
+ isDone = true;
+ }
+
+ private void computeMinDistance() {
+ // only compute once
+ if (minDistanceLocation != null)
+ return;
+ minDistanceLocation = new GeometryLocation[2];
+
+ int geomIndex = mostPolygonalIndex();
+ boolean flip = geomIndex == 0;
+ computeMinDistanceMultiMulti(geom[geomIndex], geom[1-geomIndex], flip);
+ }
+
+ /**
+ * Finds the index of the "most polygonal" input geometry.
+ * This optimizes the computation of the best-fit plane,
+ * since it is cached only for the left-hand geometry.
+ *
+ * @return the index of the most polygonal geometry
+ */
+ private int mostPolygonalIndex() {
+ int dim0 = geom[0].getDimension();
+ int dim1 = geom[1].getDimension();
+ if (dim0 >= 2 && dim1 >= 2) {
+ if (geom[0].getNumPoints() > geom[1].getNumPoints())
+ return 0;
+ return 1;
+ }
+ // no more than one is dim 2
+ if (dim0 >= 2) return 0;
+ if (dim1 >= 2) return 1;
+ // both dim <= 1 - don't flip
+ return 0;
+ }
+
+ private void computeMinDistanceMultiMulti(Geometry g0, Geometry g1, boolean flip) {
+ if (g0 instanceof GeometryCollection) {
+ int n = g0.getNumGeometries();
+ for (int i = 0; i < n; i++) {
+ Geometry g = g0.getGeometryN(i);
+ computeMinDistanceMultiMulti(g, g1, flip);
+ if (isDone) return;
+ }
+ }
+ else {
+ // handle case of multigeom component being empty
+ if (g0.isEmpty())
+ return;
+
+ // compute planar polygon only once for efficiency
+ if (g0 instanceof Polygon) {
+ computeMinDistanceOneMulti(polyPlane(g0), g1, flip);
+ }
+ else
+ computeMinDistanceOneMulti(g0, g1, flip);
+ }
+ }
+
+ private void computeMinDistanceOneMulti(Geometry g0, Geometry g1, boolean flip) {
+ if (g1 instanceof GeometryCollection) {
+ int n = g1.getNumGeometries();
+ for (int i = 0; i < n; i++) {
+ Geometry g = g1.getGeometryN(i);
+ computeMinDistanceOneMulti(g0, g, flip);
+ if (isDone) return;
+ }
+ }
+ else {
+ computeMinDistance(g0, g1, flip);
+ }
+ }
+
+ private void computeMinDistanceOneMulti(PlanarPolygon3D poly, Geometry geom, boolean flip) {
+ if (geom instanceof GeometryCollection) {
+ int n = geom.getNumGeometries();
+ for (int i = 0; i < n; i++) {
+ Geometry g = geom.getGeometryN(i);
+ computeMinDistanceOneMulti(poly, g, flip);
+ if (isDone) return;
+ }
+ }
+ else {
+ if (geom instanceof Point) {
+ computeMinDistancePolygonPoint(poly, (Point) geom, flip);
+ return;
+ }
+ if (geom instanceof LineString) {
+ computeMinDistancePolygonLine(poly, (LineString) geom, flip);
+ return;
+ }
+ if (geom instanceof Polygon) {
+ computeMinDistancePolygonPolygon(poly, (Polygon) geom, flip);
+ return;
+ }
+ }
+ }
+
+ /**
+ * Convenience method to create a Plane3DPolygon
+ * @param poly
+ * @return
+ */
+ private static PlanarPolygon3D polyPlane(Geometry poly)
+ {
+ return new PlanarPolygon3D((Polygon) poly);
+ }
+
+ private void computeMinDistance(Geometry g0, Geometry g1, boolean flip) {
+ if (g0 instanceof Point) {
+ if (g1 instanceof Point) {
+ computeMinDistancePointPoint((Point) g0, (Point) g1, flip);
+ return;
+ }
+ if (g1 instanceof LineString) {
+ computeMinDistanceLinePoint((LineString) g1, (Point) g0, ! flip);
+ return;
+ }
+ if (g1 instanceof Polygon) {
+ computeMinDistancePolygonPoint(polyPlane(g1), (Point) g0, ! flip);
+ return;
+ }
+ }
+ if (g0 instanceof LineString) {
+ if (g1 instanceof Point) {
+ computeMinDistanceLinePoint((LineString) g0, (Point) g1, flip);
+ return;
+ }
+ if (g1 instanceof LineString) {
+ computeMinDistanceLineLine((LineString) g0, (LineString) g1, flip);
+ return;
+ }
+ if (g1 instanceof Polygon) {
+ computeMinDistancePolygonLine(polyPlane(g1), (LineString) g0, ! flip);
+ return;
+ }
+ }
+ if (g0 instanceof Polygon) {
+ if (g1 instanceof Point) {
+ computeMinDistancePolygonPoint(polyPlane(g0), (Point) g1, flip);
+ return;
+ }
+ if (g1 instanceof LineString) {
+ computeMinDistancePolygonLine(polyPlane(g0), (LineString) g1, flip);
+ return;
+ }
+ if (g1 instanceof Polygon) {
+ computeMinDistancePolygonPolygon(polyPlane(g0), (Polygon) g1, flip);
+ return;
+ }
+ }
+ }
+
+ /**
+ * Computes distance between two polygons.
+ *
+ * To compute the distance, compute the distance
+ * between the rings of one polygon and the other polygon,
+ * and vice-versa.
+ * If the polygons intersect, then at least one ring must
+ * intersect the other polygon.
+ * Note that it is NOT sufficient to test only the shell rings.
+ * A counter-example is a "figure-8" polygon A
+ * and a simple polygon B at right angles to A, with the ring of B
+ * passing through the holes of A.
+ * The polygons intersect,
+ * but A's shell does not intersect B, and B's shell does not intersect A.
+ *
+ * @param poly0
+ * @param poly1
+ * @param geomIndex
+ */
+ private void computeMinDistancePolygonPolygon(PlanarPolygon3D poly0, Polygon poly1,
+ boolean flip) {
+ computeMinDistancePolygonRings(poly0, poly1, flip);
+ if (isDone) return;
+ PlanarPolygon3D polyPlane1 = new PlanarPolygon3D(poly1);
+ computeMinDistancePolygonRings(polyPlane1, poly0.getPolygon(), flip);
+ }
+
+ /**
+ * Compute distance between a polygon and the rings of another.
+ *
+ * @param poly
+ * @param ringPoly
+ * @param geomIndex
+ */
+ private void computeMinDistancePolygonRings(PlanarPolygon3D poly, Polygon ringPoly,
+ boolean flip) {
+ // compute shell ring
+ computeMinDistancePolygonLine(poly, ringPoly.getExteriorRing(), flip);
+ if (isDone) return;
+ // compute hole rings
+ int nHole = ringPoly.getNumInteriorRing();
+ for (int i = 0; i < nHole; i++) {
+ computeMinDistancePolygonLine(poly, ringPoly.getInteriorRingN(i), flip);
+ if (isDone) return;
+ }
+ }
+
+ private void computeMinDistancePolygonLine(PlanarPolygon3D poly,LineString line,
+ boolean flip) {
+
+ // first test if line intersects polygon
+ Coordinate intPt = intersection(poly, line);
+ if (intPt != null) {
+ updateDistance(0,
+ new GeometryLocation(poly.getPolygon(), 0, intPt),
+ new GeometryLocation(line, 0, intPt),
+ flip
+ );
+ return;
+ }
+
+ // if no intersection, then compute line distance to polygon rings
+ computeMinDistanceLineLine(poly.getPolygon().getExteriorRing(), line, flip);
+ if (isDone) return;
+ int nHole = poly.getPolygon().getNumInteriorRing();
+ for (int i = 0; i < nHole; i++) {
+ computeMinDistanceLineLine(poly.getPolygon().getInteriorRingN(i), line, flip);
+ if (isDone) return;
+ }
+ }
+
+ private Coordinate intersection(PlanarPolygon3D poly,LineString line) {
+ CoordinateSequence seq = line.getCoordinateSequence();
+ if (seq.size() == 0)
+ return null;
+
+ // start point of line
+ Coordinate p0 = new Coordinate();
+ seq.getCoordinate(0, p0);
+ double d0 = poly.getPlane().orientedDistance(p0);
+
+ // for each segment in the line
+ Coordinate p1 = new Coordinate();
+ for (int i = 0; i < seq.size() - 1; i++) {
+ seq.getCoordinate(i, p0);
+ seq.getCoordinate(i + 1, p1);
+ double d1 = poly.getPlane().orientedDistance(p1);
+
+ /**
+ * If the oriented distances of the segment endpoints have the same sign,
+ * the segment does not cross the plane, and is skipped.
+ */
+ if (d0 * d1 > 0)
+ continue;
+
+ /**
+ * Compute segment-plane intersection point
+ * which is then used for a point-in-polygon test.
+ * The endpoint distances to the plane d0 and d1
+ * give the proportional distance of the intersection point
+ * along the segment.
+ */
+ Coordinate intPt = segmentPoint(p0, p1, d0, d1);
+ // Coordinate intPt = polyPlane.intersection(p0, p1, s0, s1);
+ if (poly.intersects(intPt)) {
+ return intPt;
+ }
+
+ // shift to next segment
+ d0 = d1;
+ }
+ return null;
+ }
+
+ private void computeMinDistancePolygonPoint(PlanarPolygon3D polyPlane, Point point,
+ boolean flip) {
+ Coordinate pt = point.getCoordinate();
+
+ LineString shell = polyPlane.getPolygon().getExteriorRing();
+ if (polyPlane.intersects(pt, shell)) {
+ // point is either inside or in a hole
+
+ int nHole = polyPlane.getPolygon().getNumInteriorRing();
+ for (int i = 0; i < nHole; i++) {
+ LineString hole = polyPlane.getPolygon().getInteriorRingN(i);
+ if (polyPlane.intersects(pt, hole)) {
+ computeMinDistanceLinePoint(hole, point, flip);
+ return;
+ }
+ }
+ // point is in interior of polygon
+ // distance is distance to polygon plane
+ double dist = Math.abs(polyPlane.getPlane().orientedDistance(pt));
+ updateDistance(dist,
+ new GeometryLocation(polyPlane.getPolygon(), 0, pt),
+ new GeometryLocation(point, 0, pt),
+ flip
+ );
+ }
+ // point is outside polygon, so compute distance to shell linework
+ computeMinDistanceLinePoint(shell, point, flip);
+ }
+
+ private void computeMinDistanceLineLine(LineString line0, LineString line1,
+ boolean flip) {
+ Coordinate[] coord0 = line0.getCoordinates();
+ Coordinate[] coord1 = line1.getCoordinates();
+ // brute force approach!
+ for (int i = 0; i < coord0.length - 1; i++) {
+ for (int j = 0; j < coord1.length - 1; j++) {
+ double dist = CGAlgorithms3D.distanceSegmentSegment(coord0[i],
+ coord0[i + 1], coord1[j], coord1[j + 1]);
+ if (dist < minDistance) {
+ minDistance = dist;
+ // TODO: compute closest pts in 3D
+ LineSegment seg0 = new LineSegment(coord0[i], coord0[i + 1]);
+ LineSegment seg1 = new LineSegment(coord1[j], coord1[j + 1]);
+ Coordinate[] closestPt = seg0.closestPoints(seg1);
+ updateDistance(dist,
+ new GeometryLocation(line0, i, closestPt[0]),
+ new GeometryLocation(line1, j, closestPt[1]),
+ flip
+ );
+ }
+ if (isDone) return;
+ }
+ }
+ }
+
+ private void computeMinDistanceLinePoint(LineString line,Point point,
+ boolean flip) {
+ Coordinate[] lineCoord = line.getCoordinates();
+ Coordinate coord = point.getCoordinate();
+ // brute force approach!
+ for (int i = 0; i < lineCoord.length - 1; i++) {
+ double dist = CGAlgorithms3D.distancePointSegment(coord, lineCoord[i],
+ lineCoord[i + 1]);
+ if (dist < minDistance) {
+ LineSegment seg = new LineSegment(lineCoord[i], lineCoord[i + 1]);
+ Coordinate segClosestPoint = seg.closestPoint(coord);
+ updateDistance(dist,
+ new GeometryLocation(line, i, segClosestPoint),
+ new GeometryLocation(point, 0, coord),
+ flip);
+ }
+ if (isDone) return;
+ }
+ }
+
+ private void computeMinDistancePointPoint(Point point0, Point point1, boolean flip) {
+ double dist = CGAlgorithms3D.distance(
+ point0.getCoordinate(),
+ point1.getCoordinate());
+ if (dist < minDistance) {
+ updateDistance(dist,
+ new GeometryLocation(point0, 0, point0.getCoordinate()),
+ new GeometryLocation(point1, 0, point1.getCoordinate()),
+ flip);
+ }
+ }
+
+ /**
+ * Computes a point at a distance along a segment
+ * specified by two relatively proportional values.
+ * The fractional distance along the segment is d0/(d0+d1).
+ *
+ * @param p0
+ * start point of the segment
+ * @param p1
+ * end point of the segment
+ * @param d0
+ * proportional distance from start point to computed point
+ * @param d1
+ * proportional distance from computed point to end point
+ * @return the computed point
+ */
+ private static Coordinate segmentPoint(Coordinate p0, Coordinate p1, double d0,
+ double d1) {
+ if (d0 <= 0) return new Coordinate(p0);
+ if (d1 <= 0) return new Coordinate(p1);
+
+ double f = Math.abs(d0) / (Math.abs(d0) + Math.abs(d1));
+ double intx = p0.x + f * (p1.x - p0.x);
+ double inty = p0.y + f * (p1.y - p0.y);
+ double intz = p0.z + f * (p1.z - p0.z);
+ return new Coordinate(intx, inty, intz);
+ }
+
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/PlanarPolygon3D.java b/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/PlanarPolygon3D.java
new file mode 100644
index 0000000..9546084
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/distance3d/PlanarPolygon3D.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.distance3d;
+
+import org.locationtech.jts.algorithm.RayCrossingCounter;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.math.Plane3D;
+import org.locationtech.jts.math.Vector3D;
+
+/**
+ * Models a polygon lying in a plane in 3-dimensional Cartesian space.
+ * The polygon representation is supplied
+ * by a {@link Polygon},
+ * containing coordinates with XYZ ordinates.
+ * 3D polygons are assumed to lie in a single plane.
+ * The plane best fitting the polygon coordinates is
+ * computed and is represented by a {@link Plane3D}.
+ *
+ * @author mdavis
+ *
+ */
+public class PlanarPolygon3D {
+
+ private Plane3D plane;
+ private Polygon poly;
+ private int facingPlane = -1;
+
+ public PlanarPolygon3D(Polygon poly) {
+ this.poly = poly;
+ plane = findBestFitPlane(poly);
+ facingPlane = plane.closestAxisPlane();
+ }
+
+ /**
+ * Finds a best-fit plane for the polygon,
+ * by sampling a few points from the exterior ring.
+ * <p>
+ * The algorithm used is Newell's algorithm:
+ * - a base point for the plane is determined from the average of all vertices
+ * - the normal vector is determined by
+ * computing the area of the projections on each of the axis planes
+ *
+ * @param poly the polygon to determine the plane for
+ * @return the best-fit plane
+ */
+ private Plane3D findBestFitPlane(Polygon poly)
+ {
+ CoordinateSequence seq = poly.getExteriorRing().getCoordinateSequence();
+ Coordinate basePt = averagePoint(seq);
+ Vector3D normal = averageNormal(seq);
+ return new Plane3D(normal, basePt);
+ }
+
+ /**
+ * Computes an average normal vector from a list of polygon coordinates.
+ * Uses Newell's method, which is based
+ * on the fact that the vector with components
+ * equal to the areas of the projection of the polygon onto
+ * the Cartesian axis planes is normal.
+ *
+ * @param seq the sequence of coordinates for the polygon
+ * @return a normal vector
+ */
+ private Vector3D averageNormal(CoordinateSequence seq)
+ {
+ int n = seq.size();
+ Coordinate sum = new Coordinate(0,0,0);
+ Coordinate p1 = new Coordinate(0,0,0);
+ Coordinate p2 = new Coordinate(0,0,0);
+ for (int i = 0; i < n - 1; i++) {
+ seq.getCoordinate(i, p1);
+ seq.getCoordinate(i+1, p2);
+ sum.x += (p1.y - p2.y)*(p1.z + p2.z);
+ sum.y += (p1.z - p2.z)*(p1.x + p2.x);
+ sum.z += (p1.x - p2.x)*(p1.y + p2.y);
+ }
+ sum.x /= n;
+ sum.y /= n;
+ sum.z /= n;
+ Vector3D norm = Vector3D.create(sum).normalize();
+ return norm;
+ }
+
+ /**
+ * Computes a point which is the average of all coordinates
+ * in a sequence.
+ * If the sequence lies in a single plane,
+ * the computed point also lies in the plane.
+ *
+ * @param seq a coordinate sequence
+ * @return a Coordinate with averaged ordinates
+ */
+ private Coordinate averagePoint(CoordinateSequence seq) {
+ Coordinate a = new Coordinate(0,0,0);
+ int n = seq.size();
+ for (int i = 0; i < n; i++) {
+ a.x += seq.getOrdinate(i, CoordinateSequence.X);
+ a.y += seq.getOrdinate(i, CoordinateSequence.Y);
+ a.z += seq.getOrdinate(i, CoordinateSequence.Z);
+ }
+ a.x /= n;
+ a.y /= n;
+ a.z /= n;
+ return a;
+ }
+
+ public Plane3D getPlane() {
+ return plane;
+ }
+
+ public Polygon getPolygon() {
+ return poly;
+ }
+
+ public boolean intersects(Coordinate intPt) {
+ if (Location.EXTERIOR == locate(intPt, poly.getExteriorRing()))
+ return false;
+
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ if (Location.INTERIOR == locate(intPt, poly.getInteriorRingN(i)))
+ return false;
+ }
+ return true;
+ }
+
+ private int locate(Coordinate pt, LineString ring) {
+ CoordinateSequence seq = ring.getCoordinateSequence();
+ CoordinateSequence seqProj = project(seq, facingPlane);
+ Coordinate ptProj = project(pt, facingPlane);
+ return RayCrossingCounter.locatePointInRing(ptProj, seqProj);
+ }
+
+ public boolean intersects(Coordinate pt, LineString ring) {
+ CoordinateSequence seq = ring.getCoordinateSequence();
+ CoordinateSequence seqProj = project(seq, facingPlane);
+ Coordinate ptProj = project(pt, facingPlane);
+ return Location.EXTERIOR != RayCrossingCounter.locatePointInRing(ptProj, seqProj);
+ }
+
+ private static CoordinateSequence project(CoordinateSequence seq, int facingPlane)
+ {
+ switch (facingPlane) {
+ case Plane3D.XY_PLANE: return AxisPlaneCoordinateSequence.projectToXY(seq);
+ case Plane3D.XZ_PLANE: return AxisPlaneCoordinateSequence.projectToXZ(seq);
+ default: return AxisPlaneCoordinateSequence.projectToYZ(seq);
+ }
+ }
+
+ private static Coordinate project(Coordinate p, int facingPlane)
+ {
+ switch (facingPlane) {
+ case Plane3D.XY_PLANE: return new Coordinate(p.x, p.y);
+ case Plane3D.XZ_PLANE: return new Coordinate(p.x, p.z);
+ // Plane3D.YZ
+ default: return new Coordinate(p.y, p.z);
+ }
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/EdgeString.java b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/EdgeString.java
new file mode 100644
index 0000000..f993ae2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/EdgeString.java
@@ -0,0 +1,83 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.linemerge;
+
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * A sequence of {@link LineMergeDirectedEdge}s forming one of the lines that will
+ * be output by the line-merging process.
+ *
+ * @version 1.7
+ */
+public class EdgeString {
+ private GeometryFactory factory;
+ private List directedEdges = new ArrayList();
+ private Coordinate[] coordinates = null;
+ /**
+ * Constructs an EdgeString with the given factory used to convert this EdgeString
+ * to a LineString
+ */
+ public EdgeString(GeometryFactory factory) {
+ this.factory = factory;
+ }
+
+ /**
+ * Adds a directed edge which is known to form part of this line.
+ */
+ public void add(LineMergeDirectedEdge directedEdge) {
+ directedEdges.add(directedEdge);
+ }
+
+ private Coordinate[] getCoordinates() {
+ if (coordinates == null) {
+ int forwardDirectedEdges = 0;
+ int reverseDirectedEdges = 0;
+ CoordinateList coordinateList = new CoordinateList();
+ for (Iterator i = directedEdges.iterator(); i.hasNext();) {
+ LineMergeDirectedEdge directedEdge = (LineMergeDirectedEdge) i.next();
+ if (directedEdge.getEdgeDirection()) {
+ forwardDirectedEdges++;
+ }
+ else {
+ reverseDirectedEdges++;
+ }
+ coordinateList.add(((LineMergeEdge) directedEdge.getEdge()).getLine()
+ .getCoordinates(), false,
+ directedEdge.getEdgeDirection());
+ }
+ coordinates = coordinateList.toCoordinateArray();
+ if (reverseDirectedEdges > forwardDirectedEdges) {
+ CoordinateArrays.reverse(coordinates);
+ }
+ }
+
+ return coordinates;
+ }
+
+ /**
+ * Converts this EdgeString into a LineString.
+ */
+ public LineString toLineString() {
+ return factory.createLineString(getCoordinates());
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeDirectedEdge.java b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeDirectedEdge.java
new file mode 100644
index 0000000..90e2994
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeDirectedEdge.java
@@ -0,0 +1,59 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.linemerge;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.planargraph.Node;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * A {@link org.locationtech.jts.planargraph.DirectedEdge} of a
+ * {@link LineMergeGraph}.
+ *
+ * @version 1.7
+ */
+public class LineMergeDirectedEdge extends DirectedEdge {
+ /**
+ * Constructs a LineMergeDirectedEdge connecting the <code>from</code> node to the
+ * <code>to</code> node.
+ *
+ * @param directionPt
+ * specifies this DirectedEdge's direction (given by an imaginary
+ * line from the <code>from</code> node to <code>directionPt</code>)
+ * @param edgeDirection
+ * whether this DirectedEdge's direction is the same as or
+ * opposite to that of the parent Edge (if any)
+ */
+ public LineMergeDirectedEdge(Node from, Node to, Coordinate directionPt,
+ boolean edgeDirection) {
+ super(from, to, directionPt, edgeDirection);
+ }
+
+ /**
+ * Returns the directed edge that starts at this directed edge's end point, or null
+ * if there are zero or multiple directed edges starting there.
+ * @return the directed edge
+ */
+ public LineMergeDirectedEdge getNext() {
+ if (getToNode().getDegree() != 2) {
+ return null;
+ }
+ if (getToNode().getOutEdges().getEdges().get(0) == getSym()) {
+ return (LineMergeDirectedEdge) getToNode().getOutEdges().getEdges().get(1);
+ }
+ Assert.isTrue(getToNode().getOutEdges().getEdges().get(1) == getSym());
+
+ return (LineMergeDirectedEdge) getToNode().getOutEdges().getEdges().get(0);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeEdge.java b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeEdge.java
new file mode 100644
index 0000000..e217a58
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeEdge.java
@@ -0,0 +1,38 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.linemerge;
+
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.planargraph.Edge;
+
+/**
+ * An edge of a {@link LineMergeGraph}. The <code>marked</code> field indicates
+ * whether this Edge has been logically deleted from the graph.
+ *
+ * @version 1.7
+ */
+public class LineMergeEdge extends Edge {
+ private LineString line;
+ /**
+ * Constructs a LineMergeEdge with vertices given by the specified LineString.
+ */
+ public LineMergeEdge(LineString line) {
+ this.line = line;
+ }
+ /**
+ * Returns the LineString specifying the vertices of this edge.
+ */
+ public LineString getLine() {
+ return line;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeGraph.java b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeGraph.java
new file mode 100644
index 0000000..b922a24
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMergeGraph.java
@@ -0,0 +1,70 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.linemerge;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.planargraph.Edge;
+import org.locationtech.jts.planargraph.Node;
+import org.locationtech.jts.planargraph.PlanarGraph;
+
+/**
+ * A planar graph of edges that is analyzed to sew the edges together. The
+ * <code>marked</code> flag on {@link org.locationtech.jts.planargraph.Edge}s
+ * and {@link org.locationtech.jts.planargraph.Node}s indicates whether they have been
+ * logically deleted from the graph.
+ *
+ * @version 1.7
+ */
+public class LineMergeGraph extends PlanarGraph
+{
+ /**
+ * Adds an Edge, DirectedEdges, and Nodes for the given LineString representation
+ * of an edge.
+ * Empty lines or lines with all coordinates equal are not added.
+ *
+ * @param lineString the linestring to add to the graph
+ */
+ public void addEdge(LineString lineString) {
+ if (lineString.isEmpty()) { return; }
+
+ Coordinate[] coordinates = CoordinateArrays.removeRepeatedPoints(lineString.getCoordinates());
+
+ // don't add lines with all coordinates equal
+ if (coordinates.length <= 1) return;
+
+ Coordinate startCoordinate = coordinates[0];
+ Coordinate endCoordinate = coordinates[coordinates.length - 1];
+ Node startNode = getNode(startCoordinate);
+ Node endNode = getNode(endCoordinate);
+ DirectedEdge directedEdge0 = new LineMergeDirectedEdge(startNode, endNode,
+ coordinates[1], true);
+ DirectedEdge directedEdge1 = new LineMergeDirectedEdge(endNode, startNode,
+ coordinates[coordinates.length - 2], false);
+ Edge edge = new LineMergeEdge(lineString);
+ edge.setDirectedEdges(directedEdge0, directedEdge1);
+ add(edge);
+ }
+
+ private Node getNode(Coordinate coordinate) {
+ Node node = findNode(coordinate);
+ if (node == null) {
+ node = new Node(coordinate);
+ add(node);
+ }
+
+ return node;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMerger.java b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMerger.java
new file mode 100644
index 0000000..01ab151
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineMerger.java
@@ -0,0 +1,178 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.linemerge;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.planargraph.GraphComponent;
+import org.locationtech.jts.planargraph.Node;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * Merges a collection of linear components to form maximal-length linestrings.
+ * <p>
+ * Merging stops at nodes of degree 1 or degree 3 or more.
+ * In other words, all nodes of degree 2 are merged together.
+ * The exception is in the case of an isolated loop, which only has degree-2 nodes.
+ * In this case one of the nodes is chosen as a starting point.
+ * <p>
+ * The direction of each
+ * merged LineString will be that of the majority of the LineStrings from which it
+ * was derived.
+ * <p>
+ * Any dimension of Geometry is handled - the constituent linework is extracted to
+ * form the edges. The edges must be correctly noded; that is, they must only meet
+ * at their endpoints. The LineMerger will accept non-noded input
+ * but will not merge non-noded edges.
+ * <p>
+ * Input lines which are empty or contain only a single unique coordinate are not included
+ * in the merging.
+ *
+ * @version 1.7
+ */
+public class LineMerger
+{
+ private LineMergeGraph graph = new LineMergeGraph();
+ private Collection mergedLineStrings = null;
+ private GeometryFactory factory = null;
+
+ /**
+ * Creates a new line merger.
+ *
+ */
+ public LineMerger()
+ {
+
+ }
+
+ /**
+ * Adds a Geometry to be processed. May be called multiple times.
+ * Any dimension of Geometry may be added; the constituent linework will be
+ * extracted.
+ *
+ * @param geometry geometry to be line-merged
+ */
+ public void add(Geometry geometry) {
+ geometry.apply(new GeometryComponentFilter() {
+ public void filter(Geometry component) {
+ if (component instanceof LineString) {
+ add((LineString)component);
+ }
+ }
+ });
+ }
+ /**
+ * Adds a collection of Geometries to be processed. May be called multiple times.
+ * Any dimension of Geometry may be added; the constituent linework will be
+ * extracted.
+ *
+ * @param geometries the geometries to be line-merged
+ */
+ public void add(Collection geometries)
+ {
+ mergedLineStrings = null;
+ for (Iterator i = geometries.iterator(); i.hasNext(); ) {
+ Geometry geometry = (Geometry) i.next();
+ add(geometry);
+ }
+ }
+ private void add(LineString lineString) {
+ if (factory == null) {
+ this.factory = lineString.getFactory();
+ }
+ graph.addEdge(lineString);
+ }
+
+ private Collection edgeStrings = null;
+
+ private void merge()
+ {
+ if (mergedLineStrings != null) { return; }
+
+ // reset marks (this allows incremental processing)
+ GraphComponent.setMarked(graph.nodeIterator(), false);
+ GraphComponent.setMarked(graph.edgeIterator(), false);
+
+ edgeStrings = new ArrayList();
+ buildEdgeStringsForObviousStartNodes();
+ buildEdgeStringsForIsolatedLoops();
+ mergedLineStrings = new ArrayList();
+ for (Iterator i = edgeStrings.iterator(); i.hasNext(); ) {
+ EdgeString edgeString = (EdgeString) i.next();
+ mergedLineStrings.add(edgeString.toLineString());
+ }
+ }
+
+ private void buildEdgeStringsForObviousStartNodes() {
+ buildEdgeStringsForNonDegree2Nodes();
+ }
+
+ private void buildEdgeStringsForIsolatedLoops() {
+ buildEdgeStringsForUnprocessedNodes();
+ }
+
+ private void buildEdgeStringsForUnprocessedNodes() {
+ for (Iterator i = graph.getNodes().iterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ if (!node.isMarked()) {
+ Assert.isTrue(node.getDegree() == 2);
+ buildEdgeStringsStartingAt(node);
+ node.setMarked(true);
+ }
+ }
+ }
+ private void buildEdgeStringsForNonDegree2Nodes() {
+ for (Iterator i = graph.getNodes().iterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ if (node.getDegree() != 2) {
+ buildEdgeStringsStartingAt(node);
+ node.setMarked(true);
+ }
+ }
+ }
+ private void buildEdgeStringsStartingAt(Node node) {
+ for (Iterator i = node.getOutEdges().iterator(); i.hasNext(); ) {
+ LineMergeDirectedEdge directedEdge = (LineMergeDirectedEdge) i.next();
+ if (directedEdge.getEdge().isMarked()) { continue; }
+ edgeStrings.add(buildEdgeStringStartingWith(directedEdge));
+ }
+ }
+
+ private EdgeString buildEdgeStringStartingWith(LineMergeDirectedEdge start) {
+ EdgeString edgeString = new EdgeString(factory);
+ LineMergeDirectedEdge current = start;
+ do {
+ edgeString.add(current);
+ current.getEdge().setMarked(true);
+ current = current.getNext();
+ } while (current != null && current != start);
+ return edgeString;
+ }
+
+ /**
+ * Gets the {@link LineString}s created by the merging process.
+ *
+ * @return the collection of merged LineStrings
+ */
+ public Collection getMergedLineStrings() {
+ merge();
+ return mergedLineStrings;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineSequencer.java b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineSequencer.java
new file mode 100644
index 0000000..04d3dd6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/LineSequencer.java
@@ -0,0 +1,471 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.linemerge;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.planargraph.GraphComponent;
+import org.locationtech.jts.planargraph.Node;
+import org.locationtech.jts.planargraph.Subgraph;
+import org.locationtech.jts.planargraph.algorithm.ConnectedSubgraphFinder;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * Builds a sequence from a set of LineStrings so that
+ * they are ordered end to end.
+ * A sequence is a complete non-repeating list of the linear
+ * components of the input. Each linestring is oriented
+ * so that identical endpoints are adjacent in the list.
+ * <p>
+ * A typical use case is to convert a set of
+ * unoriented geometric links
+ * from a linear network
+ * (e.g. such as block faces on a bus route)
+ * into a continuous oriented path through the network.
+ * <p>
+ * The input linestrings may form one or more connected sets.
+ * The input linestrings should be correctly noded, or the results may
+ * not be what is expected.
+ * The computed output is a single {@link MultiLineString} containing the ordered
+ * linestrings in the sequence.
+ * <p>
+ * The sequencing employs the classic <b>Eulerian path</b> graph algorithm.
+ * Since Eulerian paths are not uniquely determined,
+ * further rules are used to
+ * make the computed sequence preserve as much as possible of the input
+ * ordering.
+ * Within a connected subset of lines, the ordering rules are:
+ * <ul>
+ * <li>If there is degree-1 node which is the start
+ * node of an linestring, use that node as the start of the sequence
+ * <li>If there is a degree-1 node which is the end
+ * node of an linestring, use that node as the end of the sequence
+ * <li>If the sequence has no degree-1 nodes, use any node as the start
+ * </ul>
+ *
+ * Note that not all arrangements of lines can be sequenced.
+ * For a connected set of edges in a graph,
+ * <i>Euler's Theorem</i> states that there is a sequence containing each edge once
+ * <b>if and only if</b> there are no more than 2 nodes of odd degree.
+ * If it is not possible to find a sequence, the {@link #isSequenceable()} method
+ * will return <code>false</code>.
+ *
+ * @version 1.7
+ */
+public class LineSequencer
+{
+ public static Geometry sequence(Geometry geom)
+ {
+ LineSequencer sequencer = new LineSequencer();
+ sequencer.add(geom);
+ return sequencer.getSequencedLineStrings();
+ }
+
+ /**
+ * Tests whether a {@link Geometry} is sequenced correctly.
+ * {@link LineString}s are trivially sequenced.
+ * {@link MultiLineString}s are checked for correct sequencing.
+ * Otherwise, <code>isSequenced</code> is defined
+ * to be <code>true</code> for geometries that are not lineal.
+ *
+ * @param geom the geometry to test
+ * @return <code>true</code> if the geometry is sequenced or is not lineal
+ */
+ public static boolean isSequenced(Geometry geom)
+ {
+ if (! (geom instanceof MultiLineString)) {
+ return true;
+ }
+
+ MultiLineString mls = (MultiLineString) geom;
+ // the nodes in all subgraphs which have been completely scanned
+ Set prevSubgraphNodes = new TreeSet();
+
+ Coordinate lastNode = null;
+ List currNodes = new ArrayList();
+ for (int i = 0; i < mls.getNumGeometries(); i++) {
+ LineString line = (LineString) mls.getGeometryN(i);
+ Coordinate startNode = line.getCoordinateN(0);
+ Coordinate endNode = line.getCoordinateN(line.getNumPoints() - 1);
+
+ /**
+ * If this linestring is connected to a previous subgraph, geom is not sequenced
+ */
+ if (prevSubgraphNodes.contains(startNode)) return false;
+ if (prevSubgraphNodes.contains(endNode)) return false;
+
+ if (lastNode != null) {
+ if (! startNode.equals(lastNode)) {
+ // start new connected sequence
+ prevSubgraphNodes.addAll(currNodes);
+ currNodes.clear();
+ }
+ }
+ currNodes.add(startNode);
+ currNodes.add(endNode);
+ lastNode = endNode;
+ }
+ return true;
+ }
+
+ private LineMergeGraph graph = new LineMergeGraph();
+ // initialize with default, in case no lines are input
+ private GeometryFactory factory = new GeometryFactory();
+ private int lineCount = 0;
+
+ private boolean isRun = false;
+ private Geometry sequencedGeometry = null;
+ private boolean isSequenceable = false;
+
+ /**
+ * Adds a {@link Collection} of {@link Geometry}s to be sequenced.
+ * May be called multiple times.
+ * Any dimension of Geometry may be added; the constituent linework will be
+ * extracted.
+ *
+ * @param geometries a Collection of geometries to add
+ */
+ public void add(Collection geometries) {
+ for (Iterator i = geometries.iterator(); i.hasNext(); ) {
+ Geometry geometry = (Geometry) i.next();
+ add(geometry);
+ }
+ }
+ /**
+ * Adds a {@link Geometry} to be sequenced.
+ * May be called multiple times.
+ * Any dimension of Geometry may be added; the constituent linework will be
+ * extracted.
+ *
+ * @param geometry the geometry to add
+ */
+ public void add(Geometry geometry) {
+ geometry.apply(new GeometryComponentFilter() {
+ public void filter(Geometry component) {
+ if (component instanceof LineString) {
+ addLine((LineString)component);
+ }
+ }
+ });
+ }
+
+ private void addLine(LineString lineString) {
+ if (factory == null) {
+ this.factory = lineString.getFactory();
+ }
+ graph.addEdge(lineString);
+ lineCount++;
+ }
+
+ /**
+ * Tests whether the arrangement of linestrings has a valid
+ * sequence.
+ *
+ * @return <code>true</code> if a valid sequence exists.
+ */
+ public boolean isSequenceable()
+ {
+ computeSequence();
+ return isSequenceable;
+ }
+ /**
+ * Returns the {@link LineString} or {@link MultiLineString}
+ * built by the sequencing process, if one exists.
+ *
+ * @return the sequenced linestrings,
+ * or <code>null</code> if a valid sequence does not exist
+ */
+ public Geometry getSequencedLineStrings() {
+ computeSequence();
+ return sequencedGeometry;
+ }
+
+ private void computeSequence() {
+ if (isRun) { return; }
+ isRun = true;
+
+ List sequences = findSequences();
+ if (sequences == null)
+ return;
+
+ sequencedGeometry = buildSequencedGeometry(sequences);
+ isSequenceable = true;
+
+ int finalLineCount = sequencedGeometry.getNumGeometries();
+ Assert.isTrue(lineCount == finalLineCount, "Lines were missing from result");
+ Assert.isTrue(sequencedGeometry instanceof LineString
+ || sequencedGeometry instanceof MultiLineString,
+ "Result is not lineal");
+ }
+
+ private List findSequences()
+ {
+ List sequences = new ArrayList();
+ ConnectedSubgraphFinder csFinder = new ConnectedSubgraphFinder(graph);
+ List subgraphs = csFinder.getConnectedSubgraphs();
+ for (Iterator i = subgraphs.iterator(); i.hasNext(); ) {
+ Subgraph subgraph = (Subgraph) i.next();
+ if (hasSequence(subgraph)) {
+ List seq = findSequence(subgraph);
+ sequences.add(seq);
+ }
+ else {
+ // if any subgraph cannot be sequenced, abort
+ return null;
+ }
+ }
+ return sequences;
+ }
+
+ /**
+ * Tests whether a complete unique path exists in a graph
+ * using Euler's Theorem.
+ *
+ * @param graph the subgraph containing the edges
+ * @return <code>true</code> if a sequence exists
+ */
+ private boolean hasSequence(Subgraph graph)
+ {
+ int oddDegreeCount = 0;
+ for (Iterator i = graph.nodeIterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ if (node.getDegree() % 2 == 1)
+ oddDegreeCount++;
+ }
+ return oddDegreeCount <= 2;
+ }
+
+ private List findSequence(Subgraph graph)
+ {
+ GraphComponent.setVisited(graph.edgeIterator(), false);
+
+ Node startNode = findLowestDegreeNode(graph);
+ DirectedEdge startDE = (DirectedEdge) startNode.getOutEdges().iterator().next();
+ DirectedEdge startDESym = startDE.getSym();
+
+ List seq = new LinkedList();
+ ListIterator lit = seq.listIterator();
+ addReverseSubpath(startDESym, lit, false);
+ while (lit.hasPrevious()) {
+ DirectedEdge prev = (DirectedEdge) lit.previous();
+ DirectedEdge unvisitedOutDE = findUnvisitedBestOrientedDE(prev.getFromNode());
+ if (unvisitedOutDE != null)
+ addReverseSubpath(unvisitedOutDE.getSym(), lit, true);
+ }
+
+ /**
+ * At this point, we have a valid sequence of graph DirectedEdges, but it
+ * is not necessarily appropriately oriented relative to the underlying
+ * geometry.
+ */
+ List orientedSeq = orient(seq);
+ return orientedSeq;
+ }
+
+ /**
+ * Finds an {@link DirectedEdge} for an unvisited edge (if any),
+ * choosing the dirEdge which preserves orientation, if possible.
+ *
+ * @param node the node to examine
+ * @return the dirEdge found, or <code>null</code> if none were unvisited
+ */
+ private static DirectedEdge findUnvisitedBestOrientedDE(Node node)
+ {
+ DirectedEdge wellOrientedDE = null;
+ DirectedEdge unvisitedDE = null;
+ for (Iterator i = node.getOutEdges().iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ if (! de.getEdge().isVisited()) {
+ unvisitedDE = de;
+ if (de.getEdgeDirection())
+ wellOrientedDE = de;
+ }
+ }
+ if (wellOrientedDE != null)
+ return wellOrientedDE;
+ return unvisitedDE;
+ }
+
+ private void addReverseSubpath(DirectedEdge de, ListIterator lit, boolean expectedClosed)
+ {
+ // trace an unvisited path *backwards* from this de
+ Node endNode = de.getToNode();
+
+ Node fromNode = null;
+ while (true) {
+ lit.add(de.getSym());
+ de.getEdge().setVisited(true);
+ fromNode = de.getFromNode();
+ DirectedEdge unvisitedOutDE = findUnvisitedBestOrientedDE(fromNode);
+ // this must terminate, since we are continually marking edges as visited
+ if (unvisitedOutDE == null)
+ break;
+ de = unvisitedOutDE.getSym();
+ }
+ if (expectedClosed) {
+ // the path should end at the toNode of this de, otherwise we have an error
+ Assert.isTrue(fromNode == endNode, "path not contiguous");
+ }
+ }
+
+ private static Node findLowestDegreeNode(Subgraph graph)
+ {
+ int minDegree = Integer.MAX_VALUE;
+ Node minDegreeNode = null;
+ for (Iterator i = graph.nodeIterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ if (minDegreeNode == null || node.getDegree() < minDegree) {
+ minDegree = node.getDegree();
+ minDegreeNode = node;
+ }
+ }
+ return minDegreeNode;
+ }
+
+ /**
+ * Computes a version of the sequence which is optimally
+ * oriented relative to the underlying geometry.
+ * <p>
+ * Heuristics used are:
+ * <ul>
+ * <li>If the path has a degree-1 node which is the start
+ * node of an linestring, use that node as the start of the sequence
+ * <li>If the path has a degree-1 node which is the end
+ * node of an linestring, use that node as the end of the sequence
+ * <li>If the sequence has no degree-1 nodes, use any node as the start
+ * (NOTE: in this case could orient the sequence according to the majority of the
+ * linestring orientations)
+ * </ul>
+ *
+ * @param seq a List of DirectedEdges
+ * @return a List of DirectedEdges oriented appropriately
+ */
+ private List orient(List seq)
+ {
+ DirectedEdge startEdge = (DirectedEdge) seq.get(0);
+ DirectedEdge endEdge = (DirectedEdge) seq.get(seq.size() - 1);
+ Node startNode = startEdge.getFromNode();
+ Node endNode = endEdge.getToNode();
+
+ boolean flipSeq = false;
+ boolean hasDegree1Node = startNode.getDegree() == 1
+ || endNode.getDegree() == 1;
+
+ if (hasDegree1Node) {
+ boolean hasObviousStartNode = false;
+
+ // test end edge before start edge, to make result stable
+ // (ie. if both are good starts, pick the actual start
+ if (endEdge.getToNode().getDegree() == 1 && endEdge.getEdgeDirection() == false) {
+ hasObviousStartNode = true;
+ flipSeq = true;
+ }
+ if (startEdge.getFromNode().getDegree() == 1 && startEdge.getEdgeDirection() == true) {
+ hasObviousStartNode = true;
+ flipSeq = false;
+ }
+
+ // since there is no obvious start node, use any node of degree 1
+ if (! hasObviousStartNode) {
+ // check if the start node should actually be the end node
+ if (startEdge.getFromNode().getDegree() == 1)
+ flipSeq = true;
+ // if the end node is of degree 1, it is properly the end node
+ }
+
+ }
+
+
+ // if there is no degree 1 node, just use the sequence as is
+ // (Could insert heuristic of taking direction of majority of lines as overall direction)
+
+ if (flipSeq)
+ return reverse(seq);
+ return seq;
+ }
+
+ /**
+ * Reverse the sequence.
+ * This requires reversing the order of the dirEdges, and flipping
+ * each dirEdge as well
+ *
+ * @param seq a List of DirectedEdges, in sequential order
+ * @return the reversed sequence
+ */
+ private List reverse(List seq)
+ {
+ LinkedList newSeq = new LinkedList();
+ for (Iterator i = seq.iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ newSeq.addFirst(de.getSym());
+ }
+ return newSeq;
+ }
+
+ /**
+ * Builds a geometry ({@link LineString} or {@link MultiLineString} )
+ * representing the sequence.
+ *
+ * @param sequences a List of Lists of DirectedEdges with
+ * LineMergeEdges as their parent edges.
+ * @return the sequenced geometry, or <code>null</code> if no sequence exists
+ */
+ private Geometry buildSequencedGeometry(List sequences)
+ {
+ List lines = new ArrayList();
+
+ for (Iterator i1 = sequences.iterator(); i1.hasNext(); ) {
+ List seq = (List) i1.next();
+ for (Iterator i2 = seq.iterator(); i2.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i2.next();
+ LineMergeEdge e = (LineMergeEdge) de.getEdge();
+ LineString line = e.getLine();
+
+ LineString lineToAdd = line;
+ if (! de.getEdgeDirection() && ! line.isClosed())
+ lineToAdd = reverse(line);
+
+ lines.add(lineToAdd);
+ }
+ }
+ if (lines.size() == 0)
+ return factory.createMultiLineString(new LineString[0]);
+ return factory.buildGeometry(lines);
+ }
+
+ private static LineString reverse(LineString line)
+ {
+ Coordinate[] pts = line.getCoordinates();
+ Coordinate[] revPts = new Coordinate[pts.length];
+ int len = pts.length;
+ for (int i = 0; i < len; i++) {
+ revPts[len - 1 - i] = new Coordinate(pts[i]);
+ }
+ return line.getFactory().createLineString(revPts);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/package.html
new file mode 100644
index 0000000..72fcd2f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/linemerge/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to perform line merging.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/ConsistentPolygonRingChecker.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/ConsistentPolygonRingChecker.java
new file mode 100644
index 0000000..9f1ac8b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/ConsistentPolygonRingChecker.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.DirectedEdgeStar;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.PlanarGraph;
+import org.locationtech.jts.geomgraph.Position;
+
+/**
+ * Tests whether the polygon rings in a {@link GeometryGraph}
+ * are consistent.
+ * Used for checking if Topology errors are present after noding.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class ConsistentPolygonRingChecker
+{
+ private PlanarGraph graph;
+
+ public ConsistentPolygonRingChecker(PlanarGraph graph) {
+ this.graph = graph;
+ }
+
+ public void checkAll()
+ {
+ check(OverlayOp.INTERSECTION);
+ check(OverlayOp.DIFFERENCE);
+ check(OverlayOp.UNION);
+ check(OverlayOp.SYMDIFFERENCE);
+ }
+
+ /**
+ * Tests whether the result geometry is consistent
+ *
+ * @throws TopologyException if inconsistent topology is found
+ */
+ public void check(int opCode)
+ {
+ for (Iterator nodeit = graph.getNodeIterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+ testLinkResultDirectedEdges((DirectedEdgeStar) node.getEdges(), opCode);
+ }
+ }
+
+ private List getPotentialResultAreaEdges(DirectedEdgeStar deStar, int opCode)
+ {
+//print(System.out);
+ List resultAreaEdgeList = new ArrayList();
+ for (Iterator it = deStar.iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ if (isPotentialResultAreaEdge(de, opCode) || isPotentialResultAreaEdge(de.getSym(), opCode) )
+ resultAreaEdgeList.add(de);
+ }
+ return resultAreaEdgeList;
+ }
+
+ private boolean isPotentialResultAreaEdge(DirectedEdge de, int opCode)
+ {
+ // mark all dirEdges with the appropriate label
+ Label label = de.getLabel();
+ if (label.isArea()
+ && ! de.isInteriorAreaEdge()
+ && OverlayOp.isResultOfOp(
+ label.getLocation(0, Position.RIGHT),
+ label.getLocation(1, Position.RIGHT),
+ opCode)
+ ) {
+ return true;
+//Debug.print("in result "); Debug.println(de);
+ }
+ return false;
+ }
+
+ private final int SCANNING_FOR_INCOMING = 1;
+ private final int LINKING_TO_OUTGOING = 2;
+
+ private void testLinkResultDirectedEdges(DirectedEdgeStar deStar, int opCode)
+ {
+ // make sure edges are copied to resultAreaEdges list
+ List ringEdges = getPotentialResultAreaEdges(deStar, opCode);
+ // find first area edge (if any) to start linking at
+ DirectedEdge firstOut = null;
+ DirectedEdge incoming = null;
+ int state = SCANNING_FOR_INCOMING;
+ // link edges in CCW order
+ for (int i = 0; i < ringEdges.size(); i++) {
+ DirectedEdge nextOut = (DirectedEdge) ringEdges.get(i);
+ DirectedEdge nextIn = nextOut.getSym();
+
+ // skip de's that we're not interested in
+ if (! nextOut.getLabel().isArea()) continue;
+
+ // record first outgoing edge, in order to link the last incoming edge
+ if (firstOut == null
+ && isPotentialResultAreaEdge(nextOut, opCode))
+ firstOut = nextOut;
+ // assert: sym.isInResult() == false, since pairs of dirEdges should have been removed already
+
+ switch (state) {
+ case SCANNING_FOR_INCOMING:
+ if (! isPotentialResultAreaEdge(nextIn, opCode)) continue;
+ incoming = nextIn;
+ state = LINKING_TO_OUTGOING;
+ break;
+ case LINKING_TO_OUTGOING:
+ if (! isPotentialResultAreaEdge(nextOut, opCode)) continue;
+ //incoming.setNext(nextOut);
+ state = SCANNING_FOR_INCOMING;
+ break;
+ }
+ }
+//Debug.print(this);
+ if (state == LINKING_TO_OUTGOING) {
+//Debug.print(firstOut == null, this);
+ if (firstOut == null)
+ throw new TopologyException("no outgoing dirEdge found", deStar.getCoordinate());
+ }
+
+ }
+
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/EdgeSetNoder.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/EdgeSetNoder.java
new file mode 100644
index 0000000..0377a96
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/EdgeSetNoder.java
@@ -0,0 +1,61 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.index.EdgeSetIntersector;
+import org.locationtech.jts.geomgraph.index.SegmentIntersector;
+import org.locationtech.jts.geomgraph.index.SimpleMCSweepLineIntersector;
+
+/**
+ * Nodes a set of edges.
+ * Takes one or more sets of edges and constructs a
+ * new set of edges consisting of all the split edges created by
+ * noding the input edges together
+ * @version 1.7
+ */
+public class EdgeSetNoder {
+
+ private LineIntersector li;
+ private List inputEdges = new ArrayList();
+
+ public EdgeSetNoder(LineIntersector li) {
+ this.li = li;
+ }
+
+ public void addEdges(List edges)
+ {
+ inputEdges.addAll(edges);
+ }
+
+ public List getNodedEdges()
+ {
+ EdgeSetIntersector esi = new SimpleMCSweepLineIntersector();
+ SegmentIntersector si = new SegmentIntersector(li, true, false);
+ esi.computeIntersections(inputEdges, si, true);
+//Debug.println("has proper int = " + si.hasProperIntersection());
+
+ List splitEdges = new ArrayList();
+ for (Iterator i = inputEdges.iterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ e.getEdgeIntersectionList().addSplitEdges(splitEdges);
+ }
+ return splitEdges;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/LineBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/LineBuilder.java
new file mode 100644
index 0000000..eb51459
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/LineBuilder.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.DirectedEdgeStar;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Forms JTS LineStrings out of a the graph of {@link DirectedEdge}s
+ * created by an {@link OverlayOp}.
+ *
+ * @version 1.7
+ */
+public class LineBuilder {
+ private OverlayOp op;
+ private GeometryFactory geometryFactory;
+ private PointLocator ptLocator;
+
+ private List lineEdgesList = new ArrayList();
+ private List resultLineList = new ArrayList();
+
+ public LineBuilder(OverlayOp op, GeometryFactory geometryFactory, PointLocator ptLocator) {
+ this.op = op;
+ this.geometryFactory = geometryFactory;
+ this.ptLocator = ptLocator;
+ }
+ /**
+ * @return a list of the LineStrings in the result of the specified overlay operation
+ */
+ public List build(int opCode)
+ {
+ findCoveredLineEdges();
+ collectLines(opCode);
+ //labelIsolatedLines(lineEdgesList);
+ buildLines(opCode);
+ return resultLineList;
+ }
+ /**
+ * Find and mark L edges which are "covered" by the result area (if any).
+ * L edges at nodes which also have A edges can be checked by checking
+ * their depth at that node.
+ * L edges at nodes which do not have A edges can be checked by doing a
+ * point-in-polygon test with the previously computed result areas.
+ */
+ private void findCoveredLineEdges()
+ {
+ // first set covered for all L edges at nodes which have A edges too
+ for (Iterator nodeit = op.getGraph().getNodes().iterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+//node.print(System.out);
+ ((DirectedEdgeStar) node.getEdges()).findCoveredLineEdges();
+ }
+
+ /**
+ * For all L edges which weren't handled by the above,
+ * use a point-in-poly test to determine whether they are covered
+ */
+ for (Iterator it = op.getGraph().getEdgeEnds().iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ Edge e = de.getEdge();
+ if (de.isLineEdge() && ! e.isCoveredSet()) {
+ boolean isCovered = op.isCoveredByA(de.getCoordinate());
+ e.setCovered(isCovered);
+ }
+ }
+ }
+
+ private void collectLines(int opCode)
+ {
+ for (Iterator it = op.getGraph().getEdgeEnds().iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ collectLineEdge(de, opCode, lineEdgesList);
+ collectBoundaryTouchEdge(de, opCode, lineEdgesList);
+ }
+ }
+
+ /**
+ * Collect line edges which are in the result.
+ * Line edges are in the result if they are not part of
+ * an area boundary, if they are in the result of the overlay operation,
+ * and if they are not covered by a result area.
+ *
+ * @param de the directed edge to test
+ * @param opCode the overlap operation
+ * @param edges the list of included line edges
+ */
+ private void collectLineEdge(DirectedEdge de, int opCode, List edges)
+ {
+ Label label = de.getLabel();
+ Edge e = de.getEdge();
+ // include L edges which are in the result
+ if (de.isLineEdge()) {
+ if (! de.isVisited() && OverlayOp.isResultOfOp(label, opCode) && ! e.isCovered()) {
+//Debug.println("de: " + de.getLabel());
+//Debug.println("edge: " + e.getLabel());
+
+ edges.add(e);
+ de.setVisitedEdge(true);
+ }
+ }
+ }
+
+ /**
+ * Collect edges from Area inputs which should be in the result but
+ * which have not been included in a result area.
+ * This happens ONLY:
+ * <ul>
+ * <li>during an intersection when the boundaries of two
+ * areas touch in a line segment
+ * <li> OR as a result of a dimensional collapse.
+ * </ul>
+ */
+ private void collectBoundaryTouchEdge(DirectedEdge de, int opCode, List edges)
+ {
+ Label label = de.getLabel();
+ if (de.isLineEdge()) return; // only interested in area edges
+ if (de.isVisited()) return; // already processed
+ if (de.isInteriorAreaEdge()) return; // added to handle dimensional collapses
+ if (de.getEdge().isInResult()) return; // if the edge linework is already included, don't include it again
+
+ // sanity check for labelling of result edgerings
+ Assert.isTrue(! (de.isInResult() || de.getSym().isInResult()) || ! de.getEdge().isInResult());
+
+ // include the linework if it's in the result of the operation
+ if (OverlayOp.isResultOfOp(label, opCode)
+ && opCode == OverlayOp.INTERSECTION)
+ {
+ edges.add(de.getEdge());
+ de.setVisitedEdge(true);
+ }
+ }
+
+ private void buildLines(int opCode)
+ {
+ for (Iterator it = lineEdgesList.iterator(); it.hasNext(); ) {
+ Edge e = (Edge) it.next();
+ Label label = e.getLabel();
+ LineString line = geometryFactory.createLineString(e.getCoordinates());
+ resultLineList.add(line);
+ e.setInResult(true);
+ }
+ }
+
+ private void labelIsolatedLines(List edgesList)
+ {
+ for (Iterator it = edgesList.iterator(); it.hasNext(); ) {
+ Edge e = (Edge) it.next();
+ Label label = e.getLabel();
+//n.print(System.out);
+ if (e.isIsolated()) {
+ if (label.isNull(0))
+ labelIsolatedLine(e, 0);
+ else
+ labelIsolatedLine(e, 1);
+ }
+ }
+ }
+ /**
+ * Label an isolated node with its relationship to the target geometry.
+ */
+ private void labelIsolatedLine(Edge e, int targetIndex)
+ {
+ int loc = ptLocator.locate(e.getCoordinate(), op.getArgGeometry(targetIndex));
+ e.getLabel().setLocation(targetIndex, loc);
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/MaximalEdgeRing.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/MaximalEdgeRing.java
new file mode 100644
index 0000000..f9a5770
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/MaximalEdgeRing.java
@@ -0,0 +1,88 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.DirectedEdgeStar;
+import org.locationtech.jts.geomgraph.EdgeRing;
+import org.locationtech.jts.geomgraph.Node;
+
+/**
+ * A ring of {@link DirectedEdge}s which may contain nodes of degree > 2.
+ * A <tt>MaximalEdgeRing</tt> may represent two different spatial entities:
+ * <ul>
+ * <li>a single polygon possibly containing inversions (if the ring is oriented CW)
+ * <li>a single hole possibly containing exversions (if the ring is oriented CCW)
+ * </ul>
+ * If the MaximalEdgeRing represents a polygon,
+ * the interior of the polygon is strongly connected.
+ * <p>
+ * These are the form of rings used to define polygons under some spatial data models.
+ * However, under the OGC SFS model, {@link MinimalEdgeRing}s are required.
+ * A MaximalEdgeRing can be converted to a list of MinimalEdgeRings using the
+ * {@link #buildMinimalRings() } method.
+ *
+ * @version 1.7
+ * @see org.locationtech.jts.operation.overlay.MinimalEdgeRing
+ */
+public class MaximalEdgeRing
+ extends EdgeRing
+{
+
+ public MaximalEdgeRing(DirectedEdge start, GeometryFactory geometryFactory) {
+ super(start, geometryFactory);
+ }
+
+ public DirectedEdge getNext(DirectedEdge de)
+ {
+ return de.getNext();
+ }
+ public void setEdgeRing(DirectedEdge de, EdgeRing er)
+ {
+ de.setEdgeRing(er);
+ }
+
+ /**
+ * For all nodes in this EdgeRing,
+ * link the DirectedEdges at the node to form minimalEdgeRings
+ */
+ public void linkDirectedEdgesForMinimalEdgeRings()
+ {
+ DirectedEdge de = startDe;
+ do {
+ Node node = de.getNode();
+ ((DirectedEdgeStar) node.getEdges()).linkMinimalDirectedEdges(this);
+ de = de.getNext();
+ } while (de != startDe);
+ }
+
+ public List buildMinimalRings()
+ {
+ List minEdgeRings = new ArrayList();
+ DirectedEdge de = startDe;
+ do {
+ if (de.getMinEdgeRing() == null) {
+ EdgeRing minEr = new MinimalEdgeRing(de, geometryFactory);
+ minEdgeRings.add(minEr);
+ }
+ de = de.getNext();
+ } while (de != startDe);
+ return minEdgeRings;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/MinimalEdgeRing.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/MinimalEdgeRing.java
new file mode 100644
index 0000000..525555b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/MinimalEdgeRing.java
@@ -0,0 +1,46 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeRing;
+
+/**
+ * A ring of {@link Edge}s with the property that no node
+ * has degree greater than 2. These are the form of rings required
+ * to represent polygons under the OGC SFS spatial data model.
+ *
+ * @version 1.7
+ * @see org.locationtech.jts.operation.overlay.MaximalEdgeRing
+ */
+public class MinimalEdgeRing
+ extends EdgeRing
+{
+
+ public MinimalEdgeRing(DirectedEdge start, GeometryFactory geometryFactory) {
+ super(start, geometryFactory);
+ }
+
+ public DirectedEdge getNext(DirectedEdge de)
+ {
+ return de.getNextMin();
+ }
+ public void setEdgeRing(DirectedEdge de, EdgeRing er)
+ {
+ de.setMinEdgeRing(er);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/OverlayNodeFactory.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/OverlayNodeFactory.java
new file mode 100644
index 0000000..a7a062f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/OverlayNodeFactory.java
@@ -0,0 +1,38 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+/**
+ * @version 1.7
+ */
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.DirectedEdgeStar;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.NodeFactory;
+import org.locationtech.jts.geomgraph.PlanarGraph;
+
+/**
+ * Creates nodes for use in the {@link PlanarGraph}s constructed during
+ * overlay operations.
+ *
+ * @version 1.7
+ */
+public class OverlayNodeFactory
+ extends NodeFactory
+{
+ public Node createNode(Coordinate coord)
+ {
+ return new Node(coord, new DirectedEdgeStar());
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/OverlayOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/OverlayOp.java
new file mode 100644
index 0000000..0551d70
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/OverlayOp.java
@@ -0,0 +1,689 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.geomgraph.Depth;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.DirectedEdgeStar;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeList;
+import org.locationtech.jts.geomgraph.EdgeNodingValidator;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.PlanarGraph;
+import org.locationtech.jts.geomgraph.Position;
+import org.locationtech.jts.operation.GeometryGraphOperation;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Computes the geometric overlay of two {@link Geometry}s. The overlay
+ * can be used to determine any boolean combination of the geometries.
+ *
+ * @version 1.7
+ */
+public class OverlayOp
+ extends GeometryGraphOperation
+{
+/**
+ * The spatial functions supported by this class.
+ * These operations implement various boolean combinations of the resultants of the overlay.
+ */
+
+ /**
+ * The code for the Intersection overlay operation.
+ */
+ public static final int INTERSECTION = 1;
+
+ /**
+ * The code for the Union overlay operation.
+ */
+ public static final int UNION = 2;
+
+ /**
+ * The code for the Difference overlay operation.
+ */
+ public static final int DIFFERENCE = 3;
+
+ /**
+ * The code for the Symmetric Difference overlay operation.
+ */
+ public static final int SYMDIFFERENCE = 4;
+
+ /**
+ * Computes an overlay operation for
+ * the given geometry arguments.
+ *
+ * @param geom0 the first geometry argument
+ * @param geom1 the second geometry argument
+ * @param opCode the code for the desired overlay operation
+ * @return the result of the overlay operation
+ * @throws TopologyException if a robustness problem is encountered
+ */
+ public static Geometry overlayOp(Geometry geom0, Geometry geom1, int opCode)
+ {
+ OverlayOp gov = new OverlayOp(geom0, geom1);
+ Geometry geomOv = gov.getResultGeometry(opCode);
+ return geomOv;
+ }
+
+ /**
+ * Tests whether a point with a given topological {@link Label}
+ * relative to two geometries is contained in
+ * the result of overlaying the geometries using
+ * a given overlay operation.
+ * <p>
+ * The method handles arguments of {@link Location#NONE} correctly
+ *
+ * @param label the topological label of the point
+ * @param opCode the code for the overlay operation to test
+ * @return true if the label locations correspond to the overlayOpCode
+ */
+ public static boolean isResultOfOp(Label label, int opCode)
+ {
+ int loc0 = label.getLocation(0);
+ int loc1 = label.getLocation(1);
+ return isResultOfOp(loc0, loc1, opCode);
+ }
+
+ /**
+ * Tests whether a point with given {@link Location}s
+ * relative to two geometries is contained in
+ * the result of overlaying the geometries using
+ * a given overlay operation.
+ * <p>
+ * The method handles arguments of {@link Location#NONE} correctly
+ *
+ * @param loc0 the code for the location in the first geometry
+ * @param loc1 the code for the location in the second geometry
+ * @param overlayOpCode the code for the overlay operation to test
+ * @return true if the locations correspond to the overlayOpCode
+ */
+ public static boolean isResultOfOp(int loc0, int loc1, int overlayOpCode)
+ {
+ if (loc0 == Location.BOUNDARY) loc0 = Location.INTERIOR;
+ if (loc1 == Location.BOUNDARY) loc1 = Location.INTERIOR;
+ switch (overlayOpCode) {
+ case INTERSECTION:
+ return loc0 == Location.INTERIOR
+ && loc1 == Location.INTERIOR;
+ case UNION:
+ return loc0 == Location.INTERIOR
+ || loc1 == Location.INTERIOR;
+ case DIFFERENCE:
+ return loc0 == Location.INTERIOR
+ && loc1 != Location.INTERIOR;
+ case SYMDIFFERENCE:
+ return ( loc0 == Location.INTERIOR && loc1 != Location.INTERIOR)
+ || ( loc0 != Location.INTERIOR && loc1 == Location.INTERIOR);
+ }
+ return false;
+ }
+
+ private final PointLocator ptLocator = new PointLocator();
+ private GeometryFactory geomFact;
+ private Geometry resultGeom;
+
+ private PlanarGraph graph;
+ private EdgeList edgeList = new EdgeList();
+
+ private List resultPolyList = new ArrayList();
+ private List resultLineList = new ArrayList();
+ private List resultPointList = new ArrayList();
+
+ /**
+ * Constructs an instance to compute a single overlay operation
+ * for the given geometries.
+ *
+ * @param g0 the first geometry argument
+ * @param g1 the second geometry argument
+ */
+ public OverlayOp(Geometry g0, Geometry g1) {
+ super(g0, g1);
+ graph = new PlanarGraph(new OverlayNodeFactory());
+ /**
+ * Use factory of primary geometry.
+ * Note that this does NOT handle mixed-precision arguments
+ * where the second arg has greater precision than the first.
+ */
+ geomFact = g0.getFactory();
+ }
+
+ /**
+ * Gets the result of the overlay for a given overlay operation.
+ * <p>
+ * Note: this method can be called once only.
+ *
+ * @param overlayOpCode the overlay operation to perform
+ * @return the compute result geometry
+ * @throws TopologyException if a robustness problem is encountered
+ */
+ public Geometry getResultGeometry(int overlayOpCode)
+ {
+ computeOverlay(overlayOpCode);
+ return resultGeom;
+ }
+
+ /**
+ * Gets the graph constructed to compute the overlay.
+ *
+ * @return the overlay graph
+ */
+ public PlanarGraph getGraph() { return graph; }
+
+ private void computeOverlay(int opCode)
+ {
+ // copy points from input Geometries.
+ // This ensures that any Point geometries
+ // in the input are considered for inclusion in the result set
+ copyPoints(0);
+ copyPoints(1);
+
+ // node the input Geometries
+ arg[0].computeSelfNodes(li, false);
+ arg[1].computeSelfNodes(li, false);
+
+ // compute intersections between edges of the two input geometries
+ arg[0].computeEdgeIntersections(arg[1], li, true);
+
+ List baseSplitEdges = new ArrayList();
+ arg[0].computeSplitEdges(baseSplitEdges);
+ arg[1].computeSplitEdges(baseSplitEdges);
+ List splitEdges = baseSplitEdges;
+ // add the noded edges to this result graph
+ insertUniqueEdges(baseSplitEdges);
+
+ computeLabelsFromDepths();
+ replaceCollapsedEdges();
+
+//Debug.println(edgeList);
+
+ /**
+ * Check that the noding completed correctly.
+ *
+ * This test is slow, but necessary in order to catch robustness failure
+ * situations.
+ * If an exception is thrown because of a noding failure,
+ * then snapping will be performed, which will hopefully avoid the problem.
+ * In the future hopefully a faster check can be developed.
+ *
+ */
+ EdgeNodingValidator.checkValid(edgeList.getEdges());
+
+ graph.addEdges(edgeList.getEdges());
+ computeLabelling();
+//Debug.printWatch();
+ labelIncompleteNodes();
+//Debug.printWatch();
+//nodeMap.print(System.out);
+
+ /**
+ * The ordering of building the result Geometries is important.
+ * Areas must be built before lines, which must be built before points.
+ * This is so that lines which are covered by areas are not included
+ * explicitly, and similarly for points.
+ */
+ findResultAreaEdges(opCode);
+ cancelDuplicateResultEdges();
+
+ PolygonBuilder polyBuilder = new PolygonBuilder(geomFact);
+ polyBuilder.add(graph);
+ resultPolyList = polyBuilder.getPolygons();
+
+ LineBuilder lineBuilder = new LineBuilder(this, geomFact, ptLocator);
+ resultLineList = lineBuilder.build(opCode);
+
+ PointBuilder pointBuilder = new PointBuilder(this, geomFact, ptLocator);
+ resultPointList = pointBuilder.build(opCode);
+
+ // gather the results from all calculations into a single Geometry for the result set
+ resultGeom = computeGeometry(resultPointList, resultLineList, resultPolyList, opCode);
+ }
+
+ private void insertUniqueEdges(List edges)
+ {
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ insertUniqueEdge(e);
+ }
+ }
+ /**
+ * Insert an edge from one of the noded input graphs.
+ * Checks edges that are inserted to see if an
+ * identical edge already exists.
+ * If so, the edge is not inserted, but its label is merged
+ * with the existing edge.
+ */
+ protected void insertUniqueEdge(Edge e)
+ {
+//<FIX> MD 8 Oct 03 speed up identical edge lookup
+ // fast lookup
+ Edge existingEdge = edgeList.findEqualEdge(e);
+
+ // If an identical edge already exists, simply update its label
+ if (existingEdge != null) {
+ Label existingLabel = existingEdge.getLabel();
+
+ Label labelToMerge = e.getLabel();
+ // check if new edge is in reverse direction to existing edge
+ // if so, must flip the label before merging it
+ if (! existingEdge.isPointwiseEqual(e)) {
+ labelToMerge = new Label(e.getLabel());
+ labelToMerge.flip();
+ }
+ Depth depth = existingEdge.getDepth();
+ // if this is the first duplicate found for this edge, initialize the depths
+ ///*
+ if (depth.isNull()) {
+ depth.add(existingLabel);
+ }
+ //*/
+ depth.add(labelToMerge);
+ existingLabel.merge(labelToMerge);
+//Debug.print("inserted edge: "); Debug.println(e);
+//Debug.print("existing edge: "); Debug.println(existingEdge);
+
+ }
+ else { // no matching existing edge was found
+ // add this new edge to the list of edges in this graph
+ //e.setName(name + edges.size());
+ //e.getDepth().add(e.getLabel());
+ edgeList.add(e);
+ }
+ }
+
+ /**
+ * If either of the GeometryLocations for the existing label is
+ * exactly opposite to the one in the labelToMerge,
+ * this indicates a dimensional collapse has happened.
+ * In this case, convert the label for that Geometry to a Line label
+ */
+ /* NOT NEEDED?
+ private void checkDimensionalCollapse(Label labelToMerge, Label existingLabel)
+ {
+ if (existingLabel.isArea() && labelToMerge.isArea()) {
+ for (int i = 0; i < 2; i++) {
+ if (! labelToMerge.isNull(i)
+ && labelToMerge.getLocation(i, Position.LEFT) == existingLabel.getLocation(i, Position.RIGHT)
+ && labelToMerge.getLocation(i, Position.RIGHT) == existingLabel.getLocation(i, Position.LEFT) )
+ {
+ existingLabel.toLine(i);
+ }
+ }
+ }
+ }
+ */
+ /**
+ * Update the labels for edges according to their depths.
+ * For each edge, the depths are first normalized.
+ * Then, if the depths for the edge are equal,
+ * this edge must have collapsed into a line edge.
+ * If the depths are not equal, update the label
+ * with the locations corresponding to the depths
+ * (i.e. a depth of 0 corresponds to a Location of EXTERIOR,
+ * a depth of 1 corresponds to INTERIOR)
+ */
+ private void computeLabelsFromDepths()
+ {
+ for (Iterator it = edgeList.iterator(); it.hasNext(); ) {
+ Edge e = (Edge) it.next();
+ Label lbl = e.getLabel();
+ Depth depth = e.getDepth();
+ /**
+ * Only check edges for which there were duplicates,
+ * since these are the only ones which might
+ * be the result of dimensional collapses.
+ */
+ if (! depth.isNull()) {
+ depth.normalize();
+ for (int i = 0; i < 2; i++) {
+ if (! lbl.isNull(i) && lbl.isArea() && ! depth.isNull(i)) {
+ /**
+ * if the depths are equal, this edge is the result of
+ * the dimensional collapse of two or more edges.
+ * It has the same location on both sides of the edge,
+ * so it has collapsed to a line.
+ */
+ if (depth.getDelta(i) == 0) {
+ lbl.toLine(i);
+ }
+ else {
+ /**
+ * This edge may be the result of a dimensional collapse,
+ * but it still has different locations on both sides. The
+ * label of the edge must be updated to reflect the resultant
+ * side locations indicated by the depth values.
+ */
+ Assert.isTrue(! depth.isNull(i, Position.LEFT), "depth of LEFT side has not been initialized");
+ lbl.setLocation(i, Position.LEFT, depth.getLocation(i, Position.LEFT));
+ Assert.isTrue(! depth.isNull(i, Position.RIGHT), "depth of RIGHT side has not been initialized");
+ lbl.setLocation(i, Position.RIGHT, depth.getLocation(i, Position.RIGHT));
+ }
+ }
+ }
+ }
+ }
+ }
+ /**
+ * If edges which have undergone dimensional collapse are found,
+ * replace them with a new edge which is a L edge
+ */
+ private void replaceCollapsedEdges()
+ {
+ List newEdges = new ArrayList();
+ for (Iterator it = edgeList.iterator(); it.hasNext(); ) {
+ Edge e = (Edge) it.next();
+ if (e.isCollapsed()) {
+//Debug.print(e);
+ it.remove();
+ newEdges.add(e.getCollapsedEdge());
+ }
+ }
+ edgeList.addAll(newEdges);
+ }
+ /**
+ * Copy all nodes from an arg geometry into this graph.
+ * The node label in the arg geometry overrides any previously computed
+ * label for that argIndex.
+ * (E.g. a node may be an intersection node with
+ * a previously computed label of BOUNDARY,
+ * but in the original arg Geometry it is actually
+ * in the interior due to the Boundary Determination Rule)
+ */
+ private void copyPoints(int argIndex)
+ {
+ for (Iterator i = arg[argIndex].getNodeIterator(); i.hasNext(); ) {
+ Node graphNode = (Node) i.next();
+ Node newNode = graph.addNode(graphNode.getCoordinate());
+ newNode.setLabel(argIndex, graphNode.getLabel().getLocation(argIndex));
+ }
+ }
+
+ /**
+ * Compute initial labelling for all DirectedEdges at each node.
+ * In this step, DirectedEdges will acquire a complete labelling
+ * (i.e. one with labels for both Geometries)
+ * only if they
+ * are incident on a node which has edges for both Geometries
+ */
+ private void computeLabelling()
+ {
+ for (Iterator nodeit = graph.getNodes().iterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+//if (node.getCoordinate().equals(new Coordinate(222, 100)) ) Debug.addWatch(node.getEdges());
+ node.getEdges().computeLabelling(arg);
+ }
+ mergeSymLabels();
+ updateNodeLabelling();
+ }
+ /**
+ * For nodes which have edges from only one Geometry incident on them,
+ * the previous step will have left their dirEdges with no labelling for the other
+ * Geometry. However, the sym dirEdge may have a labelling for the other
+ * Geometry, so merge the two labels.
+ */
+ private void mergeSymLabels()
+ {
+ for (Iterator nodeit = graph.getNodes().iterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+ ((DirectedEdgeStar) node.getEdges()).mergeSymLabels();
+//node.print(System.out);
+ }
+ }
+ private void updateNodeLabelling()
+ {
+ // update the labels for nodes
+ // The label for a node is updated from the edges incident on it
+ // (Note that a node may have already been labelled
+ // because it is a point in one of the input geometries)
+ for (Iterator nodeit = graph.getNodes().iterator(); nodeit.hasNext(); ) {
+ Node node = (Node) nodeit.next();
+ Label lbl = ((DirectedEdgeStar) node.getEdges()).getLabel();
+ node.getLabel().merge(lbl);
+ }
+ }
+
+ /**
+ * Incomplete nodes are nodes whose labels are incomplete.
+ * (e.g. the location for one Geometry is null).
+ * These are either isolated nodes,
+ * or nodes which have edges from only a single Geometry incident on them.
+ *
+ * Isolated nodes are found because nodes in one graph which don't intersect
+ * nodes in the other are not completely labelled by the initial process
+ * of adding nodes to the nodeList.
+ * To complete the labelling we need to check for nodes that lie in the
+ * interior of edges, and in the interior of areas.
+ * <p>
+ * When each node labelling is completed, the labelling of the incident
+ * edges is updated, to complete their labelling as well.
+ */
+ private void labelIncompleteNodes()
+ {
+ int nodeCount = 0;
+ for (Iterator ni = graph.getNodes().iterator(); ni.hasNext(); ) {
+ Node n = (Node) ni.next();
+ Label label = n.getLabel();
+ if (n.isIsolated()) {
+ nodeCount++;
+ if (label.isNull(0))
+ labelIncompleteNode(n, 0);
+ else
+ labelIncompleteNode(n, 1);
+ }
+ // now update the labelling for the DirectedEdges incident on this node
+ ((DirectedEdgeStar) n.getEdges()).updateLabelling(label);
+//n.print(System.out);
+ }
+ /*
+ int nPoly0 = arg[0].getGeometry().getNumGeometries();
+ int nPoly1 = arg[1].getGeometry().getNumGeometries();
+ System.out.println("# isolated nodes= " + nodeCount
+ + " # poly[0] = " + nPoly0
+ + " # poly[1] = " + nPoly1);
+ */
+ }
+
+ /**
+ * Label an isolated node with its relationship to the target geometry.
+ */
+ private void labelIncompleteNode(Node n, int targetIndex)
+ {
+ int loc = ptLocator.locate(n.getCoordinate(), arg[targetIndex].getGeometry());
+
+ // MD - 2008-10-24 - experimental for now
+// int loc = arg[targetIndex].locate(n.getCoordinate());
+ n.getLabel().setLocation(targetIndex, loc);
+ }
+
+ /**
+ * Find all edges whose label indicates that they are in the result area(s),
+ * according to the operation being performed. Since we want polygon shells to be
+ * oriented CW, choose dirEdges with the interior of the result on the RHS.
+ * Mark them as being in the result.
+ * Interior Area edges are the result of dimensional collapses.
+ * They do not form part of the result area boundary.
+ */
+ private void findResultAreaEdges(int opCode)
+ {
+ for (Iterator it = graph.getEdgeEnds().iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ // mark all dirEdges with the appropriate label
+ Label label = de.getLabel();
+ if (label.isArea()
+ && ! de.isInteriorAreaEdge()
+ && isResultOfOp(
+ label.getLocation(0, Position.RIGHT),
+ label.getLocation(1, Position.RIGHT),
+ opCode)) {
+ de.setInResult(true);
+//Debug.print("in result "); Debug.println(de);
+ }
+ }
+ }
+ /**
+ * If both a dirEdge and its sym are marked as being in the result, cancel
+ * them out.
+ */
+ private void cancelDuplicateResultEdges()
+ {
+ // remove any dirEdges whose sym is also included
+ // (they "cancel each other out")
+ for (Iterator it = graph.getEdgeEnds().iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ DirectedEdge sym = de.getSym();
+ if (de.isInResult() && sym.isInResult()) {
+ de.setInResult(false);
+ sym.setInResult(false);
+//Debug.print("cancelled "); Debug.println(de); Debug.println(sym);
+ }
+ }
+ }
+ /**
+ * Tests if a point node should be included in the result or not.
+ *
+ * @param coord the point coordinate
+ * @return true if the coordinate point is covered by a result Line or Area geometry
+ */
+ public boolean isCoveredByLA(Coordinate coord)
+ {
+ if (isCovered(coord, resultLineList)) return true;
+ if (isCovered(coord, resultPolyList)) return true;
+ return false;
+ }
+ /**
+ * Tests if an L edge should be included in the result or not.
+ *
+ * @param coord the point coordinate
+ * @return true if the coordinate point is covered by a result Area geometry
+ */
+ public boolean isCoveredByA(Coordinate coord)
+ {
+ if (isCovered(coord, resultPolyList)) return true;
+ return false;
+ }
+ /**
+ * @return true if the coord is located in the interior or boundary of
+ * a geometry in the list.
+ */
+ private boolean isCovered(Coordinate coord, List geomList)
+ {
+ for (Iterator it = geomList.iterator(); it.hasNext(); ) {
+ Geometry geom = (Geometry) it.next();
+ int loc = ptLocator.locate(coord, geom);
+ if (loc != Location.EXTERIOR) return true;
+ }
+ return false;
+ }
+
+ private Geometry computeGeometry( List resultPointList,
+ List resultLineList,
+ List resultPolyList,
+ int opcode)
+ {
+ List geomList = new ArrayList();
+ // element geometries of the result are always in the order P,L,A
+ geomList.addAll(resultPointList);
+ geomList.addAll(resultLineList);
+ geomList.addAll(resultPolyList);
+
+ //*
+ if (geomList.isEmpty())
+ return createEmptyResult(opcode, arg[0].getGeometry(), arg[1].getGeometry(), geomFact);
+ //*/
+
+ // build the most specific geometry possible
+ return geomFact.buildGeometry(geomList);
+ }
+
+ /**
+ * Creates an empty result geometry of the appropriate dimension,
+ * based on the given overlay operation and the dimensions of the inputs.
+ * The created geometry is always an atomic geometry,
+ * not a collection.
+ * <p>
+ * The empty result is constructed using the following rules:
+ * <ul>
+ * <li>{@link #INTERSECTION} - result has the dimension of the lowest input dimension
+ * <li>{@link #UNION} - result has the dimension of the highest input dimension
+ * <li>{@link #DIFFERENCE} - result has the dimension of the left-hand input
+ * <li>{@link #SYMDIFFERENCE} - result has the dimension of the highest input dimension
+ * (since the symmetric Difference is the union of the differences).
+ * </ul>
+ *
+ * @param overlayOpCode the code for the overlay operation being performed
+ * @param a an input geometry
+ * @param b an input geometry
+ * @param geomFact the geometry factory being used for the operation
+ * @return an empty atomic geometry of the appropriate dimension
+ */
+ public static Geometry createEmptyResult(int overlayOpCode, Geometry a, Geometry b, GeometryFactory geomFact)
+ {
+ Geometry result = null;
+ switch (resultDimension(overlayOpCode, a, b)) {
+ case -1:
+ result = geomFact.createGeometryCollection();
+ break;
+ case 0:
+ result = geomFact.createPoint();
+ break;
+ case 1:
+ result = geomFact.createLineString();
+ break;
+ case 2:
+ result = geomFact.createPolygon();
+ break;
+ }
+ return result;
+ }
+
+ private static int resultDimension(int opCode, Geometry g0, Geometry g1)
+ {
+ int dim0 = g0.getDimension();
+ int dim1 = g1.getDimension();
+
+ int resultDimension = -1;
+ switch (opCode) {
+ case INTERSECTION:
+ resultDimension = Math.min(dim0, dim1);
+ break;
+ case UNION:
+ resultDimension = Math.max(dim0, dim1);
+ break;
+ case DIFFERENCE:
+ resultDimension = dim0;
+ break;
+ case SYMDIFFERENCE:
+ /**
+ * This result is chosen because
+ * <pre>
+ * SymDiff = Union(Diff(A, B), Diff(B, A)
+ * </pre>
+ * and Union has the dimension of the highest-dimension argument.
+ */
+ resultDimension = Math.max(dim0, dim1);
+ break;
+ }
+ return resultDimension;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/PointBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/PointBuilder.java
new file mode 100644
index 0000000..17172f0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/PointBuilder.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Node;
+
+/**
+ * Constructs {@link Point}s from the nodes of an overlay graph.
+ * @version 1.7
+ */
+public class PointBuilder {
+ private OverlayOp op;
+ private GeometryFactory geometryFactory;
+ private List resultPointList = new ArrayList();
+
+ public PointBuilder(OverlayOp op, GeometryFactory geometryFactory, PointLocator ptLocator) {
+ this.op = op;
+ this.geometryFactory = geometryFactory;
+ // ptLocator is never used in this class
+ }
+
+ /**
+ * Computes the Point geometries which will appear in the result,
+ * given the specified overlay operation.
+ *
+ * @return a list of the Points objects in the result
+ */
+ public List build(int opCode)
+ {
+ extractNonCoveredResultNodes(opCode);
+ /**
+ * It can happen that connected result nodes are still covered by
+ * result geometries, so must perform this filter.
+ * (For instance, this can happen during topology collapse).
+ */
+ return resultPointList;
+ }
+
+ /**
+ * Determines nodes which are in the result, and creates {@link Point}s for them.
+ *
+ * This method determines nodes which are candidates for the result via their
+ * labelling and their graph topology.
+ *
+ * @param opCode the overlay operation
+ */
+ private void extractNonCoveredResultNodes(int opCode)
+ {
+ // testing only
+ //if (true) return resultNodeList;
+
+ for (Iterator nodeit = op.getGraph().getNodes().iterator(); nodeit.hasNext(); ) {
+ Node n = (Node) nodeit.next();
+
+ // filter out nodes which are known to be in the result
+ if (n.isInResult())
+ continue;
+ // if an incident edge is in the result, then the node coordinate is included already
+ if (n.isIncidentEdgeInResult())
+ continue;
+ if (n.getEdges().getDegree() == 0 || opCode == OverlayOp.INTERSECTION) {
+
+ /**
+ * For nodes on edges, only INTERSECTION can result in edge nodes being included even
+ * if none of their incident edges are included
+ */
+ Label label = n.getLabel();
+ if (OverlayOp.isResultOfOp(label, opCode)) {
+ filterCoveredNodeToPoint(n);
+ }
+ }
+ }
+ //System.out.println("connectedResultNodes collected = " + connectedResultNodes.size());
+ }
+
+ /**
+ * Converts non-covered nodes to Point objects and adds them to the result.
+ *
+ * A node is covered if it is contained in another element Geometry
+ * with higher dimension (e.g. a node point might be contained in a polygon,
+ * in which case the point can be eliminated from the result).
+ *
+ * @param n the node to test
+ */
+ private void filterCoveredNodeToPoint(Node n)
+ {
+ Coordinate coord = n.getCoordinate();
+ if (! op.isCoveredByLA(coord)) {
+ Point pt = geometryFactory.createPoint(coord);
+ resultPointList.add(pt);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/PolygonBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/PolygonBuilder.java
new file mode 100644
index 0000000..51e10dc
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/PolygonBuilder.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.EdgeRing;
+import org.locationtech.jts.geomgraph.PlanarGraph;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Forms {@link Polygon}s out of a graph of {@link DirectedEdge}s.
+ * The edges to use are marked as being in the result Area.
+ * <p>
+ *
+ * @version 1.7
+ */
+public class PolygonBuilder {
+
+ private GeometryFactory geometryFactory;
+ //private List dirEdgeList;
+ //private NodeMap nodes;
+ private List shellList = new ArrayList();
+
+ public PolygonBuilder(GeometryFactory geometryFactory)
+ {
+ this.geometryFactory = geometryFactory;
+ }
+
+ /**
+ * Add a complete graph.
+ * The graph is assumed to contain one or more polygons,
+ * possibly with holes.
+ */
+ public void add(PlanarGraph graph)
+ {
+ add(graph.getEdgeEnds(), graph.getNodes());
+ }
+
+ /**
+ * Add a set of edges and nodes, which form a graph.
+ * The graph is assumed to contain one or more polygons,
+ * possibly with holes.
+ */
+ public void add(Collection dirEdges, Collection nodes)
+ {
+ PlanarGraph.linkResultDirectedEdges(nodes);
+ List maxEdgeRings = buildMaximalEdgeRings(dirEdges);
+ List freeHoleList = new ArrayList();
+ List edgeRings = buildMinimalEdgeRings(maxEdgeRings, shellList, freeHoleList);
+ sortShellsAndHoles(edgeRings, shellList, freeHoleList);
+ placeFreeHoles(shellList, freeHoleList);
+ //Assert: every hole on freeHoleList has a shell assigned to it
+ }
+
+ public List getPolygons()
+ {
+ List resultPolyList = computePolygons(shellList);
+ return resultPolyList;
+ }
+
+
+ /**
+ * for all DirectedEdges in result, form them into MaximalEdgeRings
+ */
+ private List buildMaximalEdgeRings(Collection dirEdges)
+ {
+ List maxEdgeRings = new ArrayList();
+ for (Iterator it = dirEdges.iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ if (de.isInResult() && de.getLabel().isArea() ) {
+ // if this edge has not yet been processed
+ if (de.getEdgeRing() == null) {
+ MaximalEdgeRing er = new MaximalEdgeRing(de, geometryFactory);
+ maxEdgeRings.add(er);
+ er.setInResult();
+//System.out.println("max node degree = " + er.getMaxDegree());
+ }
+ }
+ }
+ return maxEdgeRings;
+ }
+
+ private List buildMinimalEdgeRings(List maxEdgeRings, List shellList, List freeHoleList)
+ {
+ List edgeRings = new ArrayList();
+ for (Iterator it = maxEdgeRings.iterator(); it.hasNext(); ) {
+ MaximalEdgeRing er = (MaximalEdgeRing) it.next();
+ if (er.getMaxNodeDegree() > 2) {
+ er.linkDirectedEdgesForMinimalEdgeRings();
+ List minEdgeRings = er.buildMinimalRings();
+ // at this point we can go ahead and attempt to place holes, if this EdgeRing is a polygon
+ EdgeRing shell = findShell(minEdgeRings);
+ if (shell != null) {
+ placePolygonHoles(shell, minEdgeRings);
+ shellList.add(shell);
+ }
+ else {
+ freeHoleList.addAll(minEdgeRings);
+ }
+ }
+ else {
+ edgeRings.add(er);
+ }
+ }
+ return edgeRings;
+ }
+
+ /**
+ * This method takes a list of MinimalEdgeRings derived from a MaximalEdgeRing,
+ * and tests whether they form a Polygon. This is the case if there is a single shell
+ * in the list. In this case the shell is returned.
+ * The other possibility is that they are a series of connected holes, in which case
+ * no shell is returned.
+ *
+ * @return the shell EdgeRing, if there is one
+ * or null, if all the rings are holes
+ */
+ private EdgeRing findShell(List minEdgeRings)
+ {
+ int shellCount = 0;
+ EdgeRing shell = null;
+ for (Iterator it = minEdgeRings.iterator(); it.hasNext(); ) {
+ EdgeRing er = (MinimalEdgeRing) it.next();
+ if (! er.isHole()) {
+ shell = er;
+ shellCount++;
+ }
+ }
+ Assert.isTrue(shellCount <= 1, "found two shells in MinimalEdgeRing list");
+ return shell;
+ }
+ /**
+ * This method assigns the holes for a Polygon (formed from a list of
+ * MinimalEdgeRings) to its shell.
+ * Determining the holes for a MinimalEdgeRing polygon serves two purposes:
+ * <ul>
+ * <li>it is faster than using a point-in-polygon check later on.
+ * <li>it ensures correctness, since if the PIP test was used the point
+ * chosen might lie on the shell, which might return an incorrect result from the
+ * PIP test
+ * </ul>
+ */
+ private void placePolygonHoles(EdgeRing shell, List minEdgeRings)
+ {
+ for (Iterator it = minEdgeRings.iterator(); it.hasNext(); ) {
+ MinimalEdgeRing er = (MinimalEdgeRing) it.next();
+ if (er.isHole()) {
+ er.setShell(shell);
+ }
+ }
+ }
+ /**
+ * For all rings in the input list,
+ * determine whether the ring is a shell or a hole
+ * and add it to the appropriate list.
+ * Due to the way the DirectedEdges were linked,
+ * a ring is a shell if it is oriented CW, a hole otherwise.
+ */
+ private void sortShellsAndHoles(List edgeRings, List shellList, List freeHoleList)
+ {
+ for (Iterator it = edgeRings.iterator(); it.hasNext(); ) {
+ EdgeRing er = (EdgeRing) it.next();
+// er.setInResult();
+ if (er.isHole() ) {
+ freeHoleList.add(er);
+ }
+ else {
+ shellList.add(er);
+ }
+ }
+ }
+ /**
+ * This method determines finds a containing shell for all holes
+ * which have not yet been assigned to a shell.
+ * These "free" holes should
+ * all be <b>properly</b> contained in their parent shells, so it is safe to use the
+ * <code>findEdgeRingContaining</code> method.
+ * (This is the case because any holes which are NOT
+ * properly contained (i.e. are connected to their
+ * parent shell) would have formed part of a MaximalEdgeRing
+ * and been handled in a previous step).
+ *
+ * @throws TopologyException if a hole cannot be assigned to a shell
+ */
+ private void placeFreeHoles(List shellList, List freeHoleList)
+ {
+ for (Iterator it = freeHoleList.iterator(); it.hasNext(); ) {
+ EdgeRing hole = (EdgeRing) it.next();
+ // only place this hole if it doesn't yet have a shell
+ if (hole.getShell() == null) {
+ EdgeRing shell = findEdgeRingContaining(hole, shellList);
+ if (shell == null)
+ throw new TopologyException("unable to assign hole to a shell", hole.getCoordinate(0));
+// Assert.isTrue(shell != null, "unable to assign hole to a shell");
+ hole.setShell(shell);
+ }
+ }
+ }
+
+ /**
+ * Find the innermost enclosing shell EdgeRing containing the argument EdgeRing, if any.
+ * The innermost enclosing ring is the <i>smallest</i> enclosing ring.
+ * The algorithm used depends on the fact that:
+ * <br>
+ * ring A contains ring B iff envelope(ring A) contains envelope(ring B)
+ * <br>
+ * This routine is only safe to use if the chosen point of the hole
+ * is known to be properly contained in a shell
+ * (which is guaranteed to be the case if the hole does not touch its shell)
+ *
+ * @return containing EdgeRing, if there is one
+ * or null if no containing EdgeRing is found
+ */
+ private EdgeRing findEdgeRingContaining(EdgeRing testEr, List shellList)
+ {
+ LinearRing testRing = testEr.getLinearRing();
+ Envelope testEnv = testRing.getEnvelopeInternal();
+ Coordinate testPt = testRing.getCoordinateN(0);
+
+ EdgeRing minShell = null;
+ Envelope minEnv = null;
+ for (Iterator it = shellList.iterator(); it.hasNext(); ) {
+ EdgeRing tryShell = (EdgeRing) it.next();
+ LinearRing tryRing = tryShell.getLinearRing();
+ Envelope tryEnv = tryRing.getEnvelopeInternal();
+ if (minShell != null) minEnv = minShell.getLinearRing().getEnvelopeInternal();
+ boolean isContained = false;
+ if (tryEnv.contains(testEnv)
+ && PointLocation.isInRing(testPt, tryRing.getCoordinates()) )
+ isContained = true;
+ // check if this new containing ring is smaller than the current minimum ring
+ if (isContained) {
+ if (minShell == null
+ || minEnv.contains(tryEnv)) {
+ minShell = tryShell;
+ }
+ }
+ }
+ return minShell;
+ }
+ private List computePolygons(List shellList)
+ {
+ List resultPolyList = new ArrayList();
+ // add Polygons for all shells
+ for (Iterator it = shellList.iterator(); it.hasNext(); ) {
+ EdgeRing er = (EdgeRing) it.next();
+ Polygon poly = er.toPolygon(geometryFactory);
+ resultPolyList.add(poly);
+ }
+ return resultPolyList;
+ }
+
+ /**
+ * Checks the current set of shells (with their associated holes) to
+ * see if any of them contain the point.
+ */
+ public boolean containsPoint(Coordinate p)
+ {
+ for (Iterator it = shellList.iterator(); it.hasNext(); ) {
+ EdgeRing er = (EdgeRing) it.next();
+ if (er.containsPoint(p))
+ return true;
+ }
+ return false;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/package.html
new file mode 100644
index 0000000..ca5685d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/package.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes that perform a topological overlay to compute boolean spatial functions.
+<P>
+The Overlay Algorithm is used in spatial analysis methods for computing set-theoretic
+operations (boolean combinations) of input {@link Geometry}s. The algorithm for
+computing the overlay uses the intersection operations supported by topology graphs.
+To compute an overlay it is necessary to explicitly compute the resultant graph formed
+by the computed intersections.
+<P>
+The algorithm to compute a set-theoretic spatial analysis method has the following steps:
+<UL>
+ <LI>Build topology graphs of the two input geometries. For each geometry all
+ self-intersection nodes are computed and added to the graph.
+ <LI>Compute nodes for all intersections between edges and nodes of the graphs.
+ <LI>Compute the labeling for the computed nodes by merging the labels from the input graphs.
+ <LI>Compute new edges between the compute intersection nodes. Label the edges appropriately.
+ <LI>Build the resultant graph from the new nodes and edges.
+ <LI>Compute the labeling for isolated components of the graph. Add the
+ isolated components to the resultant graph.
+ <LI>Compute the result of the boolean combination by selecting the node and edges
+ with the appropriate labels. Polygonize areas and sew linear geometries together.
+</UL>
+
+<h2>Package Specification</h2>
+
+<ul>
+ <li>Java Topology Suite Technical Specifications
+ <li><A HREF="http://www.opengis.org/techno/specs.htm">
+ OpenGIS Simple Features Specification for SQL</A>
+</ul>
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/GeometrySnapper.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/GeometrySnapper.java
new file mode 100644
index 0000000..f27f99d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/GeometrySnapper.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay.snap;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.GeometryTransformer;
+
+/**
+ * Snaps the vertices and segments of a {@link Geometry}
+ * to another Geometry's vertices.
+ * A snap distance tolerance is used to control where snapping is performed.
+ * Snapping one geometry to another can improve
+ * robustness for overlay operations by eliminating
+ * nearly-coincident edges
+ * (which cause problems during noding and intersection calculation).
+ * It can also be used to eliminate artifacts such as narrow slivers, spikes and gores.
+ * <p>
+ * Too much snapping can result in invalid topology
+ * being created, so the number and location of snapped vertices
+ * is decided using heuristics to determine when it
+ * is safe to snap.
+ * This can result in some potential snaps being omitted, however.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class GeometrySnapper
+{
+ private static final double SNAP_PRECISION_FACTOR = 1e-9;
+
+ /**
+ * Estimates the snap tolerance for a Geometry, taking into account its precision model.
+ *
+ * @param g a Geometry
+ * @return the estimated snap tolerance
+ */
+ public static double computeOverlaySnapTolerance(Geometry g)
+ {
+ double snapTolerance = computeSizeBasedSnapTolerance(g);
+
+ /**
+ * Overlay is carried out in the precision model
+ * of the two inputs.
+ * If this precision model is of type FIXED, then the snap tolerance
+ * must reflect the precision grid size.
+ * Specifically, the snap tolerance should be at least
+ * the distance from a corner of a precision grid cell
+ * to the centre point of the cell.
+ */
+ PrecisionModel pm = g.getPrecisionModel();
+ if (pm.getType() == PrecisionModel.FIXED) {
+ double fixedSnapTol = (1 / pm.getScale()) * 2 / 1.415;
+ if (fixedSnapTol > snapTolerance)
+ snapTolerance = fixedSnapTol;
+ }
+ return snapTolerance;
+ }
+
+ public static double computeSizeBasedSnapTolerance(Geometry g)
+ {
+ Envelope env = g.getEnvelopeInternal();
+ double minDimension = Math.min(env.getHeight(), env.getWidth());
+ double snapTol = minDimension * SNAP_PRECISION_FACTOR;
+ return snapTol;
+ }
+
+ public static double computeOverlaySnapTolerance(Geometry g0, Geometry g1)
+ {
+ return Math.min(computeOverlaySnapTolerance(g0), computeOverlaySnapTolerance(g1));
+ }
+
+ /**
+ * Snaps two geometries together with a given tolerance.
+ *
+ * @param g0 a geometry to snap
+ * @param g1 a geometry to snap
+ * @param snapTolerance the tolerance to use
+ * @return the snapped geometries
+ */
+ public static Geometry[] snap(Geometry g0, Geometry g1, double snapTolerance)
+ {
+ Geometry[] snapGeom = new Geometry[2];
+ GeometrySnapper snapper0 = new GeometrySnapper(g0);
+ snapGeom[0] = snapper0.snapTo(g1, snapTolerance);
+
+ /**
+ * Snap the second geometry to the snapped first geometry
+ * (this strategy minimizes the number of possible different points in the result)
+ */
+ GeometrySnapper snapper1 = new GeometrySnapper(g1);
+ snapGeom[1] = snapper1.snapTo(snapGeom[0], snapTolerance);
+
+// System.out.println(snap[0]);
+// System.out.println(snap[1]);
+ return snapGeom;
+ }
+ /**
+ * Snaps a geometry to itself.
+ * Allows optionally cleaning the result to ensure it is
+ * topologically valid
+ * (which fixes issues such as topology collapses in polygonal inputs).
+ * <p>
+ * Snapping a geometry to itself can remove artifacts such as very narrow slivers, gores and spikes.
+ *
+ *@param geom the geometry to snap
+ *@param snapTolerance the snapping tolerance
+ *@param cleanResult whether the result should be made valid
+ * @return a new snapped Geometry
+ */
+ public static Geometry snapToSelf(Geometry geom, double snapTolerance, boolean cleanResult)
+ {
+ GeometrySnapper snapper0 = new GeometrySnapper(geom);
+ return snapper0.snapToSelf(snapTolerance, cleanResult);
+ }
+
+ private Geometry srcGeom;
+
+ /**
+ * Creates a new snapper acting on the given geometry
+ *
+ * @param srcGeom the geometry to snap
+ */
+ public GeometrySnapper(Geometry srcGeom)
+ {
+ this.srcGeom = srcGeom;
+ }
+
+
+ /**
+ * Snaps the vertices in the component {@link LineString}s
+ * of the source geometry
+ * to the vertices of the given snap geometry.
+ *
+ * @param snapGeom a geometry to snap the source to
+ * @return a new snapped Geometry
+ */
+ public Geometry snapTo(Geometry snapGeom, double snapTolerance)
+ {
+ Coordinate[] snapPts = extractTargetCoordinates(snapGeom);
+
+ SnapTransformer snapTrans = new SnapTransformer(snapTolerance, snapPts);
+ return snapTrans.transform(srcGeom);
+ }
+
+ /**
+ * Snaps the vertices in the component {@link LineString}s
+ * of the source geometry
+ * to the vertices of the same geometry.
+ * Allows optionally cleaning the result to ensure it is
+ * topologically valid
+ * (which fixes issues such as topology collapses in polygonal inputs).
+ *
+ *@param snapTolerance the snapping tolerance
+ *@param cleanResult whether the result should be made valid
+ * @return a new snapped Geometry
+ */
+ public Geometry snapToSelf(double snapTolerance, boolean cleanResult)
+ {
+ Coordinate[] snapPts = extractTargetCoordinates(srcGeom);
+
+ SnapTransformer snapTrans = new SnapTransformer(snapTolerance, snapPts, true);
+ Geometry snappedGeom = snapTrans.transform(srcGeom);
+ Geometry result = snappedGeom;
+ if (cleanResult && result instanceof Polygonal) {
+ // TODO: use better cleaning approach
+ result = snappedGeom.buffer(0);
+ }
+ return result;
+ }
+
+ private Coordinate[] extractTargetCoordinates(Geometry g)
+ {
+ // TODO: should do this more efficiently. Use CoordSeq filter to get points, KDTree for uniqueness & queries
+ Set ptSet = new TreeSet();
+ Coordinate[] pts = g.getCoordinates();
+ for (int i = 0; i < pts.length; i++) {
+ ptSet.add(pts[i]);
+ }
+ return (Coordinate[]) ptSet.toArray(new Coordinate[0]);
+ }
+
+ /**
+ * Computes the snap tolerance based on the input geometries.
+ *
+ * @param ringPts
+ * @return
+ */
+ private double computeSnapTolerance(Coordinate[] ringPts)
+ {
+ double minSegLen = computeMinimumSegmentLength(ringPts);
+ // use a small percentage of this to be safe
+ double snapTol = minSegLen / 10;
+ return snapTol;
+ }
+
+ private double computeMinimumSegmentLength(Coordinate[] pts)
+ {
+ double minSegLen = Double.MAX_VALUE;
+ for (int i = 0; i < pts.length - 1; i++) {
+ double segLen = pts[i].distance(pts[i + 1]);
+ if (segLen < minSegLen)
+ minSegLen = segLen;
+ }
+ return minSegLen;
+ }
+
+}
+
+class SnapTransformer
+ extends GeometryTransformer
+{
+ private double snapTolerance;
+ private Coordinate[] snapPts;
+ private boolean isSelfSnap = false;
+
+ SnapTransformer(double snapTolerance, Coordinate[] snapPts)
+ {
+ this.snapTolerance = snapTolerance;
+ this.snapPts = snapPts;
+ }
+
+ SnapTransformer(double snapTolerance, Coordinate[] snapPts, boolean isSelfSnap)
+ {
+ this.snapTolerance = snapTolerance;
+ this.snapPts = snapPts;
+ this.isSelfSnap = isSelfSnap;
+ }
+
+ protected CoordinateSequence transformCoordinates(CoordinateSequence coords, Geometry parent)
+ {
+ Coordinate[] srcPts = coords.toCoordinateArray();
+ Coordinate[] newPts = snapLine(srcPts, snapPts);
+ return factory.getCoordinateSequenceFactory().create(newPts);
+ }
+
+ private Coordinate[] snapLine(Coordinate[] srcPts, Coordinate[] snapPts)
+ {
+ LineStringSnapper snapper = new LineStringSnapper(srcPts, snapTolerance);
+ snapper.setAllowSnappingToSourceVertices(isSelfSnap);
+ return snapper.snapTo(snapPts);
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/LineStringSnapper.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/LineStringSnapper.java
new file mode 100644
index 0000000..4c55b01
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/LineStringSnapper.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay.snap;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * Snaps the vertices and segments of a {@link LineString}
+ * to a set of target snap vertices.
+ * A snap distance tolerance is used to control where snapping is performed.
+ * <p>
+ * The implementation handles empty geometry and empty snap vertex sets.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class LineStringSnapper
+{
+ private double snapTolerance = 0.0;
+
+ private Coordinate[] srcPts;
+ private LineSegment seg = new LineSegment(); // for reuse during snapping
+ private boolean allowSnappingToSourceVertices = false;
+ private boolean isClosed = false;
+
+ /**
+ * Creates a new snapper using the points in the given {@link LineString}
+ * as source snap points.
+ *
+ * @param srcLine a LineString to snap (may be empty)
+ * @param snapTolerance the snap tolerance to use
+ */
+ public LineStringSnapper(LineString srcLine, double snapTolerance)
+ {
+ this(srcLine.getCoordinates(), snapTolerance);
+ }
+
+ /**
+ * Creates a new snapper using the given points
+ * as source points to be snapped.
+ *
+ * @param srcPts the points to snap
+ * @param snapTolerance the snap tolerance to use
+ */
+ public LineStringSnapper(Coordinate[] srcPts, double snapTolerance)
+ {
+ this.srcPts = srcPts;
+ isClosed = isClosed(srcPts);
+ this.snapTolerance = snapTolerance;
+ }
+
+ public void setAllowSnappingToSourceVertices(boolean allowSnappingToSourceVertices)
+ {
+ this.allowSnappingToSourceVertices = allowSnappingToSourceVertices;
+ }
+ private static boolean isClosed(Coordinate[] pts)
+ {
+ if (pts.length <= 1) return false;
+ return pts[0].equals2D(pts[pts.length - 1]);
+ }
+ /**
+ * Snaps the vertices and segments of the source LineString
+ * to the given set of snap vertices.
+ *
+ * @param snapPts the vertices to snap to
+ * @return a list of the snapped points
+ */
+ public Coordinate[] snapTo(Coordinate[] snapPts)
+ {
+ CoordinateList coordList = new CoordinateList(srcPts);
+
+ snapVertices(coordList, snapPts);
+ snapSegments(coordList, snapPts);
+
+ Coordinate[] newPts = coordList.toCoordinateArray();
+ return newPts;
+ }
+
+ /**
+ * Snap source vertices to vertices in the target.
+ *
+ * @param srcCoords the points to snap
+ * @param snapPts the points to snap to
+ */
+ private void snapVertices(CoordinateList srcCoords, Coordinate[] snapPts)
+ {
+ // try snapping vertices
+ // if src is a ring then don't snap final vertex
+ int end = isClosed ? srcCoords.size() - 1 : srcCoords.size();
+ for (int i = 0; i < end; i++) {
+ Coordinate srcPt = (Coordinate) srcCoords.get(i);
+ Coordinate snapVert = findSnapForVertex(srcPt, snapPts);
+ if (snapVert != null) {
+ // update src with snap pt
+ srcCoords.set(i, new Coordinate(snapVert));
+ // keep final closing point in synch (rings only)
+ if (i == 0 && isClosed)
+ srcCoords.set(srcCoords.size() - 1, new Coordinate(snapVert));
+ }
+ }
+ }
+
+ private Coordinate findSnapForVertex(Coordinate pt, Coordinate[] snapPts)
+ {
+ for (int i = 0; i < snapPts.length; i++) {
+ // if point is already equal to a src pt, don't snap
+ if (pt.equals2D(snapPts[i]))
+ return null;
+ if (pt.distance(snapPts[i]) < snapTolerance)
+ return snapPts[i];
+ }
+ return null;
+ }
+
+ /**
+ * Snap segments of the source to nearby snap vertices.
+ * Source segments are "cracked" at a snap vertex.
+ * A single input segment may be snapped several times
+ * to different snap vertices.
+ * <p>
+ * For each distinct snap vertex, at most one source segment
+ * is snapped to. This prevents "cracking" multiple segments
+ * at the same point, which would likely cause
+ * topology collapse when being used on polygonal linework.
+ *
+ * @param srcCoords the coordinates of the source linestring to be snapped
+ * @param snapPts the target snap vertices
+ */
+ private void snapSegments(CoordinateList srcCoords, Coordinate[] snapPts)
+ {
+ // guard against empty input
+ if (snapPts.length == 0) return;
+
+ int distinctPtCount = snapPts.length;
+
+ // check for duplicate snap pts when they are sourced from a linear ring.
+ // TODO: Need to do this better - need to check *all* snap points for dups (using a Set?)
+ if (snapPts[0].equals2D(snapPts[snapPts.length - 1]))
+ distinctPtCount = snapPts.length - 1;
+
+ for (int i = 0; i < distinctPtCount; i++) {
+ Coordinate snapPt = snapPts[i];
+ int index = findSegmentIndexToSnap(snapPt, srcCoords);
+ /**
+ * If a segment to snap to was found, "crack" it at the snap pt.
+ * The new pt is inserted immediately into the src segment list,
+ * so that subsequent snapping will take place on the modified segments.
+ * Duplicate points are not added.
+ */
+ if (index >= 0) {
+ srcCoords.add(index + 1, new Coordinate(snapPt), false);
+ }
+ }
+ }
+
+
+ /**
+ * Finds a src segment which snaps to (is close to) the given snap point.
+ * <p>
+ * Only a single segment is selected for snapping.
+ * This prevents multiple segments snapping to the same snap vertex,
+ * which would almost certainly cause invalid geometry
+ * to be created.
+ * (The heuristic approach to snapping used here
+ * is really only appropriate when
+ * snap pts snap to a unique spot on the src geometry.)
+ * <p>
+ * Also, if the snap vertex occurs as a vertex in the src coordinate list,
+ * no snapping is performed.
+ *
+ * @param snapPt the point to snap to
+ * @param srcCoords the source segment coordinates
+ * @return the index of the snapped segment
+ * or -1 if no segment snaps to the snap point
+ */
+ private int findSegmentIndexToSnap(Coordinate snapPt, CoordinateList srcCoords)
+ {
+ double minDist = Double.MAX_VALUE;
+ int snapIndex = -1;
+ for (int i = 0; i < srcCoords.size() - 1; i++) {
+ seg.p0 = (Coordinate) srcCoords.get(i);
+ seg.p1 = (Coordinate) srcCoords.get(i + 1);
+
+ /**
+ * Check if the snap pt is equal to one of the segment endpoints.
+ *
+ * If the snap pt is already in the src list, don't snap at all.
+ */
+ if (seg.p0.equals2D(snapPt) || seg.p1.equals2D(snapPt)) {
+ if (allowSnappingToSourceVertices)
+ continue;
+ else
+ return -1;
+ }
+
+ double dist = seg.distance(snapPt);
+ if (dist < snapTolerance && dist < minDist) {
+ minDist = dist;
+ snapIndex = i;
+ }
+ }
+ return snapIndex;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/SnapIfNeededOverlayOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/SnapIfNeededOverlayOp.java
new file mode 100644
index 0000000..c53c204
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/SnapIfNeededOverlayOp.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay.snap;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.TopologyException;
+import org.locationtech.jts.operation.overlay.OverlayOp;
+
+
+/**
+ * Performs an overlay operation using snapping and enhanced precision
+ * to improve the robustness of the result.
+ * This class only uses snapping
+ * if an error is detected when running the standard JTS overlay code.
+ * Errors detected include thrown exceptions
+ * (in particular, {@link TopologyException})
+ * and invalid overlay computations.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class SnapIfNeededOverlayOp
+{
+ public static Geometry overlayOp(Geometry g0, Geometry g1, int opCode)
+ {
+ SnapIfNeededOverlayOp op = new SnapIfNeededOverlayOp(g0, g1);
+ return op.getResultGeometry(opCode);
+ }
+
+ public static Geometry intersection(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.INTERSECTION);
+ }
+
+ public static Geometry union(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.UNION);
+ }
+
+ public static Geometry difference(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.DIFFERENCE);
+ }
+
+ public static Geometry symDifference(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.SYMDIFFERENCE);
+ }
+
+ private Geometry[] geom = new Geometry[2];
+
+ public SnapIfNeededOverlayOp(Geometry g1, Geometry g2)
+ {
+ geom[0] = g1;
+ geom[1] = g2;
+ }
+
+ public Geometry getResultGeometry(int opCode)
+ {
+ Geometry result = null;
+ boolean isSuccess = false;
+ RuntimeException savedException = null;
+ try {
+ // try basic operation with input geometries
+ result = OverlayOp.overlayOp(geom[0], geom[1], opCode);
+ boolean isValid = true;
+ // not needed if noding validation is used
+// boolean isValid = OverlayResultValidator.isValid(geom[0], geom[1], OverlayOp.INTERSECTION, result);
+ if (isValid)
+ isSuccess = true;
+ }
+ catch (RuntimeException ex) {
+ savedException = ex;
+ // ignore this exception, since the operation will be rerun
+// System.out.println(ex.getMessage());
+// ex.printStackTrace();
+ //System.out.println(ex.getMessage());
+ //System.out.println("Geom 0: " + geom[0]);
+ //System.out.println("Geom 1: " + geom[1]);
+ }
+ if (! isSuccess) {
+ // this may still throw an exception
+ // if so, throw the original exception since it has the input coordinates
+ try {
+ result = SnapOverlayOp.overlayOp(geom[0], geom[1], opCode);
+ }
+ catch (RuntimeException ex) {
+ throw savedException;
+ }
+ }
+ return result;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/SnapOverlayOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/SnapOverlayOp.java
new file mode 100644
index 0000000..64aca59
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/SnapOverlayOp.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay.snap;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.overlay.OverlayOp;
+import org.locationtech.jts.precision.CommonBitsRemover;
+
+/**
+ * Performs an overlay operation using snapping and enhanced precision
+ * to improve the robustness of the result.
+ * This class <i>always</i> uses snapping.
+ * This is less performant than the standard JTS overlay code,
+ * and may even introduce errors which were not present in the original data.
+ * For this reason, this class should only be used
+ * if the standard overlay code fails to produce a correct result.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class SnapOverlayOp
+{
+ public static Geometry overlayOp(Geometry g0, Geometry g1, int opCode)
+ {
+ SnapOverlayOp op = new SnapOverlayOp(g0, g1);
+ return op.getResultGeometry(opCode);
+ }
+
+ public static Geometry intersection(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.INTERSECTION);
+ }
+
+ public static Geometry union(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.UNION);
+ }
+
+ public static Geometry difference(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.DIFFERENCE);
+ }
+
+ public static Geometry symDifference(Geometry g0, Geometry g1)
+ {
+ return overlayOp(g0, g1, OverlayOp.SYMDIFFERENCE);
+ }
+
+
+ private Geometry[] geom = new Geometry[2];
+ private double snapTolerance;
+
+ public SnapOverlayOp(Geometry g1, Geometry g2)
+ {
+ geom[0] = g1;
+ geom[1] = g2;
+ computeSnapTolerance();
+ }
+ private void computeSnapTolerance()
+ {
+ snapTolerance = GeometrySnapper.computeOverlaySnapTolerance(geom[0], geom[1]);
+
+ // System.out.println("Snap tol = " + snapTolerance);
+ }
+
+ public Geometry getResultGeometry(int opCode)
+ {
+// Geometry[] selfSnapGeom = new Geometry[] { selfSnap(geom[0]), selfSnap(geom[1])};
+ Geometry[] prepGeom = snap(geom);
+ Geometry result = OverlayOp.overlayOp(prepGeom[0], prepGeom[1], opCode);
+ return prepareResult(result);
+ }
+
+ private Geometry selfSnap(Geometry geom)
+ {
+ GeometrySnapper snapper0 = new GeometrySnapper(geom);
+ Geometry snapGeom = snapper0.snapTo(geom, snapTolerance);
+ //System.out.println("Self-snapped: " + snapGeom);
+ //System.out.println();
+ return snapGeom;
+ }
+
+ private Geometry[] snap(Geometry[] geom)
+ {
+ Geometry[] remGeom = removeCommonBits(geom);
+
+ // MD - testing only
+// Geometry[] remGeom = geom;
+
+ Geometry[] snapGeom = GeometrySnapper.snap(remGeom[0], remGeom[1], snapTolerance);
+ // MD - may want to do this at some point, but it adds cycles
+// checkValid(snapGeom[0]);
+// checkValid(snapGeom[1]);
+
+ /*
+ System.out.println("Snapped geoms: ");
+ System.out.println(snapGeom[0]);
+ System.out.println(snapGeom[1]);
+ */
+ return snapGeom;
+ }
+
+ private Geometry prepareResult(Geometry geom)
+ {
+ cbr.addCommonBits(geom);
+ return geom;
+ }
+
+ private CommonBitsRemover cbr;
+
+ private Geometry[] removeCommonBits(Geometry[] geom)
+ {
+ cbr = new CommonBitsRemover();
+ cbr.add(geom[0]);
+ cbr.add(geom[1]);
+ Geometry remGeom[] = new Geometry[2];
+ remGeom[0] = cbr.removeCommonBits(geom[0].copy());
+ remGeom[1] = cbr.removeCommonBits(geom[1].copy());
+ return remGeom;
+ }
+
+ private void checkValid(Geometry g)
+ {
+ if (! g.isValid()) {
+ System.out.println("Snapped geometry is invalid");
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/package.html
new file mode 100644
index 0000000..f7b83d7
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/snap/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to perform snapping on geometries to prepare them for overlay operations.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/FuzzyPointLocator.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/FuzzyPointLocator.java
new file mode 100644
index 0000000..6a940c2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/FuzzyPointLocator.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay.validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.GeometryFilter;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Finds the most likely {@link Location} of a point relative to
+ * the polygonal components of a geometry, using a tolerance value.
+ * If a point is not clearly in the Interior or Exterior,
+ * it is considered to be on the Boundary.
+ * In other words, if the point is within the tolerance of the Boundary,
+ * it is considered to be on the Boundary; otherwise,
+ * whether it is Interior or Exterior is determined directly.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class FuzzyPointLocator
+{
+ private Geometry g;
+ private double boundaryDistanceTolerance;
+ private MultiLineString linework;
+ private PointLocator ptLocator = new PointLocator();
+ private LineSegment seg = new LineSegment();
+
+ public FuzzyPointLocator(Geometry g, double boundaryDistanceTolerance)
+ {
+ this.g = g;
+ this.boundaryDistanceTolerance = boundaryDistanceTolerance;
+ linework = extractLinework(g);
+ }
+
+ public int getLocation(Coordinate pt)
+ {
+ if (isWithinToleranceOfBoundary(pt))
+ return Location.BOUNDARY;
+ /*
+ double dist = linework.distance(point);
+
+ // if point is close to boundary, it is considered to be on the boundary
+ if (dist < tolerance)
+ return Location.BOUNDARY;
+ */
+
+ // now we know point must be clearly inside or outside geometry, so return actual location value
+ return ptLocator.locate(pt, g);
+ }
+
+ /**
+ * Extracts linework for polygonal components.
+ *
+ * @param g the geometry from which to extract
+ * @return a lineal geometry containing the extracted linework
+ */
+ private MultiLineString extractLinework(Geometry g)
+ {
+ PolygonalLineworkExtracter extracter = new PolygonalLineworkExtracter();
+ g.apply(extracter);
+ List linework = extracter.getLinework();
+ LineString[] lines = GeometryFactory.toLineStringArray(linework);
+ return g.getFactory().createMultiLineString(lines);
+ }
+
+ private boolean isWithinToleranceOfBoundary(Coordinate pt)
+ {
+ for (int i = 0; i < linework.getNumGeometries(); i++) {
+ LineString line = (LineString) linework.getGeometryN(i);
+ CoordinateSequence seq = line.getCoordinateSequence();
+ for (int j = 0; j < seq.size() - 1; j++) {
+ seq.getCoordinate(j, seg.p0);
+ seq.getCoordinate(j + 1, seg.p1);
+ double dist = seg.distance(pt);
+ if (dist <= boundaryDistanceTolerance)
+ return true;
+ }
+ }
+ return false;
+ }
+}
+
+/**
+ * Extracts the LineStrings in the boundaries
+ * of all the polygonal elements in the target {@link Geometry}.
+ *
+ * @author Martin Davis
+ */
+class PolygonalLineworkExtracter
+ implements GeometryFilter
+{
+ private List linework;
+
+ public PolygonalLineworkExtracter()
+ {
+ linework = new ArrayList();
+ }
+
+ /**
+ * Filters out all linework for polygonal elements
+ */
+ public void filter(Geometry g)
+ {
+ if (g instanceof Polygon) {
+ Polygon poly = (Polygon) g;
+ linework.add(poly.getExteriorRing());
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ linework.add(poly.getInteriorRingN(i));
+ }
+ }
+ }
+
+ /**
+ * Gets the list of polygonal linework.
+ *
+ * @return a List of LineStrings
+ */
+ public List getLinework() { return linework; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/OffsetPointGenerator.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/OffsetPointGenerator.java
new file mode 100644
index 0000000..b4dd631
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/OffsetPointGenerator.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay.validate;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+
+/**
+ * Generates points offset by a given distance
+ * from both sides of the midpoint of
+ * all segments in a {@link Geometry}.
+ * Can be used to generate probe points for
+ * determining whether a polygonal overlay result
+ * is incorrect.
+ * The input geometry may have any orientation for its rings,
+ * but {@link #setSidesToGenerate(boolean, boolean)} is
+ * only meaningful if the orientation is known.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class OffsetPointGenerator
+{
+ private Geometry g;
+ private boolean doLeft = true;
+ private boolean doRight = true;
+
+ public OffsetPointGenerator(Geometry g)
+ {
+ this.g = g;
+ }
+
+ /**
+ * Set the sides on which to generate offset points.
+ *
+ * @param doLeft
+ * @param doRight
+ */
+ public void setSidesToGenerate(boolean doLeft, boolean doRight)
+ {
+ this.doLeft = doLeft;
+ this.doRight = doRight;
+ }
+
+ /**
+ * Gets the computed offset points.
+ *
+ * @return List<Coordinate>
+ */
+ public List getPoints(double offsetDistance)
+ {
+ List offsetPts = new ArrayList();
+ List lines = LinearComponentExtracter.getLines(g);
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ extractPoints(line, offsetDistance, offsetPts);
+ }
+ //System.out.println(toMultiPoint(offsetPts));
+ return offsetPts;
+ }
+
+ private void extractPoints(LineString line, double offsetDistance, List offsetPts)
+ {
+ Coordinate[] pts = line.getCoordinates();
+ for (int i = 0; i < pts.length - 1; i++) {
+ computeOffsetPoints(pts[i], pts[i + 1], offsetDistance, offsetPts);
+ }
+ }
+
+ /**
+ * Generates the two points which are offset from the
+ * midpoint of the segment <tt>(p0, p1)</tt> by the
+ * <tt>offsetDistance</tt>.
+ *
+ * @param p0 the first point of the segment to offset from
+ * @param p1 the second point of the segment to offset from
+ */
+ private void computeOffsetPoints(Coordinate p0, Coordinate p1, double offsetDistance, List offsetPts)
+ {
+ double dx = p1.x - p0.x;
+ double dy = p1.y - p0.y;
+ double len = Math.sqrt(dx * dx + dy * dy);
+ // u is the vector that is the length of the offset, in the direction of the segment
+ double ux = offsetDistance * dx / len;
+ double uy = offsetDistance * dy / len;
+
+ double midX = (p1.x + p0.x) / 2;
+ double midY = (p1.y + p0.y) / 2;
+
+ if (doLeft) {
+ Coordinate offsetLeft = new Coordinate(midX - uy, midY + ux);
+ offsetPts.add(offsetLeft);
+ }
+
+ if (doRight) {
+ Coordinate offsetRight = new Coordinate(midX + uy, midY - ux);
+ offsetPts.add(offsetRight);
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/OverlayResultValidator.java b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/OverlayResultValidator.java
new file mode 100644
index 0000000..a1407d9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/OverlayResultValidator.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.overlay.validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.operation.overlay.OverlayOp;
+import org.locationtech.jts.operation.overlay.snap.GeometrySnapper;
+
+/**
+ * Validates that the result of an overlay operation is
+ * geometrically correct, within a determined tolerance.
+ * Uses fuzzy point location to find points which are
+ * definitely in either the interior or exterior of the result
+ * geometry, and compares these results with the expected ones.
+ * <p>
+ * This algorithm is only useful where the inputs are polygonal.
+ * This is a heuristic test, and may return false positive results
+ * (I.e. it may fail to detect an invalid result.)
+ * It should never return a false negative result, however
+ * (I.e. it should never report a valid result as invalid.)
+ *
+ * @author Martin Davis
+ * @version 1.7
+ * @see OverlayOp
+ */
+public class OverlayResultValidator
+{
+ public static boolean isValid(Geometry a, Geometry b, int overlayOp, Geometry result)
+ {
+ OverlayResultValidator validator = new OverlayResultValidator(a, b, result);
+ return validator.isValid(overlayOp);
+ }
+
+ private static double computeBoundaryDistanceTolerance(Geometry g0, Geometry g1)
+ {
+ return Math.min(GeometrySnapper.computeSizeBasedSnapTolerance(g0),
+ GeometrySnapper.computeSizeBasedSnapTolerance(g1));
+ }
+
+ private static final double TOLERANCE = 0.000001;
+
+ private Geometry[] geom;
+ private FuzzyPointLocator[] locFinder;
+ private int[] location = new int[3] ;
+ private Coordinate invalidLocation = null;
+ private double boundaryDistanceTolerance = TOLERANCE;
+
+ private List testCoords = new ArrayList();
+
+ public OverlayResultValidator(Geometry a, Geometry b, Geometry result)
+ {
+ /**
+ * The tolerance to use needs to depend on the size of the geometries.
+ * It should not be more precise than double-precision can support.
+ */
+ boundaryDistanceTolerance = computeBoundaryDistanceTolerance(a, b);
+ geom = new Geometry[] { a, b, result };
+ locFinder = new FuzzyPointLocator[] {
+ new FuzzyPointLocator(geom[0], boundaryDistanceTolerance),
+ new FuzzyPointLocator(geom[1], boundaryDistanceTolerance),
+ new FuzzyPointLocator(geom[2], boundaryDistanceTolerance)
+ };
+ }
+
+ public boolean isValid(int overlayOp)
+ {
+ addTestPts(geom[0]);
+ addTestPts(geom[1]);
+ boolean isValid = checkValid(overlayOp);
+
+ /*
+ System.out.println("OverlayResultValidator: " + isValid);
+ System.out.println("G0");
+ System.out.println(geom[0]);
+ System.out.println("G1");
+ System.out.println(geom[1]);
+ System.out.println("Result");
+ System.out.println(geom[2]);
+ */
+
+ return isValid;
+ }
+
+ public Coordinate getInvalidLocation() { return invalidLocation; }
+
+ private void addTestPts(Geometry g)
+ {
+ OffsetPointGenerator ptGen = new OffsetPointGenerator(g);
+ testCoords.addAll(ptGen.getPoints(5 * boundaryDistanceTolerance));
+ }
+
+ private boolean checkValid(int overlayOp)
+ {
+ for (int i = 0; i < testCoords.size(); i++) {
+ Coordinate pt = (Coordinate) testCoords.get(i);
+ if (! checkValid(overlayOp, pt)) {
+ invalidLocation = pt;
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private boolean checkValid(int overlayOp, Coordinate pt)
+ {
+ location[0] = locFinder[0].getLocation(pt);
+ location[1] = locFinder[1].getLocation(pt);
+ location[2] = locFinder[2].getLocation(pt);
+
+ /**
+ * If any location is on the Boundary, can't deduce anything, so just return true
+ */
+ if (hasLocation(location, Location.BOUNDARY))
+ return true;
+
+ return isValidResult(overlayOp, location);
+ }
+
+ private static boolean hasLocation(int[] location, int loc)
+ {
+ for (int i = 0; i < 3; i ++) {
+ if (location[i] == loc)
+ return true;
+ }
+ return false;
+ }
+
+ private boolean isValidResult(int overlayOp, int[] location)
+ {
+ boolean expectedInterior = OverlayOp.isResultOfOp(location[0], location[1], overlayOp);
+
+ boolean resultInInterior = (location[2] == Location.INTERIOR);
+ // MD use simpler: boolean isValid = (expectedInterior == resultInInterior);
+ boolean isValid = ! (expectedInterior ^ resultInInterior);
+
+ if (! isValid) reportResult(overlayOp, location, expectedInterior);
+
+ return isValid;
+ }
+
+ private void reportResult(int overlayOp, int[] location, boolean expectedInterior)
+ {
+ System.out.println(
+ "Overlay result invalid - A:" + Location.toLocationSymbol(location[0])
+ + " B:" + Location.toLocationSymbol(location[1])
+ + " expected:" + (expectedInterior ? 'i' : 'e')
+ + " actual:" + Location.toLocationSymbol(location[2])
+ );
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/package.html
new file mode 100644
index 0000000..8093abc
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/overlay/validate/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to validate the results of overlay operations.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/package.html
new file mode 100644
index 0000000..2ad4c14
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Provides classes for implementing operations on geometries
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/EdgeRing.java b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/EdgeRing.java
new file mode 100644
index 0000000..769c4ee
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/EdgeRing.java
@@ -0,0 +1,467 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+
+package org.locationtech.jts.operation.polygonize;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.util.Assert;
+
+
+/**
+ * Represents a ring of {@link PolygonizeDirectedEdge}s which form
+ * a ring of a polygon. The ring may be either an outer shell or a hole.
+ *
+ * @version 1.7
+ */
+class EdgeRing {
+
+ /**
+ * Find the innermost enclosing shell EdgeRing containing the argument EdgeRing, if any.
+ * The innermost enclosing ring is the <i>smallest</i> enclosing ring.
+ * The algorithm used depends on the fact that:
+ * <br>
+ * ring A contains ring B iff envelope(ring A) contains envelope(ring B)
+ * <br>
+ * This routine is only safe to use if the chosen point of the hole
+ * is known to be properly contained in a shell
+ * (which is guaranteed to be the case if the hole does not touch its shell)
+ *
+ * @return containing EdgeRing, if there is one
+ * or null if no containing EdgeRing is found
+ */
+ public static EdgeRing findEdgeRingContaining(EdgeRing testEr, List shellList)
+ {
+ LinearRing testRing = testEr.getRing();
+ Envelope testEnv = testRing.getEnvelopeInternal();
+ Coordinate testPt = testRing.getCoordinateN(0);
+
+ EdgeRing minShell = null;
+ Envelope minShellEnv = null;
+ for (Iterator it = shellList.iterator(); it.hasNext(); ) {
+ EdgeRing tryShell = (EdgeRing) it.next();
+ LinearRing tryShellRing = tryShell.getRing();
+ Envelope tryShellEnv = tryShellRing.getEnvelopeInternal();
+ // the hole envelope cannot equal the shell envelope
+ // (also guards against testing rings against themselves)
+ if (tryShellEnv.equals(testEnv)) continue;
+ // hole must be contained in shell
+ if (! tryShellEnv.contains(testEnv)) continue;
+
+ testPt = CoordinateArrays.ptNotInList(testRing.getCoordinates(), tryShellRing.getCoordinates());
+ boolean isContained = false;
+ if (PointLocation.isInRing(testPt, tryShellRing.getCoordinates()) )
+ isContained = true;
+
+ // check if this new containing ring is smaller than the current minimum ring
+ if (isContained) {
+ if (minShell == null
+ || minShellEnv.contains(tryShellEnv)) {
+ minShell = tryShell;
+ minShellEnv = minShell.getRing().getEnvelopeInternal();
+ }
+ }
+ }
+ return minShell;
+ }
+
+ /**
+ * Finds a point in a list of points which is not contained in another list of points
+ * @param testPts the {@link Coordinate}s to test
+ * @param pts an array of {@link Coordinate}s to test the input points against
+ * @return a {@link Coordinate} from <code>testPts</code> which is not in <code>pts</code>,
+ * or null if there is no coordinate not in the list
+ *
+ * @deprecated Use CoordinateArrays.ptNotInList instead
+ */
+ public static Coordinate ptNotInList(Coordinate[] testPts, Coordinate[] pts)
+ {
+ for (int i = 0; i < testPts.length; i++) {
+ Coordinate testPt = testPts[i];
+ if (! isInList(testPt, pts))
+ return testPt;
+ }
+ return null;
+ }
+
+ /**
+ * Tests whether a given point is in an array of points.
+ * Uses a value-based test.
+ *
+ * @param pt a {@link Coordinate} for the test point
+ * @param pts an array of {@link Coordinate}s to test
+ * @return <code>true</code> if the point is in the array
+ *
+ * @deprecated
+ */
+ public static boolean isInList(Coordinate pt, Coordinate[] pts)
+ {
+ for (int i = 0; i < pts.length; i++) {
+ if (pt.equals(pts[i]))
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Traverses a ring of DirectedEdges, accumulating them into a list.
+ * This assumes that all dangling directed edges have been removed
+ * from the graph, so that there is always a next dirEdge.
+ *
+ * @param startDE the DirectedEdge to start traversing at
+ * @return a List of DirectedEdges that form a ring
+ */
+ public static List findDirEdgesInRing(PolygonizeDirectedEdge startDE)
+ {
+ PolygonizeDirectedEdge de = startDE;
+ List edges = new ArrayList();
+ do {
+ edges.add(de);
+ de = de.getNext();
+ Assert.isTrue(de != null, "found null DE in ring");
+ Assert.isTrue(de == startDE || ! de.isInRing(), "found DE already in ring");
+ } while (de != startDE);
+ return edges;
+ }
+
+ private GeometryFactory factory;
+
+ private List deList = new ArrayList();
+ private DirectedEdge lowestEdge = null;
+
+ // cache the following data for efficiency
+ private LinearRing ring = null;
+
+ private Coordinate[] ringPts = null;
+ private List holes;
+ private EdgeRing shell;
+ private boolean isHole;
+ private boolean isProcessed = false;
+ private boolean isIncludedSet = false;
+ private boolean isIncluded = false;
+
+ public EdgeRing(GeometryFactory factory)
+ {
+ this.factory = factory;
+ }
+
+ public void build(PolygonizeDirectedEdge startDE) {
+ PolygonizeDirectedEdge de = startDE;
+ do {
+ add(de);
+ de.setRing(this);
+ de = de.getNext();
+ Assert.isTrue(de != null, "found null DE in ring");
+ Assert.isTrue(de == startDE || ! de.isInRing(), "found DE already in ring");
+ } while (de != startDE);
+ }
+
+ /**
+ * Adds a {@link DirectedEdge} which is known to form part of this ring.
+ * @param de the {@link DirectedEdge} to add.
+ */
+ private void add(DirectedEdge de)
+ {
+ deList.add(de);
+ }
+
+ /**
+ * Tests whether this ring is a hole.
+ * @return <code>true</code> if this ring is a hole
+ */
+ public boolean isHole()
+ {
+ return isHole;
+ }
+
+ /**
+ * Computes whether this ring is a hole.
+ * Due to the way the edges in the polygonization graph are linked,
+ * a ring is a hole if it is oriented counter-clockwise.
+ */
+ public void computeHole()
+ {
+ LinearRing ring = getRing();
+ isHole = Orientation.isCCW(ring.getCoordinates());
+ }
+
+ /**
+ * Adds a hole to the polygon formed by this ring.
+ * @param hole the {@link LinearRing} forming the hole.
+ */
+ public void addHole(LinearRing hole) {
+ if (holes == null)
+ holes = new ArrayList();
+ holes.add(hole);
+ }
+
+ /**
+ * Adds a hole to the polygon formed by this ring.
+ * @param hole the {@link LinearRing} forming the hole.
+ */
+ public void addHole(EdgeRing holeER) {
+ holeER.setShell(this);
+ LinearRing hole = holeER.getRing();
+ if (holes == null)
+ holes = new ArrayList();
+ holes.add(hole);
+ }
+
+ /**
+ * Computes the {@link Polygon} formed by this ring and any contained holes.
+ *
+ * @return the {@link Polygon} formed by this ring and its holes.
+ */
+ public Polygon getPolygon()
+ {
+ LinearRing[] holeLR = null;
+ if (holes != null) {
+ holeLR = new LinearRing[holes.size()];
+ for (int i = 0; i < holes.size(); i++) {
+ holeLR[i] = (LinearRing) holes.get(i);
+ }
+ }
+ Polygon poly = factory.createPolygon(ring, holeLR);
+ return poly;
+ }
+
+ /**
+ * Tests if the {@link LinearRing} ring formed by this edge ring is topologically valid.
+ *
+ * @return true if the ring is valid
+ */
+ public boolean isValid()
+ {
+ getCoordinates();
+ if (ringPts.length <= 3) return false;
+ getRing();
+ return ring.isValid();
+ }
+
+ public boolean isIncludedSet() {
+ return isIncludedSet;
+ }
+
+ public boolean isIncluded() {
+ return isIncluded;
+ }
+
+ public void setIncluded(boolean isIncluded) {
+ this.isIncluded = isIncluded;
+ this.isIncludedSet = true;
+ }
+
+ /**
+ * Computes the list of coordinates which are contained in this ring.
+ * The coordinates are computed once only and cached.
+ *
+ * @return an array of the {@link Coordinate}s in this ring
+ */
+ private Coordinate[] getCoordinates()
+ {
+ if (ringPts == null) {
+ CoordinateList coordList = new CoordinateList();
+ for (Iterator i = deList.iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ PolygonizeEdge edge = (PolygonizeEdge) de.getEdge();
+ addEdge(edge.getLine().getCoordinates(), de.getEdgeDirection(), coordList);
+ }
+ ringPts = coordList.toCoordinateArray();
+ }
+ return ringPts;
+ }
+
+ /**
+ * Gets the coordinates for this ring as a {@link LineString}.
+ * Used to return the coordinates in this ring
+ * as a valid geometry, when it has been detected that the ring is topologically
+ * invalid.
+ * @return a {@link LineString} containing the coordinates in this ring
+ */
+ public LineString getLineString()
+ {
+ getCoordinates();
+ return factory.createLineString(ringPts);
+ }
+
+ /**
+ * Returns this ring as a {@link LinearRing}, or null if an Exception occurs while
+ * creating it (such as a topology problem). Details of problems are written to
+ * standard output.
+ */
+ public LinearRing getRing()
+ {
+ if (ring != null) return ring;
+ getCoordinates();
+ if (ringPts.length < 3) System.out.println(ringPts);
+ try {
+ ring = factory.createLinearRing(ringPts);
+ }
+ catch (Exception ex) {
+ System.out.println(ringPts);
+ }
+ return ring;
+ }
+
+ private static void addEdge(Coordinate[] coords, boolean isForward, CoordinateList coordList)
+ {
+ if (isForward) {
+ for (int i = 0; i < coords.length; i++) {
+ coordList.add(coords[i], false);
+ }
+ }
+ else {
+ for (int i = coords.length - 1; i >= 0; i--) {
+ coordList.add(coords[i], false);
+ }
+ }
+ }
+
+ /**
+ * Sets the containing shell ring of a ring that has been determined to be a hole.
+ *
+ * @param shell the shell ring
+ */
+ public void setShell(EdgeRing shell) {
+ this.shell = shell;
+ }
+
+ /**
+ * Tests whether this ring has a shell assigned to it.
+ *
+ * @return true if the ring has a shell
+ */
+ public boolean hasShell() {
+ return shell != null;
+ }
+
+ /**
+ * Gets the shell for this ring. The shell is the ring itself if it is not a hole, otherwise its parent shell.
+ *
+ * @return the shell for this ring
+ */
+ public EdgeRing getShell() {
+ if (isHole()) return shell;
+ return this;
+ }
+ /**
+ * Tests whether this ring is an outer hole.
+ * A hole is an outer hole if it is not contained by a shell.
+ *
+ * @return true if the ring is an outer hole.
+ */
+ public boolean isOuterHole() {
+ if (! isHole) return false;
+ return ! hasShell();
+ }
+
+ /**
+ * Tests whether this ring is an outer shell.
+ *
+ * @return true if the ring is an outer shell.
+ */
+ public boolean isOuterShell() {
+ return getOuterHole() != null;
+ }
+
+ public EdgeRing getOuterHole()
+ {
+ if (isHole()) return null;
+ /*
+ * A shell is an outer shell if any edge is also in an outer hole.
+ * A hole is an outer hole if it is not contained by a shell.
+ */
+ for (int i = 0; i < deList.size(); i++) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) deList.get(i);
+ EdgeRing adjRing = ((PolygonizeDirectedEdge) de.getSym()).getRing();
+ if (adjRing.isOuterHole()) return adjRing;
+ }
+ return null;
+ }
+
+ /**
+ * Updates the included status for currently non-included shells
+ * based on whether they are adjacent to an included shell.
+ */
+ public void updateIncluded() {
+ if (isHole()) return;
+ for (int i = 0; i < deList.size(); i++) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) deList.get(i);
+ EdgeRing adjShell = ((PolygonizeDirectedEdge) de.getSym()).getRing().getShell();
+
+ if (adjShell != null && adjShell.isIncludedSet()) {
+ // adjacent ring has been processed, so set included to inverse of adjacent included
+ setIncluded(! adjShell.isIncluded());
+ return;
+ }
+ }
+ }
+
+ /**
+ * Gets a string representation of this object.
+ *
+ * @return a string representing the object
+ */
+ public String toString() {
+ return WKTWriter.toLineString(new CoordinateArraySequence(getCoordinates()));
+ }
+
+ /**
+ * @return whether the ring has been processed
+ */
+ public boolean isProcessed() {
+ return isProcessed;
+ }
+
+ /**
+ * @param isProcessed whether the ring has been processed
+ */
+ public void setProcessed(boolean isProcessed) {
+ this.isProcessed = isProcessed;
+ }
+
+ /**
+ * Compares EdgeRings based on their envelope,
+ * using the standard lexicographic ordering.
+ * This ordering is sufficient to make edge ring sorting deterministic.
+ *
+ * @author mbdavis
+ *
+ */
+ static class EnvelopeComparator implements Comparator {
+ public int compare(Object obj0, Object obj1) {
+ EdgeRing r0 = (EdgeRing) obj0;
+ EdgeRing r1 = (EdgeRing) obj1;
+ return r0.getRing().getEnvelope().compareTo(r1.getRing().getEnvelope());
+ }
+
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeDirectedEdge.java b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeDirectedEdge.java
new file mode 100644
index 0000000..750a54d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeDirectedEdge.java
@@ -0,0 +1,93 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.polygonize;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.planargraph.Node;
+
+/**
+ * A {@link DirectedEdge} of a {@link PolygonizeGraph}, which represents
+ * an edge of a polygon formed by the graph.
+ * May be logically deleted from the graph by setting the <code>marked</code> flag.
+ *
+ * @version 1.7
+ */
+class PolygonizeDirectedEdge
+ extends DirectedEdge
+{
+
+ private EdgeRing edgeRing = null;
+ private PolygonizeDirectedEdge next = null;
+ private long label = -1;
+
+ /**
+ * Constructs a directed edge connecting the <code>from</code> node to the
+ * <code>to</code> node.
+ *
+ * @param directionPt
+ * specifies this DirectedEdge's direction (given by an imaginary
+ * line from the <code>from</code> node to <code>directionPt</code>)
+ * @param edgeDirection
+ * whether this DirectedEdge's direction is the same as or
+ * opposite to that of the parent Edge (if any)
+ */
+ public PolygonizeDirectedEdge(Node from, Node to, Coordinate directionPt,
+ boolean edgeDirection)
+ {
+ super(from, to, directionPt, edgeDirection);
+ }
+
+ /**
+ * Returns the identifier attached to this directed edge.
+ */
+ public long getLabel() { return label; }
+ /**
+ * Attaches an identifier to this directed edge.
+ */
+ public void setLabel(long label) { this.label = label; }
+ /**
+ * Returns the next directed edge in the EdgeRing that this directed edge is a member
+ * of.
+ */
+ public PolygonizeDirectedEdge getNext() { return next; }
+ /**
+ * Sets the next directed edge in the EdgeRing that this directed edge is a member
+ * of.
+ */
+ public void setNext(PolygonizeDirectedEdge next) { this.next = next; }
+ /**
+ * Returns the ring of directed edges that this directed edge is
+ * a member of, or null if the ring has not been set.
+ * @see #setRing(EdgeRing)
+ */
+ public boolean isInRing() { return edgeRing != null; }
+ /**
+ * Sets the ring of directed edges that this directed edge is
+ * a member of.
+ */
+ public void setRing(EdgeRing edgeRing)
+ {
+ this.edgeRing = edgeRing;
+ }
+ /**
+ * Gets the {@link EdgeRing} this edge is a member of.
+ *
+ * @return an edge ring
+ */
+ public EdgeRing getRing()
+ {
+ return this.edgeRing;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeEdge.java b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeEdge.java
new file mode 100644
index 0000000..02f0847
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeEdge.java
@@ -0,0 +1,35 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+
+package org.locationtech.jts.operation.polygonize;
+
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.planargraph.Edge;
+
+/**
+ * An edge of a polygonization graph.
+ *
+ * @version 1.7
+ */
+class PolygonizeEdge
+ extends Edge
+{
+ private LineString line;
+
+ public PolygonizeEdge(LineString line)
+ {
+ this.line = line;
+ }
+ public LineString getLine() { return line; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeGraph.java b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeGraph.java
new file mode 100644
index 0000000..179de4e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/PolygonizeGraph.java
@@ -0,0 +1,437 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+
+package org.locationtech.jts.operation.polygonize;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.Stack;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.planargraph.DirectedEdgeStar;
+import org.locationtech.jts.planargraph.Edge;
+import org.locationtech.jts.planargraph.Node;
+import org.locationtech.jts.planargraph.PlanarGraph;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Represents a planar graph of edges that can be used to compute a
+ * polygonization, and implements the algorithms to compute the
+ * {@link EdgeRings} formed by the graph.
+ * <p>
+ * The marked flag on {@link DirectedEdge}s is used to indicate that a directed edge
+ * has be logically deleted from the graph.
+ *
+ * @version 1.7
+ */
+class PolygonizeGraph
+ extends PlanarGraph
+{
+
+ private static int getDegreeNonDeleted(Node node)
+ {
+ List edges = node.getOutEdges().getEdges();
+ int degree = 0;
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ if (! de.isMarked()) degree++;
+ }
+ return degree;
+ }
+
+ private static int getDegree(Node node, long label)
+ {
+ List edges = node.getOutEdges().getEdges();
+ int degree = 0;
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ if (de.getLabel() == label) degree++;
+ }
+ return degree;
+ }
+
+ /**
+ * Deletes all edges at a node
+ */
+ public static void deleteAllEdges(Node node)
+ {
+ List edges = node.getOutEdges().getEdges();
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ de.setMarked(true);
+ PolygonizeDirectedEdge sym = (PolygonizeDirectedEdge) de.getSym();
+ if (sym != null)
+ sym.setMarked(true);
+ }
+ }
+
+ private GeometryFactory factory;
+
+ //private List labelledRings;
+
+ /**
+ * Create a new polygonization graph.
+ */
+ public PolygonizeGraph(GeometryFactory factory)
+ {
+ this.factory = factory;
+ }
+
+ /**
+ * Add a {@link LineString} forming an edge of the polygon graph.
+ * @param line the line to add
+ */
+ public void addEdge(LineString line)
+ {
+ if (line.isEmpty()) { return; }
+ Coordinate[] linePts = CoordinateArrays.removeRepeatedPoints(line.getCoordinates());
+
+ if (linePts.length < 2) { return; }
+
+ Coordinate startPt = linePts[0];
+ Coordinate endPt = linePts[linePts.length - 1];
+
+ Node nStart = getNode(startPt);
+ Node nEnd = getNode(endPt);
+
+ DirectedEdge de0 = new PolygonizeDirectedEdge(nStart, nEnd, linePts[1], true);
+ DirectedEdge de1 = new PolygonizeDirectedEdge(nEnd, nStart, linePts[linePts.length - 2], false);
+ Edge edge = new PolygonizeEdge(line);
+ edge.setDirectedEdges(de0, de1);
+ add(edge);
+ }
+
+ private Node getNode(Coordinate pt)
+ {
+ Node node = findNode(pt);
+ if (node == null) {
+ node = new Node(pt);
+ // ensure node is only added once to graph
+ add(node);
+ }
+ return node;
+ }
+
+ private void computeNextCWEdges()
+ {
+ // set the next pointers for the edges around each node
+ for (Iterator iNode = nodeIterator(); iNode.hasNext(); ) {
+ Node node = (Node) iNode.next();
+ computeNextCWEdges(node);
+ }
+ }
+
+ /**
+ * Convert the maximal edge rings found by the initial graph traversal
+ * into the minimal edge rings required by JTS polygon topology rules.
+ *
+ * @param ringEdges the list of start edges for the edgeRings to convert.
+ */
+ private void convertMaximalToMinimalEdgeRings(List ringEdges)
+ {
+ for (Iterator i = ringEdges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ long label = de.getLabel();
+ List intNodes = findIntersectionNodes(de, label);
+
+ if (intNodes == null) continue;
+ // flip the next pointers on the intersection nodes to create minimal edge rings
+ for (Iterator iNode = intNodes.iterator(); iNode.hasNext(); ) {
+ Node node = (Node) iNode.next();
+ computeNextCCWEdges(node, label);
+ }
+ }
+ }
+
+ /**
+ * Finds all nodes in a maximal edgering which are self-intersection nodes
+ * @param startDE
+ * @param label
+ * @return the list of intersection nodes found,
+ * or <code>null</code> if no intersection nodes were found
+ */
+ private static List findIntersectionNodes(PolygonizeDirectedEdge startDE, long label)
+ {
+ PolygonizeDirectedEdge de = startDE;
+ List intNodes = null;
+ do {
+ Node node = de.getFromNode();
+ if (getDegree(node, label) > 1) {
+ if (intNodes == null)
+ intNodes = new ArrayList();
+ intNodes.add(node);
+ }
+
+ de = de.getNext();
+ Assert.isTrue(de != null, "found null DE in ring");
+ Assert.isTrue(de == startDE || ! de.isInRing(), "found DE already in ring");
+ } while (de != startDE);
+
+ return intNodes;
+ }
+
+ /**
+ * Computes the minimal EdgeRings formed by the edges in this graph.
+ * @return a list of the {@link EdgeRing}s found by the polygonization process.
+ */
+ public List getEdgeRings()
+ {
+ // maybe could optimize this, since most of these pointers should be set correctly already
+ // by deleteCutEdges()
+ computeNextCWEdges();
+ // clear labels of all edges in graph
+ label(dirEdges, -1);
+ List maximalRings = findLabeledEdgeRings(dirEdges);
+ convertMaximalToMinimalEdgeRings(maximalRings);
+
+ // find all edgerings (which will now be minimal ones, as required)
+ List edgeRingList = new ArrayList();
+ for (Iterator i = dirEdges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ if (de.isMarked()) continue;
+ if (de.isInRing()) continue;
+
+ EdgeRing er = findEdgeRing(de);
+ edgeRingList.add(er);
+ }
+ return edgeRingList;
+ }
+
+ /**
+ * Finds and labels all edgerings in the graph.
+ * The edge rings are labeling with unique integers.
+ * The labeling allows detecting cut edges.
+ *
+ * @param dirEdges a List of the DirectedEdges in the graph
+ * @return a List of DirectedEdges, one for each edge ring found
+ */
+ private static List findLabeledEdgeRings(Collection dirEdges)
+ {
+ List edgeRingStarts = new ArrayList();
+ // label the edge rings formed
+ long currLabel = 1;
+ for (Iterator i = dirEdges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ if (de.isMarked()) continue;
+ if (de.getLabel() >= 0) continue;
+
+ edgeRingStarts.add(de);
+ List edges = EdgeRing.findDirEdgesInRing(de);
+
+ label(edges, currLabel);
+ currLabel++;
+ }
+ return edgeRingStarts;
+ }
+
+ /**
+ * Finds and removes all cut edges from the graph.
+ * @return a list of the {@link LineString}s forming the removed cut edges
+ */
+ public List deleteCutEdges()
+ {
+ computeNextCWEdges();
+ // label the current set of edgerings
+ findLabeledEdgeRings(dirEdges);
+
+ /**
+ * Cut Edges are edges where both dirEdges have the same label.
+ * Delete them, and record them
+ */
+ List cutLines = new ArrayList();
+ for (Iterator i = dirEdges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ if (de.isMarked()) continue;
+
+ PolygonizeDirectedEdge sym = (PolygonizeDirectedEdge) de.getSym();
+
+ if (de.getLabel() == sym.getLabel()) {
+ de.setMarked(true);
+ sym.setMarked(true);
+
+ // save the line as a cut edge
+ PolygonizeEdge e = (PolygonizeEdge) de.getEdge();
+ cutLines.add(e.getLine());
+ }
+ }
+ return cutLines;
+ }
+
+ private static void label(Collection dirEdges, long label)
+ {
+ for (Iterator i = dirEdges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ de.setLabel(label);
+ }
+ }
+ private static void computeNextCWEdges(Node node)
+ {
+ DirectedEdgeStar deStar = node.getOutEdges();
+ PolygonizeDirectedEdge startDE = null;
+ PolygonizeDirectedEdge prevDE = null;
+
+ // the edges are stored in CCW order around the star
+ for (Iterator i = deStar.getEdges().iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge outDE = (PolygonizeDirectedEdge) i.next();
+ if (outDE.isMarked()) continue;
+
+ if (startDE == null)
+ startDE = outDE;
+ if (prevDE != null) {
+ PolygonizeDirectedEdge sym = (PolygonizeDirectedEdge) prevDE.getSym();
+ sym.setNext(outDE);
+ }
+ prevDE = outDE;
+ }
+ if (prevDE != null) {
+ PolygonizeDirectedEdge sym = (PolygonizeDirectedEdge) prevDE.getSym();
+ sym.setNext(startDE);
+ }
+ }
+ /**
+ * Computes the next edge pointers going CCW around the given node, for the
+ * given edgering label.
+ * This algorithm has the effect of converting maximal edgerings into minimal edgerings
+ */
+ private static void computeNextCCWEdges(Node node, long label)
+ {
+ DirectedEdgeStar deStar = node.getOutEdges();
+ //PolyDirectedEdge lastInDE = null;
+ PolygonizeDirectedEdge firstOutDE = null;
+ PolygonizeDirectedEdge prevInDE = null;
+
+ // the edges are stored in CCW order around the star
+ List edges = deStar.getEdges();
+ //for (Iterator i = deStar.getEdges().iterator(); i.hasNext(); ) {
+ for (int i = edges.size() - 1; i >= 0; i--) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) edges.get(i);
+ PolygonizeDirectedEdge sym = (PolygonizeDirectedEdge) de.getSym();
+
+ PolygonizeDirectedEdge outDE = null;
+ if ( de.getLabel() == label) outDE = de;
+ PolygonizeDirectedEdge inDE = null;
+ if ( sym.getLabel() == label) inDE = sym;
+
+ if (outDE == null && inDE == null) continue; // this edge is not in edgering
+
+ if (inDE != null) {
+ prevInDE = inDE;
+ }
+
+ if (outDE != null) {
+ if (prevInDE != null) {
+ prevInDE.setNext(outDE);
+ prevInDE = null;
+ }
+ if (firstOutDE == null)
+ firstOutDE = outDE;
+ }
+ }
+ if (prevInDE != null) {
+ Assert.isTrue(firstOutDE != null);
+ prevInDE.setNext(firstOutDE);
+ }
+ }
+
+ private EdgeRing findEdgeRing(PolygonizeDirectedEdge startDE)
+ {
+ EdgeRing er = new EdgeRing(factory);
+ er.build(startDE);
+ return er;
+ }
+
+ /**
+ * Marks all edges from the graph which are "dangles".
+ * Dangles are which are incident on a node with degree 1.
+ * This process is recursive, since removing a dangling edge
+ * may result in another edge becoming a dangle.
+ * In order to handle large recursion depths efficiently,
+ * an explicit recursion stack is used
+ *
+ * @return a List containing the {@link LineString}s that formed dangles
+ */
+ public Collection deleteDangles()
+ {
+ List nodesToRemove = findNodesOfDegree(1);
+ Set dangleLines = new HashSet();
+
+ Stack nodeStack = new Stack();
+ for (Iterator i = nodesToRemove.iterator(); i.hasNext(); ) {
+ nodeStack.push(i.next());
+ }
+
+ while (! nodeStack.isEmpty()) {
+ Node node = (Node) nodeStack.pop();
+
+ deleteAllEdges(node);
+ List nodeOutEdges = node.getOutEdges().getEdges();
+ for (Iterator i = nodeOutEdges.iterator(); i.hasNext(); ) {
+ PolygonizeDirectedEdge de = (PolygonizeDirectedEdge) i.next();
+ // delete this edge and its sym
+ de.setMarked(true);
+ PolygonizeDirectedEdge sym = (PolygonizeDirectedEdge) de.getSym();
+ if (sym != null)
+ sym.setMarked(true);
+
+ // save the line as a dangle
+ PolygonizeEdge e = (PolygonizeEdge) de.getEdge();
+ dangleLines.add(e.getLine());
+
+ Node toNode = de.getToNode();
+ // add the toNode to the list to be processed, if it is now a dangle
+ if (getDegreeNonDeleted(toNode) == 1)
+ nodeStack.push(toNode);
+ }
+ }
+ return dangleLines;
+ }
+
+ /**
+ * Traverses the polygonized edge rings in the graph
+ * and computes the depth parity (odd or even)
+ * relative to the exterior of the graph.
+ * If the client has requested that the output
+ * be polygonally valid, only odd polygons will be constructed.
+ *
+ */
+ public void computeDepthParity()
+ {
+ while (true) {
+ PolygonizeDirectedEdge de = null; //findLowestDirEdge();
+ if (de == null)
+ return;
+ computeDepthParity(de);
+ }
+ }
+
+ /**
+ * Traverses all connected edges, computing the depth parity
+ * of the associated polygons.
+ *
+ * @param de
+ */
+ private void computeDepthParity(PolygonizeDirectedEdge de)
+ {
+
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/Polygonizer.java b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/Polygonizer.java
new file mode 100644
index 0000000..c0fcf6b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/Polygonizer.java
@@ -0,0 +1,359 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.polygonize;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+
+
+/**
+ * Polygonizes a set of {@link Geometry}s which contain linework that
+ * represents the edges of a planar graph.
+ * All types of Geometry are accepted as input;
+ * the constituent linework is extracted as the edges to be polygonized.
+ * The processed edges must be correctly noded; that is, they must only meet
+ * at their endpoints. Polygonization will accept incorrectly noded input
+ * but will not form polygons from non-noded edges,
+ * and reports them as errors.
+ * <p>
+ * The Polygonizer reports the follow kinds of errors:
+ * <ul>
+ * <li><b>Dangles</b> - edges which have one or both ends which are not incident on another edge endpoint
+ * <li><b>Cut Edges</b> - edges which are connected at both ends but which do not form part of polygon
+ * <li><b>Invalid Ring Lines</b> - edges which form rings which are invalid
+ * (e.g. the component lines contain a self-intersection)
+ * </ul>
+ * Polygonization supports extracting only polygons which form a valid polygonal geometry.
+ * The set of extracted polygons is guaranteed to be edge-disjoint.
+ * This is useful for situations where it is known that the input lines form a
+ * valid polygonal geometry.
+ *
+ * @version 1.7
+ */
+public class Polygonizer
+{
+ /**
+ * Adds every linear element in a {@link Geometry} into the polygonizer graph.
+ */
+ private static class LineStringAdder
+ implements GeometryComponentFilter
+ {
+ Polygonizer p;
+
+ LineStringAdder(Polygonizer p) {
+ this.p = p;
+ }
+
+ public void filter(Geometry g) {
+ if (g instanceof LineString)
+ p.add((LineString) g);
+ }
+ }
+
+ // default factory
+ private LineStringAdder lineStringAdder = new LineStringAdder(this);
+
+ protected PolygonizeGraph graph;
+ // initialize with empty collections, in case nothing is computed
+ protected Collection dangles = new ArrayList();
+ protected List cutEdges = new ArrayList();
+ protected List invalidRingLines = new ArrayList();
+
+ protected List holeList = null;
+ protected List shellList = null;
+ protected List polyList = null;
+
+ private boolean isCheckingRingsValid = true;
+ private boolean extractOnlyPolygonal;
+
+ private GeometryFactory geomFactory = null;
+
+ /**
+ * Creates a polygonizer with the same {@link GeometryFactory}
+ * as the input {@link Geometry}s.
+ * The output mask is {@link #ALL_POLYS}.
+ */
+ public Polygonizer()
+ {
+ this(false);
+ }
+
+ /**
+ * Creates a polygonizer and allow specifying if only polygons which form a valid polygonal geometry are to be extracted.
+ *
+ * @param extractOnlyPolygonal true if only polygons which form a valid polygonal geometry are to be extracted
+ */
+ public Polygonizer(boolean extractOnlyPolygonal)
+ {
+ this.extractOnlyPolygonal = extractOnlyPolygonal;
+ }
+
+ /**
+ * Adds a collection of geometries to the edges to be polygonized.
+ * May be called multiple times.
+ * Any dimension of Geometry may be added;
+ * the constituent linework will be extracted and used.
+ *
+ * @param geomList a list of {@link Geometry}s with linework to be polygonized
+ */
+ public void add(Collection geomList)
+ {
+ for (Iterator i = geomList.iterator(); i.hasNext(); ) {
+ Geometry geometry = (Geometry) i.next();
+ add(geometry);
+ }
+ }
+
+ /**
+ * Add a {@link Geometry} to the edges to be polygonized.
+ * May be called multiple times.
+ * Any dimension of Geometry may be added;
+ * the constituent linework will be extracted and used
+ *
+ * @param g a {@link Geometry} with linework to be polygonized
+ */
+ public void add(Geometry g)
+ {
+ g.apply(lineStringAdder);
+ }
+
+ /**
+ * Adds a linestring to the graph of polygon edges.
+ *
+ * @param line the {@link LineString} to add
+ */
+ private void add(LineString line)
+ {
+ // record the geometry factory for later use
+ geomFactory = line.getFactory();
+ // create a new graph using the factory from the input Geometry
+ if (graph == null)
+ graph = new PolygonizeGraph(geomFactory);
+ graph.addEdge(line);
+ }
+
+ /**
+ * Allows disabling the valid ring checking,
+ * to optimize situations where invalid rings are not expected.
+ * <p>
+ * The default is <code>true</code>.
+ *
+ * @param isCheckingRingsValid true if generated rings should be checked for validity
+ */
+ public void setCheckRingsValid(boolean isCheckingRingsValid)
+ {
+ this.isCheckingRingsValid = isCheckingRingsValid;
+ }
+
+ /**
+ * Gets the list of polygons formed by the polygonization.
+ * @return a collection of {@link Polygon}s
+ */
+ public Collection getPolygons()
+ {
+ polygonize();
+ return polyList;
+ }
+
+ /**
+ * Gets a geometry representing the polygons formed by the polygonization.
+ * If a valid polygonal geometry was extracted the result is a {@link Polygonal} geometry.
+ *
+ * @return a geometry containing the polygons
+ */
+ public Geometry getGeometry()
+ {
+ if (geomFactory == null) geomFactory = new GeometryFactory();
+ polygonize();
+ if (extractOnlyPolygonal) {
+ return geomFactory.buildGeometry(polyList);
+ }
+ // result may not be valid Polygonal, so return as a GeometryCollection
+ return geomFactory.createGeometryCollection(GeometryFactory.toGeometryArray(polyList));
+ }
+
+ /**
+ * Gets the list of dangling lines found during polygonization.
+ * @return a collection of the input {@link LineString}s which are dangles
+ */
+ public Collection getDangles()
+ {
+ polygonize();
+ return dangles;
+ }
+
+ /**
+ * Gets the list of cut edges found during polygonization.
+ * @return a collection of the input {@link LineString}s which are cut edges
+ */
+ public Collection getCutEdges()
+ {
+ polygonize();
+ return cutEdges;
+ }
+
+ /**
+ * Gets the list of lines forming invalid rings found during polygonization.
+ * @return a collection of the input {@link LineString}s which form invalid rings
+ */
+ public Collection getInvalidRingLines()
+ {
+ polygonize();
+ return invalidRingLines;
+ }
+
+ /**
+ * Performs the polygonization, if it has not already been carried out.
+ */
+ private void polygonize()
+ {
+ // check if already computed
+ if (polyList != null) return;
+ polyList = new ArrayList();
+
+ // if no geometries were supplied it's possible that graph is null
+ if (graph == null) return;
+
+ dangles = graph.deleteDangles();
+ cutEdges = graph.deleteCutEdges();
+ List edgeRingList = graph.getEdgeRings();
+
+ //Debug.printTime("Build Edge Rings");
+
+ List validEdgeRingList = new ArrayList();
+ invalidRingLines = new ArrayList();
+ if (isCheckingRingsValid) {
+ findValidRings(edgeRingList, validEdgeRingList, invalidRingLines);
+ }
+ else {
+ validEdgeRingList = edgeRingList;
+ }
+ //Debug.printTime("Validate Rings");
+
+ findShellsAndHoles(validEdgeRingList);
+ assignHolesToShells(holeList, shellList);
+ // order the shells to make any subsequent processing deterministic
+ Collections.sort(shellList, new EdgeRing.EnvelopeComparator());
+
+ //Debug.printTime("Assign Holes");
+
+ boolean includeAll = true;
+ if (extractOnlyPolygonal) {
+ findDisjointShells(shellList);
+ includeAll = false;
+ }
+ polyList = extractPolygons(shellList, includeAll);
+ }
+
+ private void findValidRings(List edgeRingList, List validEdgeRingList, List invalidRingList)
+ {
+ for (Iterator i = edgeRingList.iterator(); i.hasNext(); ) {
+ EdgeRing er = (EdgeRing) i.next();
+ if (er.isValid())
+ validEdgeRingList.add(er);
+ else
+ invalidRingList.add(er.getLineString());
+ }
+ }
+
+ private void findShellsAndHoles(List edgeRingList)
+ {
+ holeList = new ArrayList();
+ shellList = new ArrayList();
+ for (Iterator i = edgeRingList.iterator(); i.hasNext(); ) {
+ EdgeRing er = (EdgeRing) i.next();
+ er.computeHole();
+ if (er.isHole())
+ holeList.add(er);
+ else
+ shellList.add(er);
+ }
+ }
+
+ private static void assignHolesToShells(List holeList, List shellList)
+ {
+ for (Iterator i = holeList.iterator(); i.hasNext(); ) {
+ EdgeRing holeER = (EdgeRing) i.next();
+ assignHoleToShell(holeER, shellList);
+ /*
+ if ( ! holeER.hasShell()) {
+ System.out.println("DEBUG: Outer hole: " + holeER);
+ }
+ */
+ }
+ }
+
+ private static void assignHoleToShell(EdgeRing holeER, List shellList)
+ {
+ EdgeRing shell = EdgeRing.findEdgeRingContaining(holeER, shellList);
+ if (shell != null) {
+ shell.addHole(holeER);
+ }
+ }
+
+ private static void findDisjointShells(List shellList) {
+ findOuterShells(shellList);
+
+ boolean isMoreToScan;
+ do {
+ isMoreToScan = false;
+ for (Iterator i = shellList.iterator(); i.hasNext(); ) {
+ EdgeRing er = (EdgeRing) i.next();
+ if (er.isIncludedSet())
+ continue;
+ er.updateIncluded();
+ if (! er.isIncludedSet()) {
+ isMoreToScan = true;
+ }
+ }
+ } while (isMoreToScan);
+ }
+
+ /**
+ * For each outer hole finds and includes a single outer shell.
+ * This seeds the traversal algorithm for finding only polygonal shells.
+ *
+ * @param shellList the list of shell EdgeRings
+ */
+ private static void findOuterShells(List shellList) {
+
+ for (Iterator i = shellList.iterator(); i.hasNext();) {
+ EdgeRing er = (EdgeRing) i.next();
+ EdgeRing outerHoleER = er.getOuterHole();
+ if (outerHoleER != null && ! outerHoleER.isProcessed()) {
+ er.setIncluded(true);
+ outerHoleER.setProcessed(true);
+ }
+ }
+ }
+
+ private static List extractPolygons(List shellList, boolean includeAll) {
+ List polyList = new ArrayList();
+ for (Iterator i = shellList.iterator(); i.hasNext();) {
+ EdgeRing er = (EdgeRing) i.next();
+ if (includeAll || er.isIncluded()) {
+ polyList.add(er.getPolygon());
+ }
+ }
+ return polyList;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/package.html
new file mode 100644
index 0000000..5e46791
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/polygonize/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+An API for polygonizing sets of lines.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/predicate/RectangleContains.java b/modules/core/src/main/java/org/locationtech/jts/operation/predicate/RectangleContains.java
new file mode 100644
index 0000000..80d9b5b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/predicate/RectangleContains.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.predicate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Optimized implementation of the <tt>contains</tt> spatial predicate
+ * for cases where the first {@link Geometry} is a rectangle.
+ * This class works for all input geometries, including
+ * {@link GeometryCollection}s.
+ * <p>
+ * As a further optimization,
+ * this class can be used to test
+ * many geometries against a single
+ * rectangle in a slightly more efficient way.
+ *
+ * @version 1.7
+ */
+public class RectangleContains {
+
+ /**
+ * Tests whether a rectangle contains a given geometry.
+ *
+ * @param rectangle a rectangular Polygon
+ * @param b a Geometry of any type
+ * @return true if the geometries intersect
+ */
+ public static boolean contains(Polygon rectangle, Geometry b)
+ {
+ RectangleContains rc = new RectangleContains(rectangle);
+ return rc.contains(b);
+ }
+
+ private Envelope rectEnv;
+
+ /**
+ * Create a new contains computer for two geometries.
+ *
+ * @param rectangle a rectangular geometry
+ */
+ public RectangleContains(Polygon rectangle) {
+ rectEnv = rectangle.getEnvelopeInternal();
+ }
+
+ public boolean contains(Geometry geom)
+ {
+ // the test geometry must be wholly contained in the rectangle envelope
+ if (! rectEnv.contains(geom.getEnvelopeInternal()))
+ return false;
+
+ /**
+ * Check that geom is not contained entirely in the rectangle boundary.
+ * According to the somewhat odd spec of the SFS, if this
+ * is the case the geometry is NOT contained.
+ */
+ if (isContainedInBoundary(geom))
+ return false;
+ return true;
+ }
+
+ private boolean isContainedInBoundary(Geometry geom)
+ {
+ // polygons can never be wholely contained in the boundary
+ if (geom instanceof Polygon) return false;
+ if (geom instanceof Point) return isPointContainedInBoundary((Point) geom);
+ if (geom instanceof LineString) return isLineStringContainedInBoundary((LineString) geom);
+
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry comp = geom.getGeometryN(i);
+ if (! isContainedInBoundary(comp))
+ return false;
+ }
+ return true;
+ }
+
+ private boolean isPointContainedInBoundary(Point point)
+ {
+ return isPointContainedInBoundary(point.getCoordinate());
+ }
+
+ /**
+ * Tests if a point is contained in the boundary of the target rectangle.
+ *
+ * @param pt the point to test
+ * @return true if the point is contained in the boundary
+ */
+ private boolean isPointContainedInBoundary(Coordinate pt)
+ {
+ /**
+ * contains = false iff the point is properly contained in the rectangle.
+ *
+ * This code assumes that the point lies in the rectangle envelope
+ */
+ return pt.x == rectEnv.getMinX()
+ || pt.x == rectEnv.getMaxX()
+ || pt.y == rectEnv.getMinY()
+ || pt.y == rectEnv.getMaxY();
+ }
+
+ /**
+ * Tests if a linestring is completely contained in the boundary of the target rectangle.
+ * @param line the linestring to test
+ * @return true if the linestring is contained in the boundary
+ */
+ private boolean isLineStringContainedInBoundary(LineString line)
+ {
+ CoordinateSequence seq = line.getCoordinateSequence();
+ Coordinate p0 = new Coordinate();
+ Coordinate p1 = new Coordinate();
+ for (int i = 0; i < seq.size() - 1; i++) {
+ seq.getCoordinate(i, p0);
+ seq.getCoordinate(i + 1, p1);
+
+ if (! isLineSegmentContainedInBoundary(p0, p1))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Tests if a line segment is contained in the boundary of the target rectangle.
+ * @param p0 an endpoint of the segment
+ * @param p1 an endpoint of the segment
+ * @return true if the line segment is contained in the boundary
+ */
+ private boolean isLineSegmentContainedInBoundary(Coordinate p0, Coordinate p1)
+ {
+ if (p0.equals(p1))
+ return isPointContainedInBoundary(p0);
+
+ // we already know that the segment is contained in the rectangle envelope
+ if (p0.x == p1.x) {
+ if (p0.x == rectEnv.getMinX() ||
+ p0.x == rectEnv.getMaxX() )
+ return true;
+ }
+ else if (p0.y == p1.y) {
+ if (p0.y == rectEnv.getMinY() ||
+ p0.y == rectEnv.getMaxY() )
+ return true;
+ }
+ /**
+ * Either
+ * both x and y values are different
+ * or
+ * one of x and y are the same, but the other ordinate is not the same as a boundary ordinate
+ *
+ * In either case, the segment is not wholely in the boundary
+ */
+ return false;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/predicate/RectangleIntersects.java b/modules/core/src/main/java/org/locationtech/jts/operation/predicate/RectangleIntersects.java
new file mode 100644
index 0000000..ed86f1b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/predicate/RectangleIntersects.java
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.predicate;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.RectangleLineIntersector;
+import org.locationtech.jts.algorithm.locate.SimplePointInAreaLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.geom.util.ShortCircuitedGeometryVisitor;
+
+
+/**
+ * Implementation of the <tt>intersects</tt> spatial predicate
+ * optimized for the case where one {@link Geometry} is a rectangle.
+ * This class works for all
+ * input geometries, including {@link GeometryCollection}s.
+ * <p>
+ * As a further optimization,
+ * this class can be used in batch style
+ * to test many geometries
+ * against a single rectangle.
+ *
+ * @version 1.7
+ */
+public class RectangleIntersects
+{
+ /**
+ * Tests whether a rectangle intersects a given geometry.
+ *
+ * @param rectangle
+ * a rectangular Polygon
+ * @param b
+ * a Geometry of any type
+ * @return true if the geometries intersect
+ */
+ public static boolean intersects(Polygon rectangle, Geometry b)
+ {
+ RectangleIntersects rp = new RectangleIntersects(rectangle);
+ return rp.intersects(b);
+ }
+
+ private Polygon rectangle;
+
+ private Envelope rectEnv;
+
+ /**
+ * Create a new intersects computer for a rectangle.
+ *
+ * @param rectangle
+ * a rectangular Polygon
+ */
+ public RectangleIntersects(Polygon rectangle)
+ {
+ this.rectangle = rectangle;
+ rectEnv = rectangle.getEnvelopeInternal();
+ }
+
+ /**
+ * Tests whether the given Geometry intersects
+ * the query rectangle.
+ *
+ * @param geom the Geometry to test (may be of any type)
+ * @return true if the geometry intersects the query rectangle
+ */
+ public boolean intersects(Geometry geom)
+ {
+ if (!rectEnv.intersects(geom.getEnvelopeInternal()))
+ return false;
+
+ /**
+ * Test if rectangle envelope intersects any component envelope.
+ * This handles Point components as well
+ */
+ EnvelopeIntersectsVisitor visitor = new EnvelopeIntersectsVisitor(rectEnv);
+ visitor.applyTo(geom);
+ if (visitor.intersects())
+ return true;
+
+ /**
+ * Test if any rectangle vertex is contained in the target geometry
+ */
+ GeometryContainsPointVisitor ecpVisitor = new GeometryContainsPointVisitor(rectangle);
+ ecpVisitor.applyTo(geom);
+ if (ecpVisitor.containsPoint())
+ return true;
+
+ /**
+ * Test if any target geometry line segment intersects the rectangle
+ */
+ RectangleIntersectsSegmentVisitor riVisitor = new RectangleIntersectsSegmentVisitor(rectangle);
+ riVisitor.applyTo(geom);
+ if (riVisitor.intersects())
+ return true;
+
+ return false;
+ }
+}
+
+/**
+ * Tests whether it can be concluded that a rectangle intersects a geometry,
+ * based on the relationship of the envelope(s) of the geometry.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+class EnvelopeIntersectsVisitor extends ShortCircuitedGeometryVisitor
+{
+ private Envelope rectEnv;
+
+ private boolean intersects = false;
+
+ public EnvelopeIntersectsVisitor(Envelope rectEnv)
+ {
+ this.rectEnv = rectEnv;
+ }
+
+ /**
+ * Reports whether it can be concluded that an intersection occurs,
+ * or whether further testing is required.
+ *
+ * @return true if an intersection must occur
+ * or false if no conclusion about intersection can be made
+ */
+ public boolean intersects()
+ {
+ return intersects;
+ }
+
+ protected void visit(Geometry element)
+ {
+ Envelope elementEnv = element.getEnvelopeInternal();
+
+ // disjoint => no intersection
+ if (!rectEnv.intersects(elementEnv)) {
+ return;
+ }
+ // rectangle contains target env => must intersect
+ if (rectEnv.contains(elementEnv)) {
+ intersects = true;
+ return;
+ }
+ /**
+ * Since the envelopes intersect and the test element is connected, if the
+ * test envelope is completely bisected by an edge of the rectangle the
+ * element and the rectangle must touch (This is basically an application of
+ * the Jordan Curve Theorem). The alternative situation is that the test
+ * envelope is "on a corner" of the rectangle envelope, i.e. is not
+ * completely bisected. In this case it is not possible to make a conclusion
+ * about the presence of an intersection.
+ */
+ if (elementEnv.getMinX() >= rectEnv.getMinX()
+ && elementEnv.getMaxX() <= rectEnv.getMaxX()) {
+ intersects = true;
+ return;
+ }
+ if (elementEnv.getMinY() >= rectEnv.getMinY()
+ && elementEnv.getMaxY() <= rectEnv.getMaxY()) {
+ intersects = true;
+ return;
+ }
+ }
+
+ protected boolean isDone()
+ {
+ return intersects == true;
+ }
+}
+
+/**
+ * A visitor which tests whether it can be
+ * concluded that a geometry contains a vertex of
+ * a query geometry.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+class GeometryContainsPointVisitor extends ShortCircuitedGeometryVisitor
+{
+ private CoordinateSequence rectSeq;
+
+ private Envelope rectEnv;
+
+ private boolean containsPoint = false;
+
+ public GeometryContainsPointVisitor(Polygon rectangle)
+ {
+ this.rectSeq = rectangle.getExteriorRing().getCoordinateSequence();
+ rectEnv = rectangle.getEnvelopeInternal();
+ }
+
+ /**
+ * Reports whether it can be concluded that a corner point of the rectangle is
+ * contained in the geometry, or whether further testing is required.
+ *
+ * @return true if a corner point is contained
+ * or false if no conclusion about intersection can be made
+ */
+ public boolean containsPoint()
+ {
+ return containsPoint;
+ }
+
+ protected void visit(Geometry geom)
+ {
+ // if test geometry is not polygonal this check is not needed
+ if (!(geom instanceof Polygon))
+ return;
+
+ // skip if envelopes do not intersect
+ Envelope elementEnv = geom.getEnvelopeInternal();
+ if (!rectEnv.intersects(elementEnv))
+ return;
+
+ // test each corner of rectangle for inclusion
+ Coordinate rectPt = new Coordinate();
+ for (int i = 0; i < 4; i++) {
+ rectSeq.getCoordinate(i, rectPt);
+ if (!elementEnv.contains(rectPt))
+ continue;
+ // check rect point in poly (rect is known not to touch polygon at this
+ // point)
+ if (SimplePointInAreaLocator.containsPointInPolygon(rectPt,
+ (Polygon) geom)) {
+ containsPoint = true;
+ return;
+ }
+ }
+ }
+
+ protected boolean isDone()
+ {
+ return containsPoint == true;
+ }
+}
+
+
+/**
+ * A visitor to test for intersection between the query
+ * rectangle and the line segments of the geometry.
+ *
+ * @author Martin Davis
+ *
+ */
+class RectangleIntersectsSegmentVisitor extends ShortCircuitedGeometryVisitor
+{
+ private Envelope rectEnv;
+ private RectangleLineIntersector rectIntersector;
+
+ private boolean hasIntersection = false;
+ private Coordinate p0 = new Coordinate();
+ private Coordinate p1 = new Coordinate();
+
+ /**
+ * Creates a visitor for checking rectangle intersection
+ * with segments
+ *
+ * @param rectangle the query rectangle
+ */
+ public RectangleIntersectsSegmentVisitor(Polygon rectangle)
+ {
+ rectEnv = rectangle.getEnvelopeInternal();
+ rectIntersector = new RectangleLineIntersector(rectEnv);
+ }
+
+ /**
+ * Reports whether any segment intersection exists.
+ *
+ * @return true if a segment intersection exists
+ * or false if no segment intersection exists
+ */
+ public boolean intersects()
+ {
+ return hasIntersection;
+ }
+
+ protected void visit(Geometry geom)
+ {
+ /**
+ * It may be the case that the rectangle and the
+ * envelope of the geometry component are disjoint,
+ * so it is worth checking this simple condition.
+ */
+ Envelope elementEnv = geom.getEnvelopeInternal();
+ if (!rectEnv.intersects(elementEnv))
+ return;
+
+ // check segment intersections
+ // get all lines from geometry component
+ // (there may be more than one if it's a multi-ring polygon)
+ List lines = LinearComponentExtracter.getLines(geom);
+ checkIntersectionWithLineStrings(lines);
+ }
+
+ private void checkIntersectionWithLineStrings(List lines)
+ {
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString testLine = (LineString) i.next();
+ checkIntersectionWithSegments(testLine);
+ if (hasIntersection)
+ return;
+ }
+ }
+
+ private void checkIntersectionWithSegments(LineString testLine)
+ {
+ CoordinateSequence seq1 = testLine.getCoordinateSequence();
+ for (int j = 1; j < seq1.size(); j++) {
+ seq1.getCoordinate(j - 1, p0);
+ seq1.getCoordinate(j, p1);
+
+ if (rectIntersector.intersects(p0, p1)) {
+ hasIntersection = true;
+ return;
+ }
+ }
+ }
+
+ protected boolean isDone()
+ {
+ return hasIntersection == true;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/predicate/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/predicate/package.html
new file mode 100644
index 0000000..7e58ae9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/predicate/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes which implement topological predicates optimized for particular kinds of geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBuilder.java
new file mode 100644
index 0000000..e279004
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBuilder.java
@@ -0,0 +1,150 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+/**
+ * An EdgeEndBuilder creates EdgeEnds for all the "split edges"
+ * created by the
+ * intersections determined for an Edge.
+ *
+ * @version 1.7
+ */
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeEnd;
+import org.locationtech.jts.geomgraph.EdgeIntersection;
+import org.locationtech.jts.geomgraph.EdgeIntersectionList;
+import org.locationtech.jts.geomgraph.Label;
+
+/**
+ * Computes the {@link EdgeEnd}s which arise from a noded {@link Edge}.
+ *
+ * @version 1.7
+ */
+public class EdgeEndBuilder {
+
+ public EdgeEndBuilder() {
+ }
+
+ public List computeEdgeEnds(Iterator edges)
+ {
+ List l = new ArrayList();
+ for (Iterator i = edges; i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ computeEdgeEnds(e, l);
+ }
+ return l;
+ }
+
+ /**
+ * Creates stub edges for all the intersections in this
+ * Edge (if any) and inserts them into the graph.
+ */
+ public void computeEdgeEnds(Edge edge, List l)
+ {
+ EdgeIntersectionList eiList = edge.getEdgeIntersectionList();
+//Debug.print(eiList);
+ // ensure that the list has entries for the first and last point of the edge
+ eiList.addEndpoints();
+
+ Iterator it = eiList.iterator();
+ EdgeIntersection eiPrev = null;
+ EdgeIntersection eiCurr = null;
+ // no intersections, so there is nothing to do
+ if (! it.hasNext()) return;
+ EdgeIntersection eiNext = (EdgeIntersection) it.next();
+ do {
+ eiPrev = eiCurr;
+ eiCurr = eiNext;
+ eiNext = null;
+ if (it.hasNext()) eiNext = (EdgeIntersection) it.next();
+
+ if (eiCurr != null) {
+ createEdgeEndForPrev(edge, l, eiCurr, eiPrev);
+ createEdgeEndForNext(edge, l, eiCurr, eiNext);
+ }
+
+ } while (eiCurr != null);
+
+ }
+
+ /**
+ * Create a EdgeStub for the edge before the intersection eiCurr.
+ * The previous intersection is provided
+ * in case it is the endpoint for the stub edge.
+ * Otherwise, the previous point from the parent edge will be the endpoint.
+ * <br>
+ * eiCurr will always be an EdgeIntersection, but eiPrev may be null.
+ */
+ void createEdgeEndForPrev(
+ Edge edge,
+ List l,
+ EdgeIntersection eiCurr,
+ EdgeIntersection eiPrev)
+ {
+
+ int iPrev = eiCurr.segmentIndex;
+ if (eiCurr.dist == 0.0) {
+ // if at the start of the edge there is no previous edge
+ if (iPrev == 0) return;
+ iPrev--;
+ }
+ Coordinate pPrev = edge.getCoordinate(iPrev);
+ // if prev intersection is past the previous vertex, use it instead
+ if (eiPrev != null && eiPrev.segmentIndex >= iPrev)
+ pPrev = eiPrev.coord;
+
+ Label label = new Label(edge.getLabel());
+ // since edgeStub is oriented opposite to it's parent edge, have to flip sides for edge label
+ label.flip();
+ EdgeEnd e = new EdgeEnd(edge, eiCurr.coord, pPrev, label);
+//e.print(System.out); System.out.println();
+ l.add(e);
+ }
+ /**
+ * Create a StubEdge for the edge after the intersection eiCurr.
+ * The next intersection is provided
+ * in case it is the endpoint for the stub edge.
+ * Otherwise, the next point from the parent edge will be the endpoint.
+ * <br>
+ * eiCurr will always be an EdgeIntersection, but eiNext may be null.
+ */
+ void createEdgeEndForNext(
+ Edge edge,
+ List l,
+ EdgeIntersection eiCurr,
+ EdgeIntersection eiNext)
+ {
+
+ int iNext = eiCurr.segmentIndex + 1;
+ // if there is no next edge there is nothing to do
+ if (iNext >= edge.getNumPoints() && eiNext == null) return;
+
+ Coordinate pNext = edge.getCoordinate(iNext);
+
+ // if the next intersection is in the same segment as the current, use it as the endpoint
+ if (eiNext != null && eiNext.segmentIndex == eiCurr.segmentIndex)
+ pNext = eiNext.coord;
+
+ EdgeEnd e = new EdgeEnd(edge, eiCurr.coord, pNext, new Label(edge.getLabel()));
+//Debug.println(e);
+ l.add(e);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBundle.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBundle.java
new file mode 100644
index 0000000..ac1b1c7
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBundle.java
@@ -0,0 +1,192 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeEnd;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Position;
+
+/**
+ * A collection of {@link EdgeEnd}s which obey the following invariant:
+ * They originate at the same node and have the same direction.
+ *
+ * @version 1.7
+ */
+public class EdgeEndBundle
+ extends EdgeEnd
+{
+// private BoundaryNodeRule boundaryNodeRule;
+ private List edgeEnds = new ArrayList();
+
+ public EdgeEndBundle(BoundaryNodeRule boundaryNodeRule, EdgeEnd e)
+ {
+ super(e.getEdge(), e.getCoordinate(), e.getDirectedCoordinate(), new Label(e.getLabel()));
+ insert(e);
+ /*
+ if (boundaryNodeRule != null)
+ this.boundaryNodeRule = boundaryNodeRule;
+ else
+ boundaryNodeRule = BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE;
+ */
+ }
+
+ public EdgeEndBundle(EdgeEnd e)
+ {
+ this(null, e);
+ }
+
+ public Label getLabel() { return label; }
+ public Iterator iterator() { return edgeEnds.iterator(); }
+ public List getEdgeEnds() { return edgeEnds; }
+
+ public void insert(EdgeEnd e)
+ {
+ // Assert: start point is the same
+ // Assert: direction is the same
+ edgeEnds.add(e);
+ }
+ /**
+ * This computes the overall edge label for the set of
+ * edges in this EdgeStubBundle. It essentially merges
+ * the ON and side labels for each edge. These labels must be compatible
+ */
+ public void computeLabel(BoundaryNodeRule boundaryNodeRule)
+ {
+ // create the label. If any of the edges belong to areas,
+ // the label must be an area label
+ boolean isArea = false;
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ if (e.getLabel().isArea()) isArea = true;
+ }
+ if (isArea)
+ label = new Label(Location.NONE, Location.NONE, Location.NONE);
+ else
+ label = new Label(Location.NONE);
+
+ // compute the On label, and the side labels if present
+ for (int i = 0; i < 2; i++) {
+ computeLabelOn(i, boundaryNodeRule);
+ if (isArea)
+ computeLabelSides(i);
+ }
+ }
+
+ /**
+ * Compute the overall ON location for the list of EdgeStubs.
+ * (This is essentially equivalent to computing the self-overlay of a single Geometry)
+ * edgeStubs can be either on the boundary (e.g. Polygon edge)
+ * OR in the interior (e.g. segment of a LineString)
+ * of their parent Geometry.
+ * In addition, GeometryCollections use a {@link BoundaryNodeRule} to determine
+ * whether a segment is on the boundary or not.
+ * Finally, in GeometryCollections it can occur that an edge is both
+ * on the boundary and in the interior (e.g. a LineString segment lying on
+ * top of a Polygon edge.) In this case the Boundary is given precedence.
+ * <br>
+ * These observations result in the following rules for computing the ON location:
+ * <ul>
+ * <li> if there are an odd number of Bdy edges, the attribute is Bdy
+ * <li> if there are an even number >= 2 of Bdy edges, the attribute is Int
+ * <li> if there are any Int edges, the attribute is Int
+ * <li> otherwise, the attribute is NULL.
+ * </ul>
+ */
+ private void computeLabelOn(int geomIndex, BoundaryNodeRule boundaryNodeRule)
+ {
+ // compute the ON location value
+ int boundaryCount = 0;
+ boolean foundInterior = false;
+
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ int loc = e.getLabel().getLocation(geomIndex);
+ if (loc == Location.BOUNDARY) boundaryCount++;
+ if (loc == Location.INTERIOR) foundInterior = true;
+ }
+ int loc = Location.NONE;
+ if (foundInterior) loc = Location.INTERIOR;
+ if (boundaryCount > 0) {
+ loc = GeometryGraph.determineBoundary(boundaryNodeRule, boundaryCount);
+ }
+ label.setLocation(geomIndex, loc);
+
+ }
+ /**
+ * Compute the labelling for each side
+ */
+ private void computeLabelSides(int geomIndex)
+ {
+ computeLabelSide(geomIndex, Position.LEFT);
+ computeLabelSide(geomIndex, Position.RIGHT);
+ }
+
+ /**
+ * To compute the summary label for a side, the algorithm is:
+ * FOR all edges
+ * IF any edge's location is INTERIOR for the side, side location = INTERIOR
+ * ELSE IF there is at least one EXTERIOR attribute, side location = EXTERIOR
+ * ELSE side location = NULL
+ * <br>
+ * Note that it is possible for two sides to have apparently contradictory information
+ * i.e. one edge side may indicate that it is in the interior of a geometry, while
+ * another edge side may indicate the exterior of the same geometry. This is
+ * not an incompatibility - GeometryCollections may contain two Polygons that touch
+ * along an edge. This is the reason for Interior-primacy rule above - it
+ * results in the summary label having the Geometry interior on <b>both</b> sides.
+ */
+ private void computeLabelSide(int geomIndex, int side)
+ {
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) it.next();
+ if (e.getLabel().isArea()) {
+ int loc = e.getLabel().getLocation(geomIndex, side);
+ if (loc == Location.INTERIOR) {
+ label.setLocation(geomIndex, side, Location.INTERIOR);
+ return;
+ }
+ else if (loc == Location.EXTERIOR)
+ label.setLocation(geomIndex, side, Location.EXTERIOR);
+ }
+ }
+ }
+
+ /**
+ * Update the IM with the contribution for the computed label for the EdgeStubs.
+ */
+ void updateIM(IntersectionMatrix im)
+ {
+ Edge.updateIM(label, im);
+ }
+ public void print(PrintStream out)
+ {
+ out.println("EdgeEndBundle--> Label: " + label);
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEnd ee = (EdgeEnd) it.next();
+ ee.print(out);
+ out.println();
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBundleStar.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBundleStar.java
new file mode 100644
index 0000000..754186f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/EdgeEndBundleStar.java
@@ -0,0 +1,69 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.geomgraph.EdgeEnd;
+import org.locationtech.jts.geomgraph.EdgeEndStar;
+
+/**
+ * An ordered list of {@link EdgeEndBundle}s around a {@link RelateNode}.
+ * They are maintained in CCW order (starting with the positive x-axis) around the node
+ * for efficient lookup and topology building.
+ *
+ * @version 1.7
+ */
+public class EdgeEndBundleStar
+ extends EdgeEndStar
+{
+ /**
+ * Creates a new empty EdgeEndBundleStar
+ */
+ public EdgeEndBundleStar() {
+ }
+
+ /**
+ * Insert a EdgeEnd in order in the list.
+ * If there is an existing EdgeStubBundle which is parallel, the EdgeEnd is
+ * added to the bundle. Otherwise, a new EdgeEndBundle is created
+ * to contain the EdgeEnd.
+ * <br>
+ */
+ public void insert(EdgeEnd e)
+ {
+ EdgeEndBundle eb = (EdgeEndBundle) edgeMap.get(e);
+ if (eb == null) {
+ eb = new EdgeEndBundle(e);
+ insertEdgeEnd(e, eb);
+ }
+ else {
+ eb.insert(e);
+ }
+ }
+
+ /**
+ * Update the IM with the contribution for the EdgeStubs around the node.
+ */
+ void updateIM(IntersectionMatrix im)
+ {
+ for (Iterator it = iterator(); it.hasNext(); ) {
+ EdgeEndBundle esb = (EdgeEndBundle) it.next();
+ esb.updateIM(im);
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateComputer.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateComputer.java
new file mode 100644
index 0000000..be91db9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateComputer.java
@@ -0,0 +1,389 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+/**
+ * @version 1.7
+ */
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeEnd;
+import org.locationtech.jts.geomgraph.EdgeIntersection;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.geomgraph.Label;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.NodeMap;
+import org.locationtech.jts.geomgraph.index.SegmentIntersector;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Computes the topological relationship between two Geometries.
+ * <p>
+ * RelateComputer does not need to build a complete graph structure to compute
+ * the IntersectionMatrix. The relationship between the geometries can
+ * be computed by simply examining the labelling of edges incident on each node.
+ * <p>
+ * RelateComputer does not currently support arbitrary GeometryCollections.
+ * This is because GeometryCollections can contain overlapping Polygons.
+ * In order to correct compute relate on overlapping Polygons, they
+ * would first need to be noded and merged (if not explicitly, at least
+ * implicitly).
+ *
+ * @version 1.7
+ */
+public class RelateComputer
+{
+ private LineIntersector li = new RobustLineIntersector();
+ private PointLocator ptLocator = new PointLocator();
+ private GeometryGraph[] arg; // the arg(s) of the operation
+ private NodeMap nodes = new NodeMap(new RelateNodeFactory());
+ // this intersection matrix will hold the results compute for the relate
+ private IntersectionMatrix im = null;
+ private ArrayList isolatedEdges = new ArrayList();
+
+ // the intersection point found (if any)
+ private Coordinate invalidPoint;
+
+ public RelateComputer(GeometryGraph[] arg) {
+ this.arg = arg;
+ }
+
+ public IntersectionMatrix computeIM()
+ {
+ IntersectionMatrix im = new IntersectionMatrix();
+ // since Geometries are finite and embedded in a 2-D space, the EE element must always be 2
+ im.set(Location.EXTERIOR, Location.EXTERIOR, 2);
+
+ // if the Geometries don't overlap there is nothing to do
+ if (! arg[0].getGeometry().getEnvelopeInternal().intersects(
+ arg[1].getGeometry().getEnvelopeInternal()) ) {
+ computeDisjointIM(im);
+ return im;
+ }
+ arg[0].computeSelfNodes(li, false);
+ arg[1].computeSelfNodes(li, false);
+
+ // compute intersections between edges of the two input geometries
+ SegmentIntersector intersector = arg[0].computeEdgeIntersections(arg[1], li, false);
+//System.out.println("computeIM: # segment intersection tests: " + intersector.numTests);
+ computeIntersectionNodes(0);
+ computeIntersectionNodes(1);
+ /**
+ * Copy the labelling for the nodes in the parent Geometries. These override
+ * any labels determined by intersections between the geometries.
+ */
+ copyNodesAndLabels(0);
+ copyNodesAndLabels(1);
+
+ // complete the labelling for any nodes which only have a label for a single geometry
+//Debug.addWatch(nodes.find(new Coordinate(110, 200)));
+//Debug.printWatch();
+ labelIsolatedNodes();
+//Debug.printWatch();
+
+ // If a proper intersection was found, we can set a lower bound on the IM.
+ computeProperIntersectionIM(intersector, im);
+
+ /**
+ * Now process improper intersections
+ * (eg where one or other of the geometries has a vertex at the intersection point)
+ * We need to compute the edge graph at all nodes to determine the IM.
+ */
+
+ // build EdgeEnds for all intersections
+ EdgeEndBuilder eeBuilder = new EdgeEndBuilder();
+ List ee0 = eeBuilder.computeEdgeEnds(arg[0].getEdgeIterator());
+ insertEdgeEnds(ee0);
+ List ee1 = eeBuilder.computeEdgeEnds(arg[1].getEdgeIterator());
+ insertEdgeEnds(ee1);
+
+//Debug.println("==== NodeList ===");
+//Debug.print(nodes);
+
+ labelNodeEdges();
+
+ /**
+ * Compute the labeling for isolated components
+ * <br>
+ * Isolated components are components that do not touch any other components in the graph.
+ * They can be identified by the fact that they will
+ * contain labels containing ONLY a single element, the one for their parent geometry.
+ * We only need to check components contained in the input graphs, since
+ * isolated components will not have been replaced by new components formed by intersections.
+ */
+//debugPrintln("Graph A isolated edges - ");
+ labelIsolatedEdges(0, 1);
+//debugPrintln("Graph B isolated edges - ");
+ labelIsolatedEdges(1, 0);
+
+ // update the IM from all components
+ updateIM(im);
+ return im;
+ }
+
+ private void insertEdgeEnds(List ee)
+ {
+ for (Iterator i = ee.iterator(); i.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) i.next();
+ nodes.add(e);
+ }
+ }
+
+ private void computeProperIntersectionIM(SegmentIntersector intersector, IntersectionMatrix im)
+ {
+ // If a proper intersection is found, we can set a lower bound on the IM.
+ int dimA = arg[0].getGeometry().getDimension();
+ int dimB = arg[1].getGeometry().getDimension();
+ boolean hasProper = intersector.hasProperIntersection();
+ boolean hasProperInterior = intersector.hasProperInteriorIntersection();
+
+ // For Geometry's of dim 0 there can never be proper intersections.
+
+ /**
+ * If edge segments of Areas properly intersect, the areas must properly overlap.
+ */
+ if (dimA == 2 && dimB == 2) {
+ if (hasProper) im.setAtLeast("212101212");
+ }
+ /**
+ * If an Line segment properly intersects an edge segment of an Area,
+ * it follows that the Interior of the Line intersects the Boundary of the Area.
+ * If the intersection is a proper <i>interior</i> intersection, then
+ * there is an Interior-Interior intersection too.
+ * Note that it does not follow that the Interior of the Line intersects the Exterior
+ * of the Area, since there may be another Area component which contains the rest of the Line.
+ */
+ else if (dimA == 2 && dimB == 1) {
+ if (hasProper) im.setAtLeast("FFF0FFFF2");
+ if (hasProperInterior) im.setAtLeast("1FFFFF1FF");
+ }
+ else if (dimA == 1 && dimB == 2) {
+ if (hasProper) im.setAtLeast("F0FFFFFF2");
+ if (hasProperInterior) im.setAtLeast("1F1FFFFFF");
+ }
+ /* If edges of LineStrings properly intersect *in an interior point*, all
+ we can deduce is that
+ the interiors intersect. (We can NOT deduce that the exteriors intersect,
+ since some other segments in the geometries might cover the points in the
+ neighbourhood of the intersection.)
+ It is important that the point be known to be an interior point of
+ both Geometries, since it is possible in a self-intersecting geometry to
+ have a proper intersection on one segment that is also a boundary point of another segment.
+ */
+ else if (dimA == 1 && dimB == 1) {
+ if (hasProperInterior) im.setAtLeast("0FFFFFFFF");
+ }
+ }
+
+ /**
+ * Copy all nodes from an arg geometry into this graph.
+ * The node label in the arg geometry overrides any previously computed
+ * label for that argIndex.
+ * (E.g. a node may be an intersection node with
+ * a computed label of BOUNDARY,
+ * but in the original arg Geometry it is actually
+ * in the interior due to the Boundary Determination Rule)
+ */
+ private void copyNodesAndLabels(int argIndex)
+ {
+ for (Iterator i = arg[argIndex].getNodeIterator(); i.hasNext(); ) {
+ Node graphNode = (Node) i.next();
+ Node newNode = nodes.addNode(graphNode.getCoordinate());
+ newNode.setLabel(argIndex, graphNode.getLabel().getLocation(argIndex));
+//node.print(System.out);
+ }
+ }
+ /**
+ * Insert nodes for all intersections on the edges of a Geometry.
+ * Label the created nodes the same as the edge label if they do not already have a label.
+ * This allows nodes created by either self-intersections or
+ * mutual intersections to be labelled.
+ * Endpoint nodes will already be labelled from when they were inserted.
+ */
+ private void computeIntersectionNodes(int argIndex)
+ {
+ for (Iterator i = arg[argIndex].getEdgeIterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ int eLoc = e.getLabel().getLocation(argIndex);
+ for (Iterator eiIt = e.getEdgeIntersectionList().iterator(); eiIt.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) eiIt.next();
+ RelateNode n = (RelateNode) nodes.addNode(ei.coord);
+ if (eLoc == Location.BOUNDARY)
+ n.setLabelBoundary(argIndex);
+ else {
+ if (n.getLabel().isNull(argIndex))
+ n.setLabel(argIndex, Location.INTERIOR);
+ }
+//Debug.println(n);
+ }
+ }
+ }
+ /**
+ * For all intersections on the edges of a Geometry,
+ * label the corresponding node IF it doesn't already have a label.
+ * This allows nodes created by either self-intersections or
+ * mutual intersections to be labelled.
+ * Endpoint nodes will already be labelled from when they were inserted.
+ */
+ private void labelIntersectionNodes(int argIndex)
+ {
+ for (Iterator i = arg[argIndex].getEdgeIterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ int eLoc = e.getLabel().getLocation(argIndex);
+ for (Iterator eiIt = e.getEdgeIntersectionList().iterator(); eiIt.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) eiIt.next();
+ RelateNode n = (RelateNode) nodes.find(ei.coord);
+ if (n.getLabel().isNull(argIndex)) {
+ if (eLoc == Location.BOUNDARY)
+ n.setLabelBoundary(argIndex);
+ else
+ n.setLabel(argIndex, Location.INTERIOR);
+ }
+//n.print(System.out);
+ }
+ }
+ }
+ /**
+ * If the Geometries are disjoint, we need to enter their dimension and
+ * boundary dimension in the Ext rows in the IM
+ */
+ private void computeDisjointIM(IntersectionMatrix im)
+ {
+ Geometry ga = arg[0].getGeometry();
+ if (! ga.isEmpty()) {
+ im.set(Location.INTERIOR, Location.EXTERIOR, ga.getDimension());
+ im.set(Location.BOUNDARY, Location.EXTERIOR, ga.getBoundaryDimension());
+ }
+ Geometry gb = arg[1].getGeometry();
+ if (! gb.isEmpty()) {
+ im.set(Location.EXTERIOR, Location.INTERIOR, gb.getDimension());
+ im.set(Location.EXTERIOR, Location.BOUNDARY, gb.getBoundaryDimension());
+ }
+ }
+
+ private void labelNodeEdges()
+ {
+ for (Iterator ni = nodes.iterator(); ni.hasNext(); ) {
+ RelateNode node = (RelateNode) ni.next();
+ node.getEdges().computeLabelling(arg);
+//Debug.print(node.getEdges());
+//node.print(System.out);
+ }
+ }
+
+ /**
+ * update the IM with the sum of the IMs for each component
+ */
+ private void updateIM(IntersectionMatrix im)
+ {
+//Debug.println(im);
+ for (Iterator ei = isolatedEdges.iterator(); ei.hasNext(); ) {
+ Edge e = (Edge) ei.next();
+ e.updateIM(im);
+//Debug.println(im);
+ }
+ for (Iterator ni = nodes.iterator(); ni.hasNext(); ) {
+ RelateNode node = (RelateNode) ni.next();
+ node.updateIM(im);
+//Debug.println(im);
+ node.updateIMFromEdges(im);
+//Debug.println(im);
+//node.print(System.out);
+ }
+ }
+
+ /**
+ * Processes isolated edges by computing their labelling and adding them
+ * to the isolated edges list.
+ * Isolated edges are guaranteed not to touch the boundary of the target (since if they
+ * did, they would have caused an intersection to be computed and hence would
+ * not be isolated)
+ */
+ private void labelIsolatedEdges(int thisIndex, int targetIndex)
+ {
+ for (Iterator ei = arg[thisIndex].getEdgeIterator(); ei.hasNext(); ) {
+ Edge e = (Edge) ei.next();
+ if (e.isIsolated()) {
+ labelIsolatedEdge(e, targetIndex, arg[targetIndex].getGeometry());
+ isolatedEdges.add(e);
+ }
+ }
+ }
+ /**
+ * Label an isolated edge of a graph with its relationship to the target geometry.
+ * If the target has dim 2 or 1, the edge can either be in the interior or the exterior.
+ * If the target has dim 0, the edge must be in the exterior
+ */
+ private void labelIsolatedEdge(Edge e, int targetIndex, Geometry target)
+ {
+ // this won't work for GeometryCollections with both dim 2 and 1 geoms
+ if ( target.getDimension() > 0) {
+ // since edge is not in boundary, may not need the full generality of PointLocator?
+ // Possibly should use ptInArea locator instead? We probably know here
+ // that the edge does not touch the bdy of the target Geometry
+ int loc = ptLocator.locate(e.getCoordinate(), target);
+ e.getLabel().setAllLocations(targetIndex, loc);
+ }
+ else {
+ e.getLabel().setAllLocations(targetIndex, Location.EXTERIOR);
+ }
+//System.out.println(e.getLabel());
+ }
+
+ /**
+ * Isolated nodes are nodes whose labels are incomplete
+ * (e.g. the location for one Geometry is null).
+ * This is the case because nodes in one graph which don't intersect
+ * nodes in the other are not completely labelled by the initial process
+ * of adding nodes to the nodeList.
+ * To complete the labelling we need to check for nodes that lie in the
+ * interior of edges, and in the interior of areas.
+ */
+ private void labelIsolatedNodes()
+ {
+ for (Iterator ni = nodes.iterator(); ni.hasNext(); ) {
+ Node n = (Node) ni.next();
+ Label label = n.getLabel();
+ // isolated nodes should always have at least one geometry in their label
+ Assert.isTrue(label.getGeometryCount() > 0, "node with empty label found");
+ if (n.isIsolated()) {
+ if (label.isNull(0))
+ labelIsolatedNode(n, 0);
+ else
+ labelIsolatedNode(n, 1);
+ }
+ }
+ }
+
+ /**
+ * Label an isolated node with its relationship to the target geometry.
+ */
+ private void labelIsolatedNode(Node n, int targetIndex)
+ {
+ int loc = ptLocator.locate(n.getCoordinate(), arg[targetIndex].getGeometry());
+ n.getLabel().setAllLocations(targetIndex, loc);
+//debugPrintln(n.getLabel());
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNode.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNode.java
new file mode 100644
index 0000000..b3d2547
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNode.java
@@ -0,0 +1,52 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.geomgraph.EdgeEndStar;
+import org.locationtech.jts.geomgraph.Node;
+
+/**
+ * Represents a node in the topological graph used to compute spatial relationships.
+ *
+ * @version 1.7
+ */
+public class RelateNode
+ extends Node
+{
+
+ public RelateNode(Coordinate coord, EdgeEndStar edges)
+ {
+ super(coord, edges);
+ }
+
+ /**
+ * Update the IM with the contribution for this component.
+ * A component only contributes if it has a labelling for both parent geometries
+ */
+ protected void computeIM(IntersectionMatrix im)
+ {
+ im.setAtLeastIfValid(label.getLocation(0), label.getLocation(1), 0);
+ }
+ /**
+ * Update the IM with the contribution for the EdgeEnds incident on this node.
+ */
+ void updateIMFromEdges(IntersectionMatrix im)
+ {
+ ((EdgeEndBundleStar) edges).updateIM(im);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNodeFactory.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNodeFactory.java
new file mode 100644
index 0000000..d75499a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNodeFactory.java
@@ -0,0 +1,33 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.NodeFactory;
+import org.locationtech.jts.geomgraph.NodeMap;
+
+/**
+ * Used by the {@link NodeMap} in a {@link RelateNodeGraph} to create {@link RelateNode}s.
+ *
+ * @version 1.7
+ */
+public class RelateNodeFactory
+ extends NodeFactory
+{
+ public Node createNode(Coordinate coord)
+ {
+ return new RelateNode(coord, new EdgeEndBundleStar());
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNodeGraph.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNodeGraph.java
new file mode 100644
index 0000000..a8d6d6a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateNodeGraph.java
@@ -0,0 +1,135 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+/**
+ * @version 1.7
+ */
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeEnd;
+import org.locationtech.jts.geomgraph.EdgeIntersection;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.geomgraph.Node;
+import org.locationtech.jts.geomgraph.NodeMap;
+
+/**
+ * Implements the simple graph of Nodes and EdgeEnd which is all that is
+ * required to determine topological relationships between Geometries.
+ * Also supports building a topological graph of a single Geometry, to
+ * allow verification of valid topology.
+ * <p>
+ * It is <b>not</b> necessary to create a fully linked
+ * PlanarGraph to determine relationships, since it is sufficient
+ * to know how the Geometries interact locally around the nodes.
+ * In fact, this is not even feasible, since it is not possible to compute
+ * exact intersection points, and hence the topology around those nodes
+ * cannot be computed robustly.
+ * The only Nodes that are created are for improper intersections;
+ * that is, nodes which occur at existing vertices of the Geometries.
+ * Proper intersections (e.g. ones which occur between the interior of line segments)
+ * have their topology determined implicitly, without creating a Node object
+ * to represent them.
+ *
+ * @version 1.7
+ */
+public class RelateNodeGraph {
+
+ private NodeMap nodes = new NodeMap(new RelateNodeFactory());
+
+ public RelateNodeGraph() {
+ }
+
+ public Iterator getNodeIterator() { return nodes.iterator(); }
+
+ public void build(GeometryGraph geomGraph)
+ {
+ // compute nodes for intersections between previously noded edges
+ computeIntersectionNodes(geomGraph, 0);
+ /**
+ * Copy the labelling for the nodes in the parent Geometry. These override
+ * any labels determined by intersections.
+ */
+ copyNodesAndLabels(geomGraph, 0);
+
+ /**
+ * Build EdgeEnds for all intersections.
+ */
+ EdgeEndBuilder eeBuilder = new EdgeEndBuilder();
+ List eeList = eeBuilder.computeEdgeEnds(geomGraph.getEdgeIterator());
+ insertEdgeEnds(eeList);
+
+//Debug.println("==== NodeList ===");
+//Debug.print(nodes);
+ }
+
+ /**
+ * Insert nodes for all intersections on the edges of a Geometry.
+ * Label the created nodes the same as the edge label if they do not already have a label.
+ * This allows nodes created by either self-intersections or
+ * mutual intersections to be labelled.
+ * Endpoint nodes will already be labelled from when they were inserted.
+ * <p>
+ * Precondition: edge intersections have been computed.
+ */
+ public void computeIntersectionNodes(GeometryGraph geomGraph, int argIndex)
+ {
+ for (Iterator edgeIt = geomGraph.getEdgeIterator(); edgeIt.hasNext(); ) {
+ Edge e = (Edge) edgeIt.next();
+ int eLoc = e.getLabel().getLocation(argIndex);
+ for (Iterator eiIt = e.getEdgeIntersectionList().iterator(); eiIt.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) eiIt.next();
+ RelateNode n = (RelateNode) nodes.addNode(ei.coord);
+ if (eLoc == Location.BOUNDARY)
+ n.setLabelBoundary(argIndex);
+ else {
+ if (n.getLabel().isNull(argIndex))
+ n.setLabel(argIndex, Location.INTERIOR);
+ }
+//Debug.println(n);
+ }
+ }
+ }
+
+ /**
+ * Copy all nodes from an arg geometry into this graph.
+ * The node label in the arg geometry overrides any previously computed
+ * label for that argIndex.
+ * (E.g. a node may be an intersection node with
+ * a computed label of BOUNDARY,
+ * but in the original arg Geometry it is actually
+ * in the interior due to the Boundary Determination Rule)
+ */
+ public void copyNodesAndLabels(GeometryGraph geomGraph, int argIndex)
+ {
+ for (Iterator nodeIt = geomGraph.getNodeIterator(); nodeIt.hasNext(); ) {
+ Node graphNode = (Node) nodeIt.next();
+ Node newNode = nodes.addNode(graphNode.getCoordinate());
+ newNode.setLabel(argIndex, graphNode.getLabel().getLocation(argIndex));
+//node.print(System.out);
+ }
+ }
+
+ public void insertEdgeEnds(List ee)
+ {
+ for (Iterator i = ee.iterator(); i.hasNext(); ) {
+ EdgeEnd e = (EdgeEnd) i.next();
+ nodes.add(e);
+ }
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateOp.java
new file mode 100644
index 0000000..7cefd8b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/RelateOp.java
@@ -0,0 +1,115 @@
+
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.relate;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.operation.GeometryGraphOperation;
+
+/**
+ * Implements the SFS <tt>relate()</tt> generalized spatial predicate on two {@link Geometry}s.
+ * <p>
+ * The class supports specifying a custom {@link BoundaryNodeRule}
+ * to be used during the relate computation.
+ * <p>
+ * If named spatial predicates are used on the result {@link IntersectionMatrix}
+ * of the RelateOp, the result may or not be affected by the
+ * choice of <tt>BoundaryNodeRule</tt>, depending on the exact nature of the pattern.
+ * For instance, {@link IntersectionMatrix#isIntersects()} is insensitive
+ * to the choice of <tt>BoundaryNodeRule</tt>,
+ * whereas {@link IntersectionMatrix#isTouches(int, int)} is affected by the rule chosen.
+ * <p>
+ * <b>Note:</b> custom Boundary Node Rules do not (currently)
+ * affect the results of other {@link Geometry} methods (such
+ * as {@link Geometry#getBoundary}. The results of
+ * these methods may not be consistent with the relationship computed by
+ * a custom Boundary Node Rule.
+ *
+ * @version 1.7
+ */
+public class RelateOp
+ extends GeometryGraphOperation
+{
+ /**
+ * Computes the {@link IntersectionMatrix} for the spatial relationship
+ * between two {@link Geometry}s, using the default (OGC SFS) Boundary Node Rule
+ *
+ * @param a a Geometry to test
+ * @param b a Geometry to test
+ * @return the IntersectionMatrix for the spatial relationship between the geometries
+ */
+ public static IntersectionMatrix relate(Geometry a, Geometry b)
+ {
+ RelateOp relOp = new RelateOp(a, b);
+ IntersectionMatrix im = relOp.getIntersectionMatrix();
+ return im;
+ }
+
+ /**
+ * Computes the {@link IntersectionMatrix} for the spatial relationship
+ * between two {@link Geometry}s using a specified Boundary Node Rule.
+ *
+ * @param a a Geometry to test
+ * @param b a Geometry to test
+ * @param boundaryNodeRule the Boundary Node Rule to use
+ * @return the IntersectionMatrix for the spatial relationship between the input geometries
+ */
+ public static IntersectionMatrix relate(Geometry a, Geometry b, BoundaryNodeRule boundaryNodeRule)
+ {
+ RelateOp relOp = new RelateOp(a, b, boundaryNodeRule);
+ IntersectionMatrix im = relOp.getIntersectionMatrix();
+ return im;
+ }
+
+ private RelateComputer relate;
+
+ /**
+ * Creates a new Relate operation, using the default (OGC SFS) Boundary Node Rule.
+ *
+ * @param g0 a Geometry to relate
+ * @param g1 another Geometry to relate
+ */
+ public RelateOp(Geometry g0, Geometry g1)
+ {
+ super(g0, g1);
+ relate = new RelateComputer(arg);
+ }
+
+ /**
+ * Creates a new Relate operation with a specified Boundary Node Rule.
+ *
+ * @param g0 a Geometry to relate
+ * @param g1 another Geometry to relate
+ * @param boundaryNodeRule the Boundary Node Rule to use
+ */
+ public RelateOp(Geometry g0, Geometry g1, BoundaryNodeRule boundaryNodeRule)
+ {
+ super(g0, g1, boundaryNodeRule);
+ relate = new RelateComputer(arg);
+ }
+
+ /**
+ * Gets the IntersectionMatrix for the spatial relationship
+ * between the input geometries.
+ *
+ * @return the IntersectionMatrix for the spatial relationship between the input geometries
+ */
+ public IntersectionMatrix getIntersectionMatrix()
+ {
+ return relate.computeIM();
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relate/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/relate/package.html
new file mode 100644
index 0000000..e6d4c63
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/relate/package.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes to implement the computation of the spatial relationships of <CODE>Geometry</CODE>s.
+<P>
+The <code>relate</code> algorithm computes the <code>IntersectionMatrix</code> describing the
+relationship of two <code>Geometry</code>s. The algorithm for computing <code>relate</code>
+uses the intersection operations supported by topology graphs. Although the <code>relate</code>
+result depends on the resultant graph formed by the computed intersections, there is
+no need to explicitly compute the entire graph.
+It is sufficient to compute the local structure of the graph
+at each intersection node.
+<P>
+The algorithm to compute <code>relate</code> has the following steps:
+<UL>
+ <LI>Build topology graphs of the two input geometries. For each geometry
+ all self-intersection nodes are computed and added to the graph.
+ <LI>Compute nodes for all intersections between edges and nodes of the graphs.
+ <LI>Compute the labeling for the computed nodes by merging the labels from the input graphs.
+ <LI>Compute the labeling for isolated components of the graph (see below)
+ <LI>Compute the <code>IntersectionMatrix</code> from the labels on the nodes and edges.
+</UL>
+
+<H3>Labeling isolated components</H3>
+
+Isolated components are components (edges or nodes) of an input <code>Geometry</code> which
+do not contain any intersections with the other input <code>Geometry</code>. The
+topological relationship of these components to the other input <code>Geometry</code>
+must be computed in order to determine the complete labeling of the component. This can
+be done by testing whether the component lies in the interior or exterior of the other
+<code>Geometry</code>. If the other <code>Geometry</code> is 1-dimensional, the isolated
+component must lie in the exterior (since otherwise it would have an intersection with an
+edge of the <code>Geometry</code>). If the other <code>Geometry</code> is 2-dimensional,
+a Point-In-Polygon test can be used to determine whether the isolated component is in the
+interior or exterior.
+
+<h2>Package Specification</h2>
+
+<ul>
+ <li>Java Topology Suite Technical Specifications
+ <li><A HREF="http://www.opengis.org/techno/specs.htm">
+ OpenGIS Simple Features Specification for SQL</A>
+</ul>
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/union/CascadedPolygonUnion.java b/modules/core/src/main/java/org/locationtech/jts/operation/union/CascadedPolygonUnion.java
new file mode 100644
index 0000000..2b7239a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/union/CascadedPolygonUnion.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.union;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.util.GeometryCombiner;
+import org.locationtech.jts.geom.util.PolygonExtracter;
+import org.locationtech.jts.index.strtree.STRtree;
+
+
+/**
+ * Provides an efficient method of unioning a collection of
+ * {@link Polygonal} geometries.
+ * The geometries are indexed using a spatial index,
+ * and unioned recursively in index order.
+ * For geometries with a high degree of overlap,
+ * this has the effect of reducing the number of vertices
+ * early in the process, which increases speed
+ * and robustness.
+ * <p>
+ * This algorithm is faster and more robust than
+ * the simple iterated approach of
+ * repeatedly unioning each polygon to a result geometry.
+ * <p>
+ * The <tt>buffer(0)</tt> trick is sometimes faster, but can be less robust and
+ * can sometimes take a long time to complete.
+ * This is particularly the case where there is a high degree of overlap
+ * between the polygons. In this case, <tt>buffer(0)</tt> is forced to compute
+ * with <i>all</i> line segments from the outset,
+ * whereas cascading can eliminate many segments
+ * at each stage of processing.
+ * The best situation for using <tt>buffer(0)</tt> is the trivial case
+ * where there is <i>no</i> overlap between the input geometries.
+ * However, this case is likely rare in practice.
+ *
+ * @author Martin Davis
+ *
+ */
+public class CascadedPolygonUnion
+{
+ /**
+ * Computes the union of
+ * a collection of {@link Polygonal} {@link Geometry}s.
+ *
+ * @param polys a collection of {@link Polygonal} {@link Geometry}s
+ */
+ public static Geometry union(Collection polys)
+ {
+ CascadedPolygonUnion op = new CascadedPolygonUnion(polys);
+ return op.union();
+ }
+
+ private Collection inputPolys;
+ private GeometryFactory geomFactory = null;
+
+ /**
+ * Creates a new instance to union
+ * the given collection of {@link Geometry}s.
+ *
+ * @param polys a collection of {@link Polygonal} {@link Geometry}s
+ */
+ public CascadedPolygonUnion(Collection polys)
+ {
+ this.inputPolys = polys;
+ // guard against null input
+ if (inputPolys == null)
+ inputPolys = new ArrayList();
+ }
+
+ /**
+ * The effectiveness of the index is somewhat sensitive
+ * to the node capacity.
+ * Testing indicates that a smaller capacity is better.
+ * For an STRtree, 4 is probably a good number (since
+ * this produces 2x2 "squares").
+ */
+ private static final int STRTREE_NODE_CAPACITY = 4;
+
+ /**
+ * Computes the union of the input geometries.
+ * <p>
+ * This method discards the input geometries as they are processed.
+ * In many input cases this reduces the memory retained
+ * as the operation proceeds.
+ * Optimal memory usage is achieved
+ * by disposing of the original input collection
+ * before calling this method.
+ *
+ * @return the union of the input geometries
+ * or null if no input geometries were provided
+ * @throws IllegalStateException if this method is called more than once
+ */
+ public Geometry union()
+ {
+ if (inputPolys == null)
+ throw new IllegalStateException("union() method cannot be called twice");
+ if (inputPolys.isEmpty())
+ return null;
+ geomFactory = ((Geometry) inputPolys.iterator().next()).getFactory();
+
+ /**
+ * A spatial index to organize the collection
+ * into groups of close geometries.
+ * This makes unioning more efficient, since vertices are more likely
+ * to be eliminated on each round.
+ */
+// STRtree index = new STRtree();
+ STRtree index = new STRtree(STRTREE_NODE_CAPACITY);
+ for (Iterator i = inputPolys.iterator(); i.hasNext(); ) {
+ Geometry item = (Geometry) i.next();
+ index.insert(item.getEnvelopeInternal(), item);
+ }
+ // To avoiding holding memory remove references to the input geometries,
+ inputPolys = null;
+
+ List itemTree = index.itemsTree();
+// printItemEnvelopes(itemTree);
+ Geometry unionAll = unionTree(itemTree);
+ return unionAll;
+ }
+
+ private Geometry unionTree(List geomTree)
+ {
+ /**
+ * Recursively unions all subtrees in the list into single geometries.
+ * The result is a list of Geometrys only
+ */
+ List geoms = reduceToGeometries(geomTree);
+// Geometry union = bufferUnion(geoms);
+ Geometry union = binaryUnion(geoms);
+
+ // print out union (allows visualizing hierarchy)
+// System.out.println(union);
+
+ return union;
+// return repeatedUnion(geoms);
+// return buffer0Union(geoms);
+
+ }
+
+ //========================================================
+ /*
+ * The following methods are for experimentation only
+ */
+
+ private Geometry repeatedUnion(List geoms)
+ {
+ Geometry union = null;
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ if (union == null)
+ union = g.copy();
+ else
+ union = union.union(g);
+ }
+ return union;
+ }
+
+ private Geometry bufferUnion(List geoms)
+ {
+ GeometryFactory factory = ((Geometry) geoms.get(0)).getFactory();
+ Geometry gColl = factory.buildGeometry(geoms);
+ Geometry unionAll = gColl.buffer(0.0);
+ return unionAll;
+ }
+
+ private Geometry bufferUnion(Geometry g0, Geometry g1)
+ {
+ GeometryFactory factory = g0.getFactory();
+ Geometry gColl = factory.createGeometryCollection(new Geometry[] { g0, g1 } );
+ Geometry unionAll = gColl.buffer(0.0);
+ return unionAll;
+ }
+
+ //=======================================
+
+ /**
+ * Unions a list of geometries
+ * by treating the list as a flattened binary tree,
+ * and performing a cascaded union on the tree.
+ */
+ private Geometry binaryUnion(List geoms)
+ {
+ return binaryUnion(geoms, 0, geoms.size());
+ }
+
+ /**
+ * Unions a section of a list using a recursive binary union on each half
+ * of the section.
+ *
+ * @param geoms the list of geometries containing the section to union
+ * @param start the start index of the section
+ * @param end the index after the end of the section
+ * @return the union of the list section
+ */
+ private Geometry binaryUnion(List geoms, int start, int end)
+ {
+ if (end - start <= 1) {
+ Geometry g0 = getGeometry(geoms, start);
+ return unionSafe(g0, null);
+ }
+ else if (end - start == 2) {
+ return unionSafe(getGeometry(geoms, start), getGeometry(geoms, start + 1));
+ }
+ else {
+ // recurse on both halves of the list
+ int mid = (end + start) / 2;
+ Geometry g0 = binaryUnion(geoms, start, mid);
+ Geometry g1 = binaryUnion(geoms, mid, end);
+ return unionSafe(g0, g1);
+ }
+ }
+
+ /**
+ * Gets the element at a given list index, or
+ * null if the index is out of range.
+ *
+ * @param list
+ * @param index
+ * @return the geometry at the given index
+ * or null if the index is out of range
+ */
+ private static Geometry getGeometry(List list, int index)
+ {
+ if (index >= list.size()) return null;
+ return (Geometry) list.get(index);
+ }
+
+ /**
+ * Reduces a tree of geometries to a list of geometries
+ * by recursively unioning the subtrees in the list.
+ *
+ * @param geomTree a tree-structured list of geometries
+ * @return a list of Geometrys
+ */
+ private List reduceToGeometries(List geomTree)
+ {
+ List geoms = new ArrayList();
+ for (Iterator i = geomTree.iterator(); i.hasNext(); ) {
+ Object o = i.next();
+ Geometry geom = null;
+ if (o instanceof List) {
+ geom = unionTree((List) o);
+ }
+ else if (o instanceof Geometry) {
+ geom = (Geometry) o;
+ }
+ geoms.add(geom);
+ }
+ return geoms;
+ }
+
+ /**
+ * Computes the union of two geometries,
+ * either or both of which may be null.
+ *
+ * @param g0 a Geometry
+ * @param g1 a Geometry
+ * @return the union of the input(s)
+ * or null if both inputs are null
+ */
+ private Geometry unionSafe(Geometry g0, Geometry g1)
+ {
+ if (g0 == null && g1 == null)
+ return null;
+
+ if (g0 == null)
+ return g1.copy();
+ if (g1 == null)
+ return g0.copy();
+
+ return unionOptimized(g0, g1);
+ }
+
+ private Geometry unionOptimized(Geometry g0, Geometry g1)
+ {
+ Envelope g0Env = g0.getEnvelopeInternal();
+ Envelope g1Env = g1.getEnvelopeInternal();
+ //*
+ if (! g0Env.intersects(g1Env))
+ {
+ Geometry combo = GeometryCombiner.combine(g0, g1);
+// System.out.println("Combined");
+// System.out.println(combo);
+ return combo;
+ }
+ //*/
+// System.out.println(g0.getNumGeometries() + ", " + g1.getNumGeometries());
+
+ if (g0.getNumGeometries() <= 1 && g1.getNumGeometries() <= 1)
+ return unionActual(g0, g1);
+
+ // for testing...
+// if (true) return g0.union(g1);
+
+ Envelope commonEnv = g0Env.intersection(g1Env);
+ return unionUsingEnvelopeIntersection(g0, g1, commonEnv);
+
+// return UnionInteracting.union(g0, g1);
+ }
+
+
+
+ /**
+ * Unions two polygonal geometries, restricting computation
+ * to the envelope intersection where possible.
+ * The case of MultiPolygons is optimized to union only
+ * the polygons which lie in the intersection of the two geometry's envelopes.
+ * Polygons outside this region can simply be combined with the union result,
+ * which is potentially much faster.
+ * This case is likely to occur often during cascaded union, and may also
+ * occur in real world data (such as unioning data for parcels on different street blocks).
+ *
+ * @param g0 a polygonal geometry
+ * @param g1 a polygonal geometry
+ * @param common the intersection of the envelopes of the inputs
+ * @return the union of the inputs
+ */
+ private Geometry unionUsingEnvelopeIntersection(Geometry g0, Geometry g1, Envelope common)
+ {
+ List disjointPolys = new ArrayList();
+
+ Geometry g0Int = extractByEnvelope(common, g0, disjointPolys);
+ Geometry g1Int = extractByEnvelope(common, g1, disjointPolys);
+
+// System.out.println("# geoms in common: " + intersectingPolys.size());
+ Geometry union = unionActual(g0Int, g1Int);
+
+ disjointPolys.add(union);
+ Geometry overallUnion = GeometryCombiner.combine(disjointPolys);
+
+ return overallUnion;
+ }
+
+ private Geometry extractByEnvelope(Envelope env, Geometry geom,
+ List disjointGeoms)
+ {
+ List intersectingGeoms = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry elem = geom.getGeometryN(i);
+ if (elem.getEnvelopeInternal().intersects(env))
+ intersectingGeoms.add(elem);
+ else
+ disjointGeoms.add(elem);
+ }
+ return geomFactory.buildGeometry(intersectingGeoms);
+ }
+
+ /**
+ * Encapsulates the actual unioning of two polygonal geometries.
+ *
+ * @param g0
+ * @param g1
+ * @return
+ */
+ private Geometry unionActual(Geometry g0, Geometry g1)
+ {
+ /*
+ System.out.println(g0.getNumGeometries() + ", " + g1.getNumGeometries());
+
+ if (g0.getNumGeometries() > 5) {
+ System.out.println(g0);
+ System.out.println(g1);
+ }
+ */
+
+ //return bufferUnion(g0, g1);
+ return restrictToPolygons(g0.union(g1));
+ }
+
+ /**
+ * Computes a {@link Geometry} containing only {@link Polygonal} components.
+ * Extracts the {@link Polygon}s from the input
+ * and returns them as an appropriate {@link Polygonal} geometry.
+ * <p>
+ * If the input is already <tt>Polygonal</tt>, it is returned unchanged.
+ * <p>
+ * A particular use case is to filter out non-polygonal components
+ * returned from an overlay operation.
+ *
+ * @param g the geometry to filter
+ * @return a Polygonal geometry
+ */
+ private static Geometry restrictToPolygons(Geometry g)
+ {
+ if (g instanceof Polygonal) {
+ return g;
+ }
+ List polygons = PolygonExtracter.getPolygons(g);
+ if (polygons.size() == 1)
+ return (Polygon) polygons.get(0);
+ return g.getFactory().createMultiPolygon(GeometryFactory.toPolygonArray(polygons));
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/union/PointGeometryUnion.java b/modules/core/src/main/java/org/locationtech/jts/operation/union/PointGeometryUnion.java
new file mode 100644
index 0000000..a78ec9f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/union/PointGeometryUnion.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.union;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Puntal;
+import org.locationtech.jts.geom.util.GeometryCombiner;
+
+/**
+ * Computes the union of a {@link Puntal} geometry with
+ * another arbitrary {@link Geometry}.
+ * Does not copy any component geometries.
+ *
+ * @author mbdavis
+ *
+ */
+public class PointGeometryUnion
+{
+ public static Geometry union(Puntal pointGeom, Geometry otherGeom)
+ {
+ PointGeometryUnion unioner = new PointGeometryUnion(pointGeom, otherGeom);
+ return unioner.union();
+ }
+
+ private Geometry pointGeom;
+ private Geometry otherGeom;
+ private GeometryFactory geomFact;
+
+ public PointGeometryUnion(Puntal pointGeom, Geometry otherGeom)
+ {
+ this.pointGeom = (Geometry) pointGeom;
+ this.otherGeom = otherGeom;
+ geomFact = otherGeom.getFactory();
+ }
+
+ public Geometry union()
+ {
+ PointLocator locater = new PointLocator();
+ // use a set to eliminate duplicates, as required for union
+ Set exteriorCoords = new TreeSet();
+
+ for (int i =0 ; i < pointGeom.getNumGeometries(); i++) {
+ Point point = (Point) pointGeom.getGeometryN(i);
+ Coordinate coord = point.getCoordinate();
+ int loc = locater.locate(coord, otherGeom);
+ if (loc == Location.EXTERIOR)
+ exteriorCoords.add(coord);
+ }
+
+ // if no points are in exterior, return the other geom
+ if (exteriorCoords.size() == 0)
+ return otherGeom;
+
+ // make a puntal geometry of appropriate size
+ Geometry ptComp = null;
+ Coordinate[] coords = CoordinateArrays.toCoordinateArray(exteriorCoords);
+ if (coords.length == 1) {
+ ptComp = geomFact.createPoint(coords[0]);
+ }
+ else {
+ ptComp = geomFact.createMultiPointFromCoords(coords);
+ }
+
+ // add point component to the other geometry
+ return GeometryCombiner.combine(ptComp, otherGeom);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/union/UnaryUnionOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/union/UnaryUnionOp.java
new file mode 100644
index 0000000..849dd68
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/union/UnaryUnionOp.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.union;
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Puntal;
+import org.locationtech.jts.geom.util.GeometryExtracter;
+import org.locationtech.jts.operation.linemerge.LineMerger;
+import org.locationtech.jts.operation.overlay.OverlayOp;
+import org.locationtech.jts.operation.overlay.snap.SnapIfNeededOverlayOp;
+
+/**
+ * Unions a <code>Collection</code> of {@link Geometry}s or a single Geometry
+ * (which may be a {@link GeoometryCollection}) together.
+ * By using this special-purpose operation over a collection of geometries
+ * it is possible to take advantage of various optimizations to improve performance.
+ * Heterogeneous {@link GeometryCollection}s are fully supported.
+ * <p>
+ * The result obeys the following contract:
+ * <ul>
+ * <li>Unioning a set of {@link Polygon}s has the effect of
+ * merging the areas (i.e. the same effect as
+ * iteratively unioning all individual polygons together).
+ *
+ * <li>Unioning a set of {@link LineString}s has the effect of <b>noding</b>
+ * and <b>dissolving</b> the input linework.
+ * In this context "fully noded" means that there will be
+ * an endpoint or node in the result
+ * for every endpoint or line segment crossing in the input.
+ * "Dissolved" means that any duplicate (i.e. coincident) line segments or portions
+ * of line segments will be reduced to a single line segment in the result.
+ * This is consistent with the semantics of the
+ * {@link Geometry#union(Geometry)} operation.
+ * If <b>merged</b> linework is required, the {@link LineMerger} class can be used.
+ *
+ * <li>Unioning a set of {@link Point}s has the effect of merging
+ * all identical points (producing a set with no duplicates).
+ * </ul>
+ *
+ * <tt>UnaryUnion</tt> always operates on the individual components of MultiGeometries.
+ * So it is possible to use it to "clean" invalid self-intersecting MultiPolygons
+ * (although the polygon components must all still be individually valid.)
+ *
+ * @author mbdavis
+ *
+ */
+public class UnaryUnionOp
+{
+ /**
+ * Computes the geometric union of a {@link Collection}
+ * of {@link Geometry}s.
+ *
+ * @param geoms a collection of geometries
+ * @return the union of the geometries,
+ * or <code>null</code> if the input is empty
+ */
+ public static Geometry union(Collection geoms)
+ {
+ UnaryUnionOp op = new UnaryUnionOp(geoms);
+ return op.union();
+ }
+
+ /**
+ * Computes the geometric union of a {@link Collection}
+ * of {@link Geometry}s.
+ *
+ * If no input geometries were provided but a {@link GeometryFactory} was provided,
+ * an empty {@link GeometryCollection} is returned.
+ *
+ * @param geoms a collection of geometries
+ * @param geomFact the geometry factory to use if the collection is empty
+ * @return the union of the geometries,
+ * or an empty GEOMETRYCOLLECTION
+ */
+ public static Geometry union(Collection geoms, GeometryFactory geomFact)
+ {
+ UnaryUnionOp op = new UnaryUnionOp(geoms, geomFact);
+ return op.union();
+ }
+
+ /**
+ * Constructs a unary union operation for a {@link Geometry}
+ * (which may be a {@link GeometryCollection}).
+ *
+ * @param geom a geometry to union
+ * @return the union of the elements of the geometry
+ * or an empty GEOMETRYCOLLECTION
+ */
+ public static Geometry union(Geometry geom)
+ {
+ UnaryUnionOp op = new UnaryUnionOp(geom);
+ return op.union();
+ }
+
+ private List polygons = new ArrayList();
+ private List lines = new ArrayList();
+ private List points = new ArrayList();
+
+ private GeometryFactory geomFact = null;
+
+ /**
+ * Constructs a unary union operation for a {@link Collection}
+ * of {@link Geometry}s.
+ *
+ * @param geoms a collection of geometries
+ * @param geomFact the geometry factory to use if the collection is empty
+ */
+ public UnaryUnionOp(Collection geoms, GeometryFactory geomFact)
+ {
+ this.geomFact = geomFact;
+ extract(geoms);
+ }
+
+ /**
+ * Constructs a unary union operation for a {@link Collection}
+ * of {@link Geometry}s, using the {@link GeometryFactory}
+ * of the input geometries.
+ *
+ * @param geoms a collection of geometries
+ */
+ public UnaryUnionOp(Collection geoms)
+ {
+ extract(geoms);
+ }
+
+ /**
+ * Constructs a unary union operation for a {@link Geometry}
+ * (which may be a {@link GeometryCollection}).
+ * @param geom
+ */
+ public UnaryUnionOp(Geometry geom)
+ {
+ extract(geom);
+ }
+
+ private void extract(Collection geoms)
+ {
+ for (Iterator i = geoms.iterator(); i.hasNext();) {
+ Geometry geom = (Geometry) i.next();
+ extract(geom);
+ }
+ }
+
+ private void extract(Geometry geom)
+ {
+ if (geomFact == null)
+ geomFact = geom.getFactory();
+
+ /*
+ PolygonExtracter.getPolygons(geom, polygons);
+ LineStringExtracter.getLines(geom, lines);
+ PointExtracter.getPoints(geom, points);
+ */
+ GeometryExtracter.extract(geom, Polygon.class, polygons);
+ GeometryExtracter.extract(geom, LineString.class, lines);
+ GeometryExtracter.extract(geom, Point.class, points);
+ }
+
+ /**
+ * Gets the union of the input geometries.
+ * If no input geometries were provided but a {@link GeometryFactory} was provided,
+ * an empty {@link GeometryCollection} is returned.
+ * Otherwise, the return value is <code>null</code>.
+ *
+ * @return a Geometry containing the union,
+ * or an empty GEOMETRYCOLLECTION if no geometries were provided in the input,
+ * or <code>null</code> if no GeometryFactory was provided
+ */
+ public Geometry union()
+ {
+ if (geomFact == null) {
+ return null;
+ }
+
+ /**
+ * For points and lines, only a single union operation is
+ * required, since the OGC model allows self-intersecting
+ * MultiPoint and MultiLineStrings.
+ * This is not the case for polygons, so Cascaded Union is required.
+ */
+ Geometry unionPoints = null;
+ if (points.size() > 0) {
+ Geometry ptGeom = geomFact.buildGeometry(points);
+ unionPoints = unionNoOpt(ptGeom);
+ }
+
+ Geometry unionLines = null;
+ if (lines.size() > 0) {
+ Geometry lineGeom = geomFact.buildGeometry(lines);
+ unionLines = unionNoOpt(lineGeom);
+ }
+
+ Geometry unionPolygons = null;
+ if (polygons.size() > 0) {
+ unionPolygons = CascadedPolygonUnion.union(polygons);
+ }
+
+ /**
+ * Performing two unions is somewhat inefficient,
+ * but is mitigated by unioning lines and points first
+ */
+ Geometry unionLA = unionWithNull(unionLines, unionPolygons);
+ Geometry union = null;
+ if (unionPoints == null)
+ union = unionLA;
+ else if (unionLA == null)
+ union = unionPoints;
+ else
+ union = PointGeometryUnion.union((Puntal) unionPoints, unionLA);
+
+ if (union == null)
+ return geomFact.createGeometryCollection();
+
+ return union;
+ }
+
+ /**
+ * Computes the union of two geometries,
+ * either of both of which may be null.
+ *
+ * @param g0 a Geometry
+ * @param g1 a Geometry
+ * @return the union of the input(s)
+ * or null if both inputs are null
+ */
+ private Geometry unionWithNull(Geometry g0, Geometry g1)
+ {
+ if (g0 == null && g1 == null)
+ return null;
+
+ if (g1 == null)
+ return g0;
+ if (g0 == null)
+ return g1;
+
+ return g0.union(g1);
+ }
+
+ /**
+ * Computes a unary union with no extra optimization,
+ * and no short-circuiting.
+ * Due to the way the overlay operations
+ * are implemented, this is still efficient in the case of linear
+ * and puntal geometries.
+ * Uses robust version of overlay operation
+ * to ensure identical behaviour to the <tt>union(Geometry)</tt> operation.
+ *
+ * @param g0 a geometry
+ * @return the union of the input geometry
+ */
+ private Geometry unionNoOpt(Geometry g0)
+ {
+ Geometry empty = geomFact.createPoint();
+ return SnapIfNeededOverlayOp.overlayOp(g0, empty, OverlayOp.UNION);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/union/UnionInteracting.java b/modules/core/src/main/java/org/locationtech/jts/operation/union/UnionInteracting.java
new file mode 100644
index 0000000..25ff148
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/union/UnionInteracting.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.union;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.util.GeometryCombiner;
+
+
+/**
+ * Experimental code to union MultiPolygons
+ * with processing limited to the elements which actually interact.
+ *
+ * Not currently used, since it doesn't seem to offer much of a performance advantage.
+ *
+ * @author mbdavis
+ *
+ */
+public class UnionInteracting
+{
+ public static Geometry union(Geometry g0, Geometry g1)
+ {
+ UnionInteracting uue = new UnionInteracting(g0, g1);
+ return uue.union();
+ }
+
+
+ private GeometryFactory geomFactory;
+
+ private Geometry g0;
+ private Geometry g1;
+
+ private boolean[] interacts0;
+ private boolean[] interacts1;
+
+ public UnionInteracting(Geometry g0, Geometry g1)
+ {
+ this.g0 = g0;
+ this.g1 = g1;
+ geomFactory = g0.getFactory();
+ interacts0 = new boolean[g0.getNumGeometries()];
+ interacts1 = new boolean[g1.getNumGeometries()];
+ }
+
+ public Geometry union()
+ {
+ computeInteracting();
+
+ // check for all interacting or none interacting!
+
+ Geometry int0 = extractElements(g0, interacts0, true);
+ Geometry int1 = extractElements(g1, interacts1, true);
+
+// System.out.println(int0);
+// System.out.println(int1);
+
+ if (int0.isEmpty() || int1.isEmpty()) {
+ System.out.println("found empty!");
+// computeInteracting();
+ }
+// if (! int0.isValid()) {
+ //System.out.println(int0);
+ //throw new RuntimeException("invalid geom!");
+// }
+
+ Geometry union = int0.union(int1);
+ //Geometry union = bufferUnion(int0, int1);
+
+ Geometry disjoint0 = extractElements(g0, interacts0, false);
+ Geometry disjoint1 = extractElements(g1, interacts1, false);
+
+ Geometry overallUnion = GeometryCombiner.combine(union, disjoint0, disjoint1);
+
+ return overallUnion;
+
+ }
+
+ private Geometry bufferUnion(Geometry g0, Geometry g1)
+ {
+ GeometryFactory factory = g0.getFactory();
+ Geometry gColl = factory.createGeometryCollection(new Geometry[] { g0, g1 } );
+ Geometry unionAll = gColl.buffer(0.0);
+ return unionAll;
+ }
+
+ private void computeInteracting()
+ {
+ for (int i = 0; i < g0.getNumGeometries(); i++) {
+ Geometry elem = g0.getGeometryN(i);
+ interacts0[i] = computeInteracting(elem);
+ }
+ }
+
+ private boolean computeInteracting(Geometry elem0)
+ {
+ boolean interactsWithAny = false;
+ for (int i = 0; i < g1.getNumGeometries(); i++) {
+ Geometry elem1 = g1.getGeometryN(i);
+ boolean interacts = elem1.getEnvelopeInternal().intersects(elem0.getEnvelopeInternal());
+ if (interacts) interacts1[i] = true;
+ if (interacts)
+ interactsWithAny = true;
+ }
+ return interactsWithAny;
+ }
+
+ private Geometry extractElements(Geometry geom,
+ boolean[] interacts, boolean isInteracting)
+ {
+ List extractedGeoms = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry elem = geom.getGeometryN(i);
+ if (interacts[i] == isInteracting)
+ extractedGeoms.add(elem);
+ }
+ return geomFactory.buildGeometry(extractedGeoms);
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/union/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/union/package.html
new file mode 100644
index 0000000..a07bb16
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/union/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to perform efficent unioning of collections of geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/valid/ConnectedInteriorTester.java b/modules/core/src/main/java/org/locationtech/jts/operation/valid/ConnectedInteriorTester.java
new file mode 100644
index 0000000..6ed3fa1
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/valid/ConnectedInteriorTester.java
@@ -0,0 +1,233 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geomgraph.DirectedEdge;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeRing;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.geomgraph.PlanarGraph;
+import org.locationtech.jts.geomgraph.Position;
+import org.locationtech.jts.operation.overlay.MaximalEdgeRing;
+import org.locationtech.jts.operation.overlay.OverlayNodeFactory;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * This class tests that the interior of an area {@link Geometry}
+ * ( {@link Polygon} or {@link MultiPolygon} )
+ * is connected.
+ * This can happen if:
+ * <ul>
+ * <li>a shell self-intersects
+ * <li>one or more holes form a connected chain touching a shell at two different points
+ * <li>one or more holes form a ring around a subset of the interior
+ * </ul>
+ * If a disconnected situation is found the location of the problem is recorded.
+ *
+ * @version 1.7
+ */
+public class ConnectedInteriorTester {
+
+ public static Coordinate findDifferentPoint(Coordinate[] coord, Coordinate pt)
+ {
+ for (int i = 0; i < coord.length; i++) {
+ if (! coord[i].equals(pt))
+ return coord[i];
+ }
+ return null;
+ }
+
+ private GeometryFactory geometryFactory = new GeometryFactory();
+
+ private GeometryGraph geomGraph;
+ // save a coordinate for any disconnected interior found
+ // the coordinate will be somewhere on the ring surrounding the disconnected interior
+ private Coordinate disconnectedRingcoord;
+
+ public ConnectedInteriorTester(GeometryGraph geomGraph)
+ {
+ this.geomGraph = geomGraph;
+ }
+
+ public Coordinate getCoordinate() { return disconnectedRingcoord; }
+
+ public boolean isInteriorsConnected()
+ {
+ // node the edges, in case holes touch the shell
+ List splitEdges = new ArrayList();
+ geomGraph.computeSplitEdges(splitEdges);
+
+ // form the edges into rings
+ PlanarGraph graph = new PlanarGraph(new OverlayNodeFactory());
+ graph.addEdges(splitEdges);
+ setInteriorEdgesInResult(graph);
+ graph.linkResultDirectedEdges();
+ List edgeRings = buildEdgeRings(graph.getEdgeEnds());
+
+ /**
+ * Mark all the edges for the edgeRings corresponding to the shells
+ * of the input polygons. Note only ONE ring gets marked for each shell.
+ */
+ visitShellInteriors(geomGraph.getGeometry(), graph);
+
+ /**
+ * If there are any unvisited shell edges
+ * (i.e. a ring which is not a hole and which has the interior
+ * of the parent area on the RHS)
+ * this means that one or more holes must have split the interior of the
+ * polygon into at least two pieces. The polygon is thus invalid.
+ */
+ return ! hasUnvisitedShellEdge(edgeRings);
+ }
+
+ private void setInteriorEdgesInResult(PlanarGraph graph)
+ {
+ for (Iterator it = graph.getEdgeEnds().iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ if (de.getLabel().getLocation(0, Position.RIGHT) == Location.INTERIOR) {
+ de.setInResult(true);
+ }
+ }
+ }
+
+ /**
+ * Form DirectedEdges in graph into Minimal EdgeRings.
+ * (Minimal Edgerings must be used, because only they are guaranteed to provide
+ * a correct isHole computation)
+ */
+ private List buildEdgeRings(Collection dirEdges)
+ {
+ List edgeRings = new ArrayList();
+ for (Iterator it = dirEdges.iterator(); it.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) it.next();
+ // if this edge has not yet been processed
+ if (de.isInResult()
+ && de.getEdgeRing() == null) {
+ MaximalEdgeRing er = new MaximalEdgeRing(de, geometryFactory);
+
+ er.linkDirectedEdgesForMinimalEdgeRings();
+ List minEdgeRings = er.buildMinimalRings();
+ edgeRings.addAll(minEdgeRings);
+ }
+ }
+ return edgeRings;
+ }
+
+ /**
+ * Mark all the edges for the edgeRings corresponding to the shells
+ * of the input polygons.
+ * Only ONE ring gets marked for each shell - if there are others which remain unmarked
+ * this indicates a disconnected interior.
+ */
+ private void visitShellInteriors(Geometry g, PlanarGraph graph)
+ {
+ if (g instanceof Polygon) {
+ Polygon p = (Polygon) g;
+ visitInteriorRing(p.getExteriorRing(), graph);
+ }
+ if (g instanceof MultiPolygon) {
+ MultiPolygon mp = (MultiPolygon) g;
+ for (int i = 0; i < mp.getNumGeometries(); i++) {
+ Polygon p = (Polygon) mp.getGeometryN(i);
+ visitInteriorRing(p.getExteriorRing(), graph);
+ }
+ }
+ }
+
+ private void visitInteriorRing(LineString ring, PlanarGraph graph)
+ {
+ Coordinate[] pts = ring.getCoordinates();
+ Coordinate pt0 = pts[0];
+ /**
+ * Find first point in coord list different to initial point.
+ * Need special check since the first point may be repeated.
+ */
+ Coordinate pt1 = findDifferentPoint(pts, pt0);
+ Edge e = graph.findEdgeInSameDirection(pt0, pt1);
+ DirectedEdge de = (DirectedEdge) graph.findEdgeEnd(e);
+ DirectedEdge intDe = null;
+ if (de.getLabel().getLocation(0, Position.RIGHT) == Location.INTERIOR) {
+ intDe = de;
+ }
+ else if (de.getSym().getLabel().getLocation(0, Position.RIGHT) == Location.INTERIOR) {
+ intDe = de.getSym();
+ }
+ Assert.isTrue(intDe != null, "unable to find dirEdge with Interior on RHS");
+
+ visitLinkedDirectedEdges(intDe);
+ }
+
+ protected void visitLinkedDirectedEdges(DirectedEdge start)
+ {
+ DirectedEdge startDe = start;
+ DirectedEdge de = start;
+ do {
+ Assert.isTrue(de != null, "found null Directed Edge");
+ de.setVisited(true);
+ de = de.getNext();
+ } while (de != startDe);
+ }
+
+ /**
+ * Check if any shell ring has an unvisited edge.
+ * A shell ring is a ring which is not a hole and which has the interior
+ * of the parent area on the RHS.
+ * (Note that there may be non-hole rings with the interior on the LHS,
+ * since the interior of holes will also be polygonized into CW rings
+ * by the linkAllDirectedEdges() step)
+ *
+ * @return true if there is an unvisited edge in a non-hole ring
+ */
+ private boolean hasUnvisitedShellEdge(List edgeRings)
+ {
+ for (int i = 0; i < edgeRings.size(); i++) {
+ EdgeRing er = (EdgeRing) edgeRings.get(i);
+ // don't check hole rings
+ if (er.isHole())
+ continue;
+ List edges = er.getEdges();
+ DirectedEdge de = (DirectedEdge) edges.get(0);
+ // don't check CW rings which are holes
+ // (MD - this check may now be irrelevant)
+ if (de.getLabel().getLocation(0, Position.RIGHT) != Location.INTERIOR) continue;
+
+ /**
+ * the edgeRing is CW ring which surrounds the INT of the area, so check all
+ * edges have been visited. If any are unvisited, this is a disconnected part of the interior
+ */
+ for (int j = 0; j < edges.size(); j++) {
+ de = (DirectedEdge) edges.get(j);
+//Debug.print("visted? "); Debug.println(de);
+ if (! de.isVisited()) {
+//Debug.print("not visited "); Debug.println(de);
+ disconnectedRingcoord = de.getCoordinate();
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/valid/ConsistentAreaTester.java b/modules/core/src/main/java/org/locationtech/jts/operation/valid/ConsistentAreaTester.java
new file mode 100644
index 0000000..f7bb3cd
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/valid/ConsistentAreaTester.java
@@ -0,0 +1,149 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import java.util.Iterator;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.geomgraph.index.SegmentIntersector;
+import org.locationtech.jts.operation.relate.EdgeEndBundle;
+import org.locationtech.jts.operation.relate.RelateNode;
+import org.locationtech.jts.operation.relate.RelateNodeGraph;
+
+/**
+ * Checks that a {@link GeometryGraph} representing an area
+ * (a {@link Polygon} or {@link MultiPolygon} )
+ * has consistent semantics for area geometries.
+ * This check is required for any reasonable polygonal model
+ * (including the OGC-SFS model, as well as models which allow ring self-intersection at single points)
+ * <p>
+ * Checks include:
+ * <ul>
+ * <li>test for rings which properly intersect
+ * (but not for ring self-intersection, or intersections at vertices)
+ * <li>test for consistent labelling at all node points
+ * (this detects vertex intersections with invalid topology,
+ * i.e. where the exterior side of an edge lies in the interior of the area)
+ * <li>test for duplicate rings
+ * </ul>
+ * If an inconsistency is found the location of the problem
+ * is recorded and is available to the caller.
+ *
+ * @version 1.7
+ */
+public class ConsistentAreaTester {
+
+ private final LineIntersector li = new RobustLineIntersector();
+ private GeometryGraph geomGraph;
+ private RelateNodeGraph nodeGraph = new RelateNodeGraph();
+
+ // the intersection point found (if any)
+ private Coordinate invalidPoint;
+
+ /**
+ * Creates a new tester for consistent areas.
+ *
+ * @param geomGraph the topology graph of the area geometry
+ */
+ public ConsistentAreaTester(GeometryGraph geomGraph)
+ {
+ this.geomGraph = geomGraph;
+ }
+
+ /**
+ * @return the intersection point, or <code>null</code> if none was found
+ */
+ public Coordinate getInvalidPoint() { return invalidPoint; }
+
+ /**
+ * Check all nodes to see if their labels are consistent with area topology.
+ *
+ * @return <code>true</code> if this area has a consistent node labelling
+ */
+ public boolean isNodeConsistentArea()
+ {
+ /**
+ * To fully check validity, it is necessary to
+ * compute ALL intersections, including self-intersections within a single edge.
+ */
+ SegmentIntersector intersector = geomGraph.computeSelfNodes(li, true, true);
+ /**
+ * A proper intersection means that the area is not consistent.
+ */
+ if (intersector.hasProperIntersection()) {
+ invalidPoint = intersector.getProperIntersectionPoint();
+ return false;
+ }
+
+ nodeGraph.build(geomGraph);
+
+ return isNodeEdgeAreaLabelsConsistent();
+ }
+
+ /**
+ * Check all nodes to see if their labels are consistent.
+ * If any are not, return false
+ *
+ * @return <code>true</code> if the edge area labels are consistent at this node
+ */
+ private boolean isNodeEdgeAreaLabelsConsistent()
+ {
+ for (Iterator nodeIt = nodeGraph.getNodeIterator(); nodeIt.hasNext(); ) {
+ RelateNode node = (RelateNode) nodeIt.next();
+ if (! node.getEdges().isAreaLabelsConsistent(geomGraph)) {
+ invalidPoint = node.getCoordinate().copy();
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Checks for two duplicate rings in an area.
+ * Duplicate rings are rings that are topologically equal
+ * (that is, which have the same sequence of points up to point order).
+ * If the area is topologically consistent (determined by calling the
+ * <code>isNodeConsistentArea</code>,
+ * duplicate rings can be found by checking for EdgeBundles which contain
+ * more than one EdgeEnd.
+ * (This is because topologically consistent areas cannot have two rings sharing
+ * the same line segment, unless the rings are equal).
+ * The start point of one of the equal rings will be placed in
+ * invalidPoint.
+ *
+ * @return true if this area Geometry is topologically consistent but has two duplicate rings
+ */
+ public boolean hasDuplicateRings()
+ {
+ for (Iterator nodeIt = nodeGraph.getNodeIterator(); nodeIt.hasNext(); ) {
+ RelateNode node = (RelateNode) nodeIt.next();
+ for (Iterator i = node.getEdges().iterator(); i.hasNext(); ) {
+ EdgeEndBundle eeb = (EdgeEndBundle) i.next();
+ if (eeb.getEdgeEnds().size() > 1) {
+ invalidPoint = eeb.getEdge().getCoordinate(0);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/valid/IndexedNestedRingTester.java b/modules/core/src/main/java/org/locationtech/jts/operation/valid/IndexedNestedRingTester.java
new file mode 100644
index 0000000..bffa97a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/valid/IndexedNestedRingTester.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.strtree.STRtree;
+
+/**
+ * Tests whether any of a set of {@link LinearRing}s are
+ * nested inside another ring in the set, using a spatial
+ * index to speed up the comparisons.
+ *
+ * @version 1.7
+ */
+public class IndexedNestedRingTester
+{
+ private GeometryGraph graph; // used to find non-node vertices
+ private List rings = new ArrayList();
+ private Envelope totalEnv = new Envelope();
+ private SpatialIndex index;
+ private Coordinate nestedPt;
+
+ public IndexedNestedRingTester(GeometryGraph graph)
+ {
+ this.graph = graph;
+ }
+
+ public Coordinate getNestedPoint() { return nestedPt; }
+
+ public void add(LinearRing ring)
+ {
+ rings.add(ring);
+ totalEnv.expandToInclude(ring.getEnvelopeInternal());
+ }
+
+ public boolean isNonNested()
+ {
+ buildIndex();
+
+ for (int i = 0; i < rings.size(); i++) {
+ LinearRing innerRing = (LinearRing) rings.get(i);
+ Coordinate[] innerRingPts = innerRing.getCoordinates();
+
+ List results = index.query(innerRing.getEnvelopeInternal());
+//System.out.println(results.size());
+ for (int j = 0; j < results.size(); j++) {
+ LinearRing searchRing = (LinearRing) results.get(j);
+ Coordinate[] searchRingPts = searchRing.getCoordinates();
+
+ if (innerRing == searchRing)
+ continue;
+
+ if (! innerRing.getEnvelopeInternal().intersects(searchRing.getEnvelopeInternal()))
+ continue;
+
+ Coordinate innerRingPt = IsValidOp.findPtNotNode(innerRingPts, searchRing, graph);
+
+ /**
+ * If no non-node pts can be found, this means
+ * that the searchRing touches ALL of the innerRing vertices.
+ * This indicates an invalid polygon, since either
+ * the two holes create a disconnected interior,
+ * or they touch in an infinite number of points
+ * (i.e. along a line segment).
+ * Both of these cases are caught by other tests,
+ * so it is safe to simply skip this situation here.
+ */
+ if (innerRingPt == null)
+ continue;
+
+ boolean isInside = PointLocation.isInRing(innerRingPt, searchRingPts);
+ if (isInside) {
+ nestedPt = innerRingPt;
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ private void buildIndex()
+ {
+ index = new STRtree();
+
+ for (int i = 0; i < rings.size(); i++) {
+ LinearRing ring = (LinearRing) rings.get(i);
+ Envelope env = ring.getEnvelopeInternal();
+ index.insert(env, ring);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/valid/IsValidOp.java b/modules/core/src/main/java/org/locationtech/jts/operation/valid/IsValidOp.java
new file mode 100644
index 0000000..ee1a2ef
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/valid/IsValidOp.java
@@ -0,0 +1,618 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.algorithm.locate.IndexedPointInAreaLocator;
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geomgraph.Edge;
+import org.locationtech.jts.geomgraph.EdgeIntersection;
+import org.locationtech.jts.geomgraph.EdgeIntersectionList;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Implements the algorithms required to compute the <code>isValid()</code> method
+ * for {@link Geometry}s.
+ * See the documentation for the various geometry types for a specification of validity.
+ *
+ * @version 1.7
+ */
+public class IsValidOp
+{
+ /**
+ * Tests whether a {@link Geometry} is valid.
+ * @param geom the Geometry to test
+ * @return true if the geometry is valid
+ */
+ public static boolean isValid(Geometry geom)
+ {
+ IsValidOp isValidOp = new IsValidOp(geom);
+ return isValidOp.isValid();
+ }
+
+ /**
+ * Checks whether a coordinate is valid for processing.
+ * Coordinates are valid iff their x and y ordinates are in the
+ * range of the floating point representation.
+ *
+ * @param coord the coordinate to validate
+ * @return <code>true</code> if the coordinate is valid
+ */
+ public static boolean isValid(Coordinate coord)
+ {
+ if (Double.isNaN(coord.x)) return false;
+ if (Double.isInfinite(coord.x)) return false;
+ if (Double.isNaN(coord.y)) return false;
+ if (Double.isInfinite(coord.y)) return false;
+ return true;
+ }
+ /**
+ * Find a point from the list of testCoords
+ * that is NOT a node in the edge for the list of searchCoords
+ *
+ * @return the point found, or <code>null</code> if none found
+ */
+ public static Coordinate findPtNotNode(
+ Coordinate[] testCoords,
+ LinearRing searchRing,
+ GeometryGraph graph)
+ {
+ // find edge corresponding to searchRing.
+ Edge searchEdge = graph.findEdge(searchRing);
+ // find a point in the testCoords which is not a node of the searchRing
+ EdgeIntersectionList eiList = searchEdge.getEdgeIntersectionList();
+ // somewhat inefficient - is there a better way? (Use a node map, for instance?)
+ for (int i = 0 ; i < testCoords.length; i++) {
+ Coordinate pt = testCoords[i];
+ if (! eiList.isIntersection(pt))
+ return pt;
+ }
+ return null;
+ }
+
+ private Geometry parentGeometry; // the base Geometry to be validated
+ /**
+ * If the following condition is TRUE JTS will validate inverted shells and exverted holes
+ * (the ESRI SDE model)
+ */
+ private boolean isSelfTouchingRingFormingHoleValid = false;
+ private TopologyValidationError validErr;
+
+ public IsValidOp(Geometry parentGeometry)
+ {
+ this.parentGeometry = parentGeometry;
+ }
+
+ /**
+ * Sets whether polygons using <b>Self-Touching Rings</b> to form
+ * holes are reported as valid.
+ * If this flag is set, the following Self-Touching conditions
+ * are treated as being valid:
+ * <ul>
+ * <li>the shell ring self-touches to create a hole touching the shell
+ * <li>a hole ring self-touches to create two holes touching at a point
+ * </ul>
+ * <p>
+ * The default (following the OGC SFS standard)
+ * is that this condition is <b>not</b> valid (<code>false</code>).
+ * <p>
+ * This does not affect whether Self-Touching Rings
+ * disconnecting the polygon interior are considered valid
+ * (these are considered to be <b>invalid</b> under the SFS, and many other
+ * spatial models as well).
+ * This includes "bow-tie" shells,
+ * which self-touch at a single point causing the interior to
+ * be disconnected,
+ * and "C-shaped" holes which self-touch at a single point causing an island to be formed.
+ *
+ * @param isValid states whether geometry with this condition is valid
+ */
+ public void setSelfTouchingRingFormingHoleValid(boolean isValid)
+ {
+ isSelfTouchingRingFormingHoleValid = isValid;
+ }
+
+ /**
+ * Computes the validity of the geometry,
+ * and returns <tt>true</tt> if it is valid.
+ *
+ * @return true if the geometry is valid
+ */
+ public boolean isValid()
+ {
+ checkValid(parentGeometry);
+ return validErr == null;
+ }
+
+ /**
+ * Computes the validity of the geometry,
+ * and if not valid returns the validation error for the geometry,
+ * or null if the geometry is valid.
+ *
+ * @return the validation error, if the geometry is invalid
+ * or null if the geometry is valid
+ */
+ public TopologyValidationError getValidationError()
+ {
+ checkValid(parentGeometry);
+ return validErr;
+ }
+
+ private void checkValid(Geometry g)
+ {
+ validErr = null;
+
+ // empty geometries are always valid!
+ if (g.isEmpty()) return;
+
+ if (g instanceof Point) checkValid((Point) g);
+ else if (g instanceof MultiPoint) checkValid((MultiPoint) g);
+ // LineString also handles LinearRings
+ else if (g instanceof LinearRing) checkValid( (LinearRing) g);
+ else if (g instanceof LineString) checkValid( (LineString) g);
+ else if (g instanceof Polygon) checkValid( (Polygon) g);
+ else if (g instanceof MultiPolygon) checkValid( (MultiPolygon) g);
+ else if (g instanceof GeometryCollection) checkValid( (GeometryCollection) g);
+ else throw new UnsupportedOperationException(g.getClass().getName());
+ }
+
+ /**
+ * Checks validity of a Point.
+ */
+ private void checkValid(Point g)
+ {
+ checkInvalidCoordinates(g.getCoordinates());
+ }
+ /**
+ * Checks validity of a MultiPoint.
+ */
+ private void checkValid(MultiPoint g)
+ {
+ checkInvalidCoordinates(g.getCoordinates());
+ }
+
+ /**
+ * Checks validity of a LineString. Almost anything goes for linestrings!
+ */
+ private void checkValid(LineString g)
+ {
+ checkInvalidCoordinates(g.getCoordinates());
+ if (validErr != null) return;
+ GeometryGraph graph = new GeometryGraph(0, g);
+ checkTooFewPoints(graph);
+ }
+ /**
+ * Checks validity of a LinearRing.
+ */
+ private void checkValid(LinearRing g)
+ {
+ checkInvalidCoordinates(g.getCoordinates());
+ if (validErr != null) return;
+ checkClosedRing(g);
+ if (validErr != null) return;
+
+ GeometryGraph graph = new GeometryGraph(0, g);
+ checkTooFewPoints(graph);
+ if (validErr != null) return;
+
+ LineIntersector li = new RobustLineIntersector();
+ graph.computeSelfNodes(li, true, true);
+ checkNoSelfIntersectingRings(graph);
+ }
+
+ /**
+ * Checks the validity of a polygon.
+ * Sets the validErr flag.
+ */
+ private void checkValid(Polygon g)
+ {
+ checkInvalidCoordinates(g);
+ if (validErr != null) return;
+ checkClosedRings(g);
+ if (validErr != null) return;
+
+ GeometryGraph graph = new GeometryGraph(0, g);
+
+ checkTooFewPoints(graph);
+ if (validErr != null) return;
+ checkConsistentArea(graph);
+ if (validErr != null) return;
+
+ if (! isSelfTouchingRingFormingHoleValid) {
+ checkNoSelfIntersectingRings(graph);
+ if (validErr != null) return;
+ }
+ checkHolesInShell(g, graph);
+ if (validErr != null) return;
+ //SLOWcheckHolesNotNested(g);
+ checkHolesNotNested(g, graph);
+ if (validErr != null) return;
+ checkConnectedInteriors(graph);
+ }
+
+ private void checkValid(MultiPolygon g)
+ {
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ Polygon p = (Polygon) g.getGeometryN(i);
+ checkInvalidCoordinates(p);
+ if (validErr != null) return;
+ checkClosedRings(p);
+ if (validErr != null) return;
+ }
+
+ GeometryGraph graph = new GeometryGraph(0, g);
+
+ checkTooFewPoints(graph);
+ if (validErr != null) return;
+ checkConsistentArea(graph);
+ if (validErr != null) return;
+ if (! isSelfTouchingRingFormingHoleValid) {
+ checkNoSelfIntersectingRings(graph);
+ if (validErr != null) return;
+ }
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ Polygon p = (Polygon) g.getGeometryN(i);
+ checkHolesInShell(p, graph);
+ if (validErr != null) return;
+ }
+ for (int i = 0; i < g.getNumGeometries(); i++) {
+ Polygon p = (Polygon) g.getGeometryN(i);
+ checkHolesNotNested(p, graph);
+ if (validErr != null) return;
+ }
+ checkShellsNotNested(g, graph);
+ if (validErr != null) return;
+ checkConnectedInteriors(graph);
+ }
+
+ private void checkValid(GeometryCollection gc)
+ {
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = gc.getGeometryN(i);
+ checkValid(g);
+ if (validErr != null) return;
+ }
+ }
+
+ private void checkInvalidCoordinates(Coordinate[] coords)
+ {
+ for (int i = 0; i < coords.length; i++) {
+ if (! isValid(coords[i])) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.INVALID_COORDINATE,
+ coords[i]);
+ return;
+ }
+ }
+ }
+
+ private void checkInvalidCoordinates(Polygon poly)
+ {
+ checkInvalidCoordinates(poly.getExteriorRing().getCoordinates());
+ if (validErr != null) return;
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ checkInvalidCoordinates(poly.getInteriorRingN(i).getCoordinates());
+ if (validErr != null) return;
+ }
+ }
+
+ private void checkClosedRings(Polygon poly)
+ {
+ checkClosedRing((LinearRing) poly.getExteriorRing());
+ if (validErr != null) return;
+ for (int i = 0; i < poly.getNumInteriorRing(); i++) {
+ checkClosedRing((LinearRing) poly.getInteriorRingN(i));
+ if (validErr != null) return;
+ }
+ }
+
+ private void checkClosedRing(LinearRing ring)
+ {
+ if (! ring.isClosed() ) {
+ Coordinate pt = null;
+ if (ring.getNumPoints() >= 1)
+ pt = ring.getCoordinateN(0);
+ validErr = new TopologyValidationError(
+ TopologyValidationError.RING_NOT_CLOSED,
+ pt);
+ }
+ }
+
+ private void checkTooFewPoints(GeometryGraph graph)
+ {
+ if (graph.hasTooFewPoints()) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.TOO_FEW_POINTS,
+ graph.getInvalidPoint());
+ return;
+ }
+ }
+
+ /**
+ * Checks that the arrangement of edges in a polygonal geometry graph
+ * forms a consistent area.
+ *
+ * @param graph
+ *
+ * @see ConsistentAreaTester
+ */
+ private void checkConsistentArea(GeometryGraph graph)
+ {
+ ConsistentAreaTester cat = new ConsistentAreaTester(graph);
+ boolean isValidArea = cat.isNodeConsistentArea();
+ if (! isValidArea) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.SELF_INTERSECTION,
+ cat.getInvalidPoint());
+ return;
+ }
+ if (cat.hasDuplicateRings()) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.DUPLICATE_RINGS,
+ cat.getInvalidPoint());
+ }
+ }
+
+ /**
+ * Check that there is no ring which self-intersects (except of course at its endpoints).
+ * This is required by OGC topology rules (but not by other models
+ * such as ESRI SDE, which allow inverted shells and exverted holes).
+ *
+ * @param graph the topology graph of the geometry
+ */
+ private void checkNoSelfIntersectingRings(GeometryGraph graph)
+ {
+ for (Iterator i = graph.getEdgeIterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ checkNoSelfIntersectingRing(e.getEdgeIntersectionList());
+ if (validErr != null)
+ return;
+ }
+ }
+
+ /**
+ * Check that a ring does not self-intersect, except at its endpoints.
+ * Algorithm is to count the number of times each node along edge occurs.
+ * If any occur more than once, that must be a self-intersection.
+ */
+ private void checkNoSelfIntersectingRing(EdgeIntersectionList eiList)
+ {
+ Set nodeSet = new TreeSet();
+ boolean isFirst = true;
+ for (Iterator i = eiList.iterator(); i.hasNext(); ) {
+ EdgeIntersection ei = (EdgeIntersection) i.next();
+ if (isFirst) {
+ isFirst = false;
+ continue;
+ }
+ if (nodeSet.contains(ei.coord)) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.RING_SELF_INTERSECTION,
+ ei.coord);
+ return;
+ }
+ else {
+ nodeSet.add(ei.coord);
+ }
+ }
+ }
+
+ /**
+ * Tests that each hole is inside the polygon shell.
+ * This routine assumes that the holes have previously been tested
+ * to ensure that all vertices lie on the shell or on the same side of it
+ * (i.e. that the hole rings do not cross the shell ring).
+ * In other words, this test is only correct if the ConsistentArea test is passed first.
+ * Given this, a simple point-in-polygon test of a single point in the hole can be used,
+ * provided the point is chosen such that it does not lie on the shell.
+ *
+ * @param p the polygon to be tested for hole inclusion
+ * @param graph a GeometryGraph incorporating the polygon
+ */
+ private void checkHolesInShell(Polygon p, GeometryGraph graph)
+ {
+ LinearRing shell = (LinearRing) p.getExteriorRing();
+
+ //PointInRing pir = new SimplePointInRing(shell);
+ //PointInRing pir = new SIRtreePointInRing(shell);
+ //PointInRing pir = new MCPointInRing(shell);
+ PointOnGeometryLocator pir = new IndexedPointInAreaLocator(shell);
+
+ for (int i = 0; i < p.getNumInteriorRing(); i++) {
+
+ LinearRing hole = (LinearRing) p.getInteriorRingN(i);
+ Coordinate holePt = findPtNotNode(hole.getCoordinates(), shell, graph);
+ /**
+ * If no non-node hole vertex can be found, the hole must
+ * split the polygon into disconnected interiors.
+ * This will be caught by a subsequent check.
+ */
+ if (holePt == null) return;
+
+ boolean outside = Location.EXTERIOR == pir.locate(holePt);
+ if ( outside ) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.HOLE_OUTSIDE_SHELL,
+ holePt);
+ return;
+ }
+ }
+ }
+
+ /**
+ * Tests that no hole is nested inside another hole.
+ * This routine assumes that the holes are disjoint.
+ * To ensure this, holes have previously been tested
+ * to ensure that:
+ * <ul>
+ * <li>they do not partially overlap
+ * (checked by <code>checkRelateConsistency</code>)
+ * <li>they are not identical
+ * (checked by <code>checkRelateConsistency</code>)
+ * </ul>
+ */
+ private void checkHolesNotNested(Polygon p, GeometryGraph graph)
+ {
+ IndexedNestedRingTester nestedTester = new IndexedNestedRingTester(graph);
+ //SimpleNestedRingTester nestedTester = new SimpleNestedRingTester(arg[0]);
+ //SweeplineNestedRingTester nestedTester = new SweeplineNestedRingTester(arg[0]);
+
+ for (int i = 0; i < p.getNumInteriorRing(); i++) {
+ LinearRing innerHole = (LinearRing) p.getInteriorRingN(i);
+ nestedTester.add(innerHole);
+ }
+ boolean isNonNested = nestedTester.isNonNested();
+ if ( ! isNonNested ) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.NESTED_HOLES,
+ nestedTester.getNestedPoint());
+ }
+ }
+
+ /**
+ * Tests that no element polygon is wholly in the interior of another element polygon.
+ * <p>
+ * Preconditions:
+ * <ul>
+ * <li>shells do not partially overlap
+ * <li>shells do not touch along an edge
+ * <li>no duplicate rings exist
+ * </ul>
+ * This routine relies on the fact that while polygon shells may touch at one or
+ * more vertices, they cannot touch at ALL vertices.
+ */
+ private void checkShellsNotNested(MultiPolygon mp, GeometryGraph graph)
+ {
+ for (int i = 0; i < mp.getNumGeometries(); i++) {
+ Polygon p = (Polygon) mp.getGeometryN(i);
+ LinearRing shell = (LinearRing) p.getExteriorRing();
+ for (int j = 0; j < mp.getNumGeometries(); j++) {
+ if (i == j) continue;
+ Polygon p2 = (Polygon) mp.getGeometryN(j);
+ checkShellNotNested(shell, p2, graph);
+ if (validErr != null) return;
+ }
+ }
+ }
+
+ /**
+ * Check if a shell is incorrectly nested within a polygon. This is the case
+ * if the shell is inside the polygon shell, but not inside a polygon hole.
+ * (If the shell is inside a polygon hole, the nesting is valid.)
+ * <p>
+ * The algorithm used relies on the fact that the rings must be properly contained.
+ * E.g. they cannot partially overlap (this has been previously checked by
+ * <code>checkRelateConsistency</code> )
+ */
+ private void checkShellNotNested(LinearRing shell, Polygon p, GeometryGraph graph)
+ {
+ Coordinate[] shellPts = shell.getCoordinates();
+ // test if shell is inside polygon shell
+ LinearRing polyShell = (LinearRing) p.getExteriorRing();
+ Coordinate[] polyPts = polyShell.getCoordinates();
+ Coordinate shellPt = findPtNotNode(shellPts, polyShell, graph);
+ // if no point could be found, we can assume that the shell is outside the polygon
+ if (shellPt == null)
+ return;
+ boolean insidePolyShell = PointLocation.isInRing(shellPt, polyPts);
+ if (! insidePolyShell) return;
+
+ // if no holes, this is an error!
+ if (p.getNumInteriorRing() <= 0) {
+ validErr = new TopologyValidationError(
+ TopologyValidationError.NESTED_SHELLS,
+ shellPt);
+ return;
+ }
+
+ /**
+ * Check if the shell is inside one of the holes.
+ * This is the case if one of the calls to checkShellInsideHole
+ * returns a null coordinate.
+ * Otherwise, the shell is not properly contained in a hole, which is an error.
+ */
+ Coordinate badNestedPt = null;
+ for (int i = 0; i < p.getNumInteriorRing(); i++) {
+ LinearRing hole = (LinearRing) p.getInteriorRingN(i);
+ badNestedPt = checkShellInsideHole(shell, hole, graph);
+ if (badNestedPt == null)
+ return;
+ }
+ validErr = new TopologyValidationError(
+ TopologyValidationError.NESTED_SHELLS,
+ badNestedPt);
+ }
+
+ /**
+ * This routine checks to see if a shell is properly contained in a hole.
+ * It assumes that the edges of the shell and hole do not
+ * properly intersect.
+ *
+ * @return <code>null</code> if the shell is properly contained, or
+ * a Coordinate which is not inside the hole if it is not
+ *
+ */
+ private Coordinate checkShellInsideHole(LinearRing shell, LinearRing hole, GeometryGraph graph)
+ {
+ Coordinate[] shellPts = shell.getCoordinates();
+ Coordinate[] holePts = hole.getCoordinates();
+ // TODO: improve performance of this - by sorting pointlists for instance?
+ Coordinate shellPt = findPtNotNode(shellPts, hole, graph);
+ // if point is on shell but not hole, check that the shell is inside the hole
+ if (shellPt != null) {
+ boolean insideHole = PointLocation.isInRing(shellPt, holePts);
+ if (! insideHole) {
+ return shellPt;
+ }
+ }
+ Coordinate holePt = findPtNotNode(holePts, shell, graph);
+ // if point is on hole but not shell, check that the hole is outside the shell
+ if (holePt != null) {
+ boolean insideShell = PointLocation.isInRing(holePt, shellPts);
+ if (insideShell) {
+ return holePt;
+ }
+ return null;
+ }
+ Assert.shouldNeverReachHere("points in shell and hole appear to be equal");
+ return null;
+ }
+
+ private void checkConnectedInteriors(GeometryGraph graph)
+ {
+ ConnectedInteriorTester cit = new ConnectedInteriorTester(graph);
+ if (! cit.isInteriorsConnected())
+ validErr = new TopologyValidationError(
+ TopologyValidationError.DISCONNECTED_INTERIOR,
+ cit.getCoordinate());
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/valid/RepeatedPointTester.java b/modules/core/src/main/java/org/locationtech/jts/operation/valid/RepeatedPointTester.java
new file mode 100644
index 0000000..03eb71f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/valid/RepeatedPointTester.java
@@ -0,0 +1,81 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * Implements the appropriate checks for repeated points
+ * (consecutive identical coordinates) as defined in the
+ * JTS spec.
+ *
+ * @version 1.7
+ */
+public class RepeatedPointTester {
+
+ // save the repeated coord found (if any)
+ private Coordinate repeatedCoord;
+
+ public RepeatedPointTester() {
+ }
+
+ public Coordinate getCoordinate() { return repeatedCoord; }
+
+ public boolean hasRepeatedPoint(Geometry g)
+ {
+ if (g.isEmpty()) return false;
+ if (g instanceof Point) return false;
+ else if (g instanceof MultiPoint) return false;
+ // LineString also handles LinearRings
+ else if (g instanceof LineString) return hasRepeatedPoint(((LineString) g).getCoordinates());
+ else if (g instanceof Polygon) return hasRepeatedPoint((Polygon) g);
+ else if (g instanceof GeometryCollection) return hasRepeatedPoint((GeometryCollection) g);
+ else throw new UnsupportedOperationException(g.getClass().getName());
+ }
+
+ public boolean hasRepeatedPoint(Coordinate[] coord)
+ {
+ for (int i = 1; i < coord.length; i++) {
+ if (coord[i - 1].equals(coord[i]) ) {
+ repeatedCoord = coord[i];
+ return true;
+ }
+ }
+ return false;
+ }
+ private boolean hasRepeatedPoint(Polygon p)
+ {
+ if (hasRepeatedPoint(p.getExteriorRing().getCoordinates())) return true;
+ for (int i = 0; i < p.getNumInteriorRing(); i++) {
+ if (hasRepeatedPoint(p.getInteriorRingN(i).getCoordinates())) return true;
+ }
+ return false;
+ }
+ private boolean hasRepeatedPoint(GeometryCollection gc)
+ {
+ for (int i = 0; i < gc.getNumGeometries(); i++) {
+ Geometry g = gc.getGeometryN(i);
+ if (hasRepeatedPoint(g)) return true;
+ }
+ return false;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/valid/TopologyValidationError.java b/modules/core/src/main/java/org/locationtech/jts/operation/valid/TopologyValidationError.java
new file mode 100644
index 0000000..2744b99
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/valid/TopologyValidationError.java
@@ -0,0 +1,173 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Contains information about the nature and location of a {@link Geometry}
+ * validation error
+ *
+ * @version 1.7
+ */
+public class TopologyValidationError {
+
+ /**
+ * Not used
+ * @deprecated
+ */
+ public static final int ERROR = 0;
+ /**
+ * No longer used - repeated points are considered valid as per the SFS
+ * @deprecated
+ */
+ public static final int REPEATED_POINT = 1;
+
+ /**
+ * Indicates that a hole of a polygon lies partially or completely in the exterior of the shell
+ */
+ public static final int HOLE_OUTSIDE_SHELL = 2;
+
+ /**
+ * Indicates that a hole lies in the interior of another hole in the same polygon
+ */
+ public static final int NESTED_HOLES = 3;
+
+ /**
+ * Indicates that the interior of a polygon is disjoint
+ * (often caused by set of contiguous holes splitting the polygon into two parts)
+ */
+ public static final int DISCONNECTED_INTERIOR = 4;
+
+ /**
+ * Indicates that two rings of a polygonal geometry intersect
+ */
+ public static final int SELF_INTERSECTION = 5;
+
+ /**
+ * Indicates that a ring self-intersects
+ */
+ public static final int RING_SELF_INTERSECTION = 6;
+
+ /**
+ * Indicates that a polygon component of a MultiPolygon lies inside another polygonal component
+ */
+ public static final int NESTED_SHELLS = 7;
+
+ /**
+ * Indicates that a polygonal geometry contains two rings which are identical
+ */
+ public static final int DUPLICATE_RINGS = 8;
+
+ /**
+ * Indicates that either
+ * <ul>
+ * <li>a LineString contains a single point
+ * <li>a LinearRing contains 2 or 3 points
+ * </ul>
+ */
+ public static final int TOO_FEW_POINTS = 9;
+
+ /**
+ * Indicates that the <code>X</code> or <code>Y</code> ordinate of
+ * a Coordinate is not a valid numeric value (e.g. {@link Double#NaN} )
+ */
+ public static final int INVALID_COORDINATE = 10;
+
+ /**
+ * Indicates that a ring is not correctly closed
+ * (the first and the last coordinate are different)
+ */
+ public static final int RING_NOT_CLOSED = 11;
+
+ /**
+ * Messages corresponding to error codes
+ */
+ public static final String[] errMsg = {
+ "Topology Validation Error",
+ "Repeated Point",
+ "Hole lies outside shell",
+ "Holes are nested",
+ "Interior is disconnected",
+ "Self-intersection",
+ "Ring Self-intersection",
+ "Nested shells",
+ "Duplicate Rings",
+ "Too few distinct points in geometry component",
+ "Invalid Coordinate",
+ "Ring is not closed"
+ };
+
+ private int errorType;
+ private Coordinate pt;
+
+ /**
+ * Creates a validation error with the given type and location
+ *
+ * @param errorType the type of the error
+ * @param pt the location of the error
+ */
+ public TopologyValidationError(int errorType, Coordinate pt)
+ {
+ this.errorType = errorType;
+ if (pt != null)
+ this.pt = pt.copy();
+ }
+
+ /**
+ * Creates a validation error of the given type with a null location
+ *
+ * @param errorType the type of the error
+ *
+ */
+ public TopologyValidationError(int errorType)
+ {
+ this(errorType, null);
+ }
+
+ /**
+ * Returns the location of this error (on the {@link Geometry} containing the error).
+ *
+ * @return a {@link Coordinate} on the input geometry
+ */
+ public Coordinate getCoordinate() { return pt; }
+
+ /**
+ * Gets the type of this error.
+ *
+ * @return the error type
+ */
+ public int getErrorType() { return errorType; }
+
+ /**
+ * Gets an error message describing this error.
+ * The error message does not describe the location of the error.
+ *
+ * @return the error message
+ */
+ public String getMessage() { return errMsg[errorType]; }
+
+ /**
+ * Gets a message describing the type and location of this error.
+ * @return the error message
+ */
+ public String toString()
+ {
+ String locStr = "";
+ if (pt != null)
+ locStr = " at or near point " + pt;
+ return getMessage() + locStr;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/valid/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/valid/package.html
new file mode 100644
index 0000000..1db5116
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/operation/valid/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Provides classes for testing the validity of geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/DirectedEdge.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/DirectedEdge.java
new file mode 100644
index 0000000..6af766d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/DirectedEdge.java
@@ -0,0 +1,213 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.planargraph;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geomgraph.Quadrant;
+
+/**
+ * Represents a directed edge in a {@link PlanarGraph}. A DirectedEdge may or
+ * may not have a reference to a parent {@link Edge} (some applications of
+ * planar graphs may not require explicit Edge objects to be created). Usually
+ * a client using a <code>PlanarGraph</code> will subclass <code>DirectedEdge</code>
+ * to add its own application-specific data and methods.
+ *
+ * @version 1.7
+ */
+public class DirectedEdge
+ extends GraphComponent
+ implements Comparable
+{
+ /**
+ * Returns a List containing the parent Edge (possibly null) for each of the given
+ * DirectedEdges.
+ */
+ public static List toEdges(Collection dirEdges)
+ {
+ List edges = new ArrayList();
+ for (Iterator i = dirEdges.iterator(); i.hasNext(); ) {
+ edges.add( ((DirectedEdge) i.next()).parentEdge);
+ }
+ return edges;
+ }
+
+ protected Edge parentEdge;
+ protected Node from;
+ protected Node to;
+ protected Coordinate p0, p1;
+ protected DirectedEdge sym = null; // optional
+ protected boolean edgeDirection;
+ protected int quadrant;
+ protected double angle;
+
+ /**
+ * Constructs a DirectedEdge connecting the <code>from</code> node to the
+ * <code>to</code> node.
+ *
+ * @param directionPt
+ * specifies this DirectedEdge's direction vector
+ * (determined by the vector from the <code>from</code> node
+ * to <code>directionPt</code>)
+ * @param edgeDirection
+ * whether this DirectedEdge's direction is the same as or
+ * opposite to that of the parent Edge (if any)
+ */
+ public DirectedEdge(Node from, Node to, Coordinate directionPt, boolean edgeDirection)
+ {
+ this.from = from;
+ this.to = to;
+ this.edgeDirection = edgeDirection;
+ p0 = from.getCoordinate();
+ p1 = directionPt;
+ double dx = p1.x - p0.x;
+ double dy = p1.y - p0.y;
+ quadrant = Quadrant.quadrant(dx, dy);
+ angle = Math.atan2(dy, dx);
+ //Assert.isTrue(! (dx == 0 && dy == 0), "EdgeEnd with identical endpoints found");
+ }
+
+ /**
+ * Returns this DirectedEdge's parent Edge, or null if it has none.
+ */
+ public Edge getEdge() { return parentEdge; }
+ /**
+ * Associates this DirectedEdge with an Edge (possibly null, indicating no associated
+ * Edge).
+ */
+ public void setEdge(Edge parentEdge) { this.parentEdge = parentEdge; }
+ /**
+ * Returns 0, 1, 2, or 3, indicating the quadrant in which this DirectedEdge's
+ * orientation lies.
+ */
+ public int getQuadrant() { return quadrant; }
+ /**
+ * Returns a point to which an imaginary line is drawn from the from-node to
+ * specify this DirectedEdge's orientation.
+ */
+ public Coordinate getDirectionPt() { return p1; }
+ /**
+ * Returns whether the direction of the parent Edge (if any) is the same as that
+ * of this Directed Edge.
+ */
+ public boolean getEdgeDirection() { return edgeDirection; }
+ /**
+ * Returns the node from which this DirectedEdge leaves.
+ */
+ public Node getFromNode() { return from; }
+ /**
+ * Returns the node to which this DirectedEdge goes.
+ */
+ public Node getToNode() { return to; }
+ /**
+ * Returns the coordinate of the from-node.
+ */
+ public Coordinate getCoordinate() { return from.getCoordinate(); }
+ /**
+ * Returns the angle that the start of this DirectedEdge makes with the
+ * positive x-axis, in radians.
+ */
+ public double getAngle() { return angle; }
+ /**
+ * Returns the symmetric DirectedEdge -- the other DirectedEdge associated with
+ * this DirectedEdge's parent Edge.
+ */
+ public DirectedEdge getSym() { return sym; }
+ /**
+ * Sets this DirectedEdge's symmetric DirectedEdge, which runs in the opposite
+ * direction.
+ */
+ public void setSym(DirectedEdge sym) { this.sym = sym; }
+
+ /**
+ * Removes this directed edge from its containing graph.
+ */
+ void remove() {
+ this.sym = null;
+ this.parentEdge = null;
+ }
+
+ /**
+ * Tests whether this directed edge has been removed from its containing graph
+ *
+ * @return <code>true</code> if this directed edge is removed
+ */
+ public boolean isRemoved()
+ {
+ return parentEdge == null;
+ }
+
+ /**
+ * Returns 1 if this DirectedEdge has a greater angle with the
+ * positive x-axis than b", 0 if the DirectedEdges are collinear, and -1 otherwise.
+ * <p>
+ * Using the obvious algorithm of simply computing the angle is not robust,
+ * since the angle calculation is susceptible to roundoff. A robust algorithm
+ * is:
+ * <ul>
+ * <li>first compare the quadrants. If the quadrants are different, it it
+ * trivial to determine which vector is "greater".
+ * <li>if the vectors lie in the same quadrant, the robust
+ * {@link Orientation#computeOrientation(Coordinate, Coordinate, Coordinate)}
+ * function can be used to decide the relative orientation of the vectors.
+ * </ul>
+ */
+ public int compareTo(Object obj)
+ {
+ DirectedEdge de = (DirectedEdge) obj;
+ return compareDirection(de);
+ }
+
+ /**
+ * Returns 1 if this DirectedEdge has a greater angle with the
+ * positive x-axis than b", 0 if the DirectedEdges are collinear, and -1 otherwise.
+ * <p>
+ * Using the obvious algorithm of simply computing the angle is not robust,
+ * since the angle calculation is susceptible to roundoff. A robust algorithm
+ * is:
+ * <ul>
+ * <li>first compare the quadrants. If the quadrants are different, it it
+ * trivial to determine which vector is "greater".
+ * <li>if the vectors lie in the same quadrant, the robust
+ * {@link Orientation#computeOrientation(Coordinate, Coordinate, Coordinate)}
+ * function can be used to decide the relative orientation of the vectors.
+ * </ul>
+ */
+ public int compareDirection(DirectedEdge e)
+ {
+ // if the rays are in different quadrants, determining the ordering is trivial
+ if (quadrant > e.quadrant) return 1;
+ if (quadrant < e.quadrant) return -1;
+ // vectors are in the same quadrant - check relative orientation of direction vectors
+ // this is > e if it is CCW of e
+ return Orientation.index(e.p0, e.p1, p1);
+ }
+
+ /**
+ * Prints a detailed string representation of this DirectedEdge to the given PrintStream.
+ */
+ public void print(PrintStream out)
+ {
+ String className = getClass().getName();
+ int lastDotPos = className.lastIndexOf('.');
+ String name = className.substring(lastDotPos + 1);
+ out.print(" " + name + ": " + p0 + " - " + p1 + " " + quadrant + ":" + angle);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/DirectedEdgeStar.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/DirectedEdgeStar.java
new file mode 100644
index 0000000..bb90fb8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/DirectedEdgeStar.java
@@ -0,0 +1,163 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+
+package org.locationtech.jts.planargraph;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * A sorted collection of {@link DirectedEdge}s which leave a {@link Node}
+ * in a {@link PlanarGraph}.
+ *
+ * @version 1.7
+ */
+public class DirectedEdgeStar
+{
+
+ /**
+ * The underlying list of outgoing DirectedEdges
+ */
+ protected List outEdges = new ArrayList();
+ private boolean sorted = false;
+
+ /**
+ * Constructs a DirectedEdgeStar with no edges.
+ */
+ public DirectedEdgeStar() {
+ }
+ /**
+ * Adds a new member to this DirectedEdgeStar.
+ */
+ public void add(DirectedEdge de)
+ {
+ outEdges.add(de);
+ sorted = false;
+ }
+ /**
+ * Drops a member of this DirectedEdgeStar.
+ */
+ public void remove(DirectedEdge de)
+ {
+ outEdges.remove(de);
+ }
+ /**
+ * Returns an Iterator over the DirectedEdges, in ascending order by angle with the positive x-axis.
+ */
+ public Iterator iterator()
+ {
+ sortEdges();
+ return outEdges.iterator();
+ }
+
+ /**
+ * Returns the number of edges around the Node associated with this DirectedEdgeStar.
+ */
+ public int getDegree() { return outEdges.size(); }
+
+ /**
+ * Returns the coordinate for the node at which this star is based
+ */
+ public Coordinate getCoordinate()
+ {
+ Iterator it = iterator();
+ if (! it.hasNext()) return null;
+ DirectedEdge e = (DirectedEdge) it.next();
+ return e.getCoordinate();
+ }
+
+ /**
+ * Returns the DirectedEdges, in ascending order by angle with the positive x-axis.
+ */
+ public List getEdges()
+ {
+ sortEdges();
+ return outEdges;
+ }
+
+ private void sortEdges()
+ {
+ if (! sorted) {
+ Collections.sort(outEdges);
+ sorted = true;
+ }
+ }
+ /**
+ * Returns the zero-based index of the given Edge, after sorting in ascending order
+ * by angle with the positive x-axis.
+ */
+ public int getIndex(Edge edge)
+ {
+ sortEdges();
+ for (int i = 0; i < outEdges.size(); i++) {
+ DirectedEdge de = (DirectedEdge) outEdges.get(i);
+ if (de.getEdge() == edge)
+ return i;
+ }
+ return -1;
+ }
+ /**
+ * Returns the zero-based index of the given DirectedEdge, after sorting in ascending order
+ * by angle with the positive x-axis.
+ */
+ public int getIndex(DirectedEdge dirEdge)
+ {
+ sortEdges();
+ for (int i = 0; i < outEdges.size(); i++) {
+ DirectedEdge de = (DirectedEdge) outEdges.get(i);
+ if (de == dirEdge)
+ return i;
+ }
+ return -1;
+ }
+ /**
+ * Returns value of i modulo the number of edges in this DirectedEdgeStar
+ * (i.e. the remainder when i is divided by the number of edges)
+ *
+ * @param i an integer (positive, negative or zero)
+ */
+ public int getIndex(int i)
+ {
+ int modi = i % outEdges.size();
+ //I don't think modi can be 0 (assuming i is positive) [Jon Aquino 10/28/2003]
+ if (modi < 0) modi += outEdges.size();
+ return modi;
+ }
+
+ /**
+ * Returns the {@link DirectedEdge} on the left-hand (CCW)
+ * side of the given {@link DirectedEdge}
+ * (which must be a member of this DirectedEdgeStar).
+ */
+ public DirectedEdge getNextEdge(DirectedEdge dirEdge)
+ {
+ int i = getIndex(dirEdge);
+ return (DirectedEdge) outEdges.get(getIndex(i + 1));
+ }
+
+ /**
+ * Returns the {@link DirectedEdge} on the right-hand (CW)
+ * side of the given {@link DirectedEdge}
+ * (which must be a member of this DirectedEdgeStar).
+ */
+ public DirectedEdge getNextCWEdge(DirectedEdge dirEdge)
+ {
+ int i = getIndex(dirEdge);
+ return (DirectedEdge) outEdges.get(getIndex(i - 1));
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/Edge.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/Edge.java
new file mode 100644
index 0000000..fcacb4c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/Edge.java
@@ -0,0 +1,120 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.planargraph;
+
+/**
+ * Represents an undirected edge of a {@link PlanarGraph}. An undirected edge
+ * in fact simply acts as a central point of reference for two opposite
+ * {@link DirectedEdge}s.
+ * <p>
+ * Usually a client using a <code>PlanarGraph</code> will subclass <code>Edge</code>
+ * to add its own application-specific data and methods.
+ *
+ * @version 1.7
+ */
+public class Edge
+ extends GraphComponent
+{
+
+ /**
+ * The two DirectedEdges associated with this Edge.
+ * Index 0 is forward, 1 is reverse.
+ */
+ protected DirectedEdge[] dirEdge;
+
+ /**
+ * Constructs an Edge whose DirectedEdges are not yet set. Be sure to call
+ * {@link #setDirectedEdges(DirectedEdge, DirectedEdge)}
+ */
+ public Edge()
+ {
+ }
+
+ /**
+ * Constructs an Edge initialized with the given DirectedEdges, and for each
+ * DirectedEdge: sets the Edge, sets the symmetric DirectedEdge, and adds
+ * this Edge to its from-Node.
+ */
+ public Edge(DirectedEdge de0, DirectedEdge de1)
+ {
+ setDirectedEdges(de0, de1);
+ }
+
+ /**
+ * Initializes this Edge's two DirectedEdges, and for each DirectedEdge: sets the
+ * Edge, sets the symmetric DirectedEdge, and adds this Edge to its from-Node.
+ */
+ public void setDirectedEdges(DirectedEdge de0, DirectedEdge de1)
+ {
+ dirEdge = new DirectedEdge[] { de0, de1 };
+ de0.setEdge(this);
+ de1.setEdge(this);
+ de0.setSym(de1);
+ de1.setSym(de0);
+ de0.getFromNode().addOutEdge(de0);
+ de1.getFromNode().addOutEdge(de1);
+ }
+
+ /**
+ * Returns one of the DirectedEdges associated with this Edge.
+ * @param i 0 or 1. 0 returns the forward directed edge, 1 returns the reverse
+ */
+ public DirectedEdge getDirEdge(int i)
+ {
+ return dirEdge[i];
+ }
+
+ /**
+ * Returns the {@link DirectedEdge} that starts from the given node, or null if the
+ * node is not one of the two nodes associated with this Edge.
+ */
+ public DirectedEdge getDirEdge(Node fromNode)
+ {
+ if (dirEdge[0].getFromNode() == fromNode) return dirEdge[0];
+ if (dirEdge[1].getFromNode() == fromNode) return dirEdge[1];
+ // node not found
+ // possibly should throw an exception here?
+ return null;
+ }
+
+ /**
+ * If <code>node</code> is one of the two nodes associated with this Edge,
+ * returns the other node; otherwise returns null.
+ */
+ public Node getOppositeNode(Node node)
+ {
+ if (dirEdge[0].getFromNode() == node) return dirEdge[0].getToNode();
+ if (dirEdge[1].getFromNode() == node) return dirEdge[1].getToNode();
+ // node not found
+ // possibly should throw an exception here?
+ return null;
+ }
+
+ /**
+ * Removes this edge from its containing graph.
+ */
+ void remove() {
+ this.dirEdge = null;
+ }
+
+ /**
+ * Tests whether this edge has been removed from its containing graph
+ *
+ * @return <code>true</code> if this edge is removed
+ */
+ public boolean isRemoved()
+ {
+ return dirEdge == null;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/GraphComponent.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/GraphComponent.java
new file mode 100644
index 0000000..e045b4c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/GraphComponent.java
@@ -0,0 +1,151 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.planargraph;
+
+import java.util.Iterator;
+
+/**
+ * The base class for all graph component classes.
+ * Maintains flags of use in generic graph algorithms.
+ * Provides two flags:
+ * <ul>
+ * <li><b>marked</b> - typically this is used to indicate a state that persists
+ * for the course of the graph's lifetime. For instance, it can be
+ * used to indicate that a component has been logically deleted from the graph.
+ * <li><b>visited</b> - this is used to indicate that a component has been processed
+ * or visited by an single graph algorithm. For instance, a breadth-first traversal of the
+ * graph might use this to indicate that a node has already been traversed.
+ * The visited flag may be set and cleared many times during the lifetime of a graph.
+ * </ul>
+ *
+ * <p>
+ * Graph components support storing user context data. This will typically be
+ * used by client algorithms which use planar graphs.
+ *
+ * @version 1.7
+ */
+public abstract class GraphComponent
+{
+ /**
+ * Sets the Visited state for all {@link GraphComponent}s in an {@link Iterator}
+ *
+ * @param i the Iterator to scan
+ * @param visited the state to set the visited flag to
+ */
+ public static void setVisited(Iterator i, boolean visited)
+ {
+ while (i.hasNext()) {
+ GraphComponent comp = (GraphComponent) i.next();
+ comp.setVisited(visited);
+ }
+ }
+
+ /**
+ * Sets the Marked state for all {@link GraphComponent}s in an {@link Iterator}
+ *
+ * @param i the Iterator to scan
+ * @param marked the state to set the Marked flag to
+ */
+ public static void setMarked(Iterator i, boolean marked)
+ {
+ while (i.hasNext()) {
+ GraphComponent comp = (GraphComponent) i.next();
+ comp.setMarked(marked);
+ }
+ }
+
+ /**
+ * Finds the first {@link GraphComponent} in a {@link Iterator} set
+ * which has the specified visited state.
+ *
+ * @param i an Iterator of GraphComponents
+ * @param visitedState the visited state to test
+ * @return the first component found, or <code>null</code> if none found
+ */
+ public static GraphComponent getComponentWithVisitedState(Iterator i, boolean visitedState)
+ {
+ while (i.hasNext()) {
+ GraphComponent comp = (GraphComponent) i.next();
+ if (comp.isVisited() == visitedState)
+ return comp;
+ }
+ return null;
+ }
+
+ protected boolean isMarked = false;
+ protected boolean isVisited = false;
+ private Object data;
+
+ public GraphComponent() {
+ }
+
+ /**
+ * Tests if a component has been visited during the course of a graph algorithm
+ * @return <code>true</code> if the component has been visited
+ */
+ public boolean isVisited() { return isVisited; }
+
+ /**
+ * Sets the visited flag for this component.
+ * @param isVisited the desired value of the visited flag
+ */
+ public void setVisited(boolean isVisited) { this.isVisited = isVisited; }
+
+ /**
+ * Tests if a component has been marked at some point during the processing
+ * involving this graph.
+ * @return <code>true</code> if the component has been marked
+ */
+ public boolean isMarked() { return isMarked; }
+
+ /**
+ * Sets the marked flag for this component.
+ * @param isMarked the desired value of the marked flag
+ */
+ public void setMarked(boolean isMarked) { this.isMarked = isMarked; }
+
+ /**
+ * Sets the user-defined data for this component.
+ *
+ * @param data an Object containing user-defined data
+ */
+ public void setContext(Object data) { this.data = data; }
+
+ /**
+ * Gets the user-defined data for this component.
+ *
+ * @return the user-defined data
+ */
+ public Object getContext() { return data; }
+
+ /**
+ * Sets the user-defined data for this component.
+ *
+ * @param data an Object containing user-defined data
+ */
+ public void setData(Object data) { this.data = data; }
+
+ /**
+ * Gets the user-defined data for this component.
+ *
+ * @return the user-defined data
+ */
+ public Object getData() { return data; }
+
+ /**
+ * Tests whether this component has been removed from its containing graph
+ *
+ * @return <code>true</code> if this component is removed
+ */
+ public abstract boolean isRemoved();
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/Node.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/Node.java
new file mode 100644
index 0000000..378d7d6
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/Node.java
@@ -0,0 +1,128 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+
+package org.locationtech.jts.planargraph;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * A node in a {@link PlanarGraph}is a location where 0 or more {@link Edge}s
+ * meet. A node is connected to each of its incident Edges via an outgoing
+ * DirectedEdge. Some clients using a <code>PlanarGraph</code> may want to
+ * subclass <code>Node</code> to add their own application-specific
+ * data and methods.
+ *
+ * @version 1.7
+ */
+public class Node
+ extends GraphComponent
+{
+ /**
+ * Returns all Edges that connect the two nodes (which are assumed to be different).
+ */
+ public static Collection getEdgesBetween(Node node0, Node node1)
+ {
+ List edges0 = DirectedEdge.toEdges(node0.getOutEdges().getEdges());
+ Set commonEdges = new HashSet(edges0);
+ List edges1 = DirectedEdge.toEdges(node1.getOutEdges().getEdges());
+ commonEdges.retainAll(edges1);
+ return commonEdges;
+ }
+
+ /** The location of this Node */
+ protected Coordinate pt;
+
+ /** The collection of DirectedEdges that leave this Node */
+ protected DirectedEdgeStar deStar;
+
+ /**
+ * Constructs a Node with the given location.
+ */
+ public Node(Coordinate pt)
+ {
+ this(pt, new DirectedEdgeStar());
+ }
+
+ /**
+ * Constructs a Node with the given location and collection of outgoing DirectedEdges.
+ */
+ public Node(Coordinate pt, DirectedEdgeStar deStar)
+ {
+ this.pt = pt;
+ this.deStar = deStar;
+ }
+
+ /**
+ * Returns the location of this Node.
+ */
+ public Coordinate getCoordinate() { return pt; }
+
+ /**
+ * Adds an outgoing DirectedEdge to this Node.
+ */
+ public void addOutEdge(DirectedEdge de)
+ {
+ deStar.add(de);
+ }
+
+ /**
+ * Returns the collection of DirectedEdges that leave this Node.
+ */
+ public DirectedEdgeStar getOutEdges() { return deStar; }
+ /**
+ * Returns the number of edges around this Node.
+ */
+ public int getDegree() { return deStar.getDegree(); }
+ /**
+ * Returns the zero-based index of the given Edge, after sorting in ascending order
+ * by angle with the positive x-axis.
+ */
+ public int getIndex(Edge edge)
+ {
+ return deStar.getIndex(edge);
+ }
+
+ /**
+ * Removes a {@link DirectedEdge} incident on this node.
+ * Does not change the state of the directed edge.
+ */
+ public void remove(DirectedEdge de)
+ {
+ deStar.remove(de);
+ }
+
+ /**
+ * Removes this node from its containing graph.
+ */
+ void remove() {
+ pt = null;
+ }
+
+
+ /**
+ * Tests whether this node has been removed from its containing graph
+ *
+ * @return <code>true</code> if this node is removed
+ */
+ public boolean isRemoved()
+ {
+ return pt == null;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/NodeMap.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/NodeMap.java
new file mode 100644
index 0000000..aa37778
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/NodeMap.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.planargraph;
+
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.Coordinate;
+
+
+/**
+ * A map of {@link Node}s, indexed by the coordinate of the node.
+ *
+ * @version 1.7
+ */
+public class NodeMap
+
+{
+
+ private Map nodeMap = new TreeMap();
+
+ /**
+ * Constructs a NodeMap without any Nodes.
+ */
+ public NodeMap() {
+ }
+
+ /**
+ * Adds a node to the map, replacing any that is already at that location.
+ * @return the added node
+ */
+ public Node add(Node n)
+ {
+ nodeMap.put(n.getCoordinate(), n);
+ return n;
+ }
+
+ /**
+ * Removes the Node at the given location, and returns it (or null if no Node was there).
+ */
+ public Node remove(Coordinate pt)
+ {
+ return (Node) nodeMap.remove(pt);
+ }
+
+ /**
+ * Returns the Node at the given location, or null if no Node was there.
+ */
+ public Node find(Coordinate coord) { return (Node) nodeMap.get(coord); }
+
+ /**
+ * Returns an Iterator over the Nodes in this NodeMap, sorted in ascending order
+ * by angle with the positive x-axis.
+ */
+ public Iterator iterator()
+ {
+ return nodeMap.values().iterator();
+ }
+ /**
+ * Returns the Nodes in this NodeMap, sorted in ascending order
+ * by angle with the positive x-axis.
+ */
+ public Collection values()
+ {
+ return nodeMap.values();
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/PlanarGraph.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/PlanarGraph.java
new file mode 100644
index 0000000..02476b0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/PlanarGraph.java
@@ -0,0 +1,220 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.planargraph;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Represents a directed graph which is embeddable in a planar surface.
+ * <p>
+ * This class and the other classes in this package serve as a framework for
+ * building planar graphs for specific algorithms. This class must be
+ * subclassed to expose appropriate methods to construct the graph. This allows
+ * controlling the types of graph components ({@link DirectedEdge}s,
+ * {@link Edge}s and {@link Node}s) which can be added to the graph. An
+ * application which uses the graph framework will almost always provide
+ * subclasses for one or more graph components, which hold application-specific
+ * data and graph algorithms.
+ *
+ * @version 1.7
+ */
+public abstract class PlanarGraph
+{
+ protected Set edges = new HashSet();
+ protected Set dirEdges = new HashSet();
+ protected NodeMap nodeMap = new NodeMap();
+
+ /**
+ * Constructs a empty graph.
+ */
+ public PlanarGraph()
+ {
+ }
+
+ /**
+ * Returns the {@link Node} at the given location,
+ * or null if no {@link Node} was there.
+ *
+ * @param pt the location to query
+ * @return the node found
+ * or <code>null</code> if this graph contains no node at the location
+ */
+ public Node findNode(Coordinate pt)
+ {
+ return (Node) nodeMap.find(pt);
+ }
+
+ /**
+ * Adds a node to the map, replacing any that is already at that location.
+ * Only subclasses can add Nodes, to ensure Nodes are of the right type.
+ *
+ * @param node the node to add
+ */
+ protected void add(Node node)
+ {
+ nodeMap.add(node);
+ }
+
+ /**
+ * Adds the Edge and its DirectedEdges with this PlanarGraph.
+ * Assumes that the Edge has already been created with its associated DirectEdges.
+ * Only subclasses can add Edges, to ensure the edges added are of the right class.
+ */
+ protected void add(Edge edge)
+ {
+ edges.add(edge);
+ add(edge.getDirEdge(0));
+ add(edge.getDirEdge(1));
+ }
+
+ /**
+ * Adds the Edge to this PlanarGraph; only subclasses can add DirectedEdges,
+ * to ensure the edges added are of the right class.
+ */
+ protected void add(DirectedEdge dirEdge)
+ {
+ dirEdges.add(dirEdge);
+ }
+ /**
+ * Returns an Iterator over the Nodes in this PlanarGraph.
+ */
+ public Iterator nodeIterator() { return nodeMap.iterator(); }
+ /**
+ * Returns the Nodes in this PlanarGraph.
+ */
+
+ /**
+ * Tests whether this graph contains the given {@link Edge}
+ *
+ * @param e the edge to query
+ * @return <code>true</code> if the graph contains the edge
+ */
+ public boolean contains(Edge e)
+ {
+ return edges.contains(e);
+ }
+
+ /**
+ * Tests whether this graph contains the given {@link DirectedEdge}
+ *
+ * @param de the directed edge to query
+ * @return <code>true</code> if the graph contains the directed edge
+ */
+ public boolean contains(DirectedEdge de)
+ {
+ return dirEdges.contains(de);
+ }
+
+ public Collection getNodes() { return nodeMap.values(); }
+
+ /**
+ * Returns an Iterator over the DirectedEdges in this PlanarGraph, in the order in which they
+ * were added.
+ *
+ * @see #add(Edge)
+ * @see #add(DirectedEdge)
+ */
+ public Iterator dirEdgeIterator() { return dirEdges.iterator(); }
+ /**
+ * Returns an Iterator over the Edges in this PlanarGraph, in the order in which they
+ * were added.
+ *
+ * @see #add(Edge)
+ */
+ public Iterator edgeIterator() { return edges.iterator(); }
+
+ /**
+ * Returns the Edges that have been added to this PlanarGraph
+ * @see #add(Edge)
+ */
+ public Collection getEdges() { return edges; }
+
+ /**
+ * Removes an {@link Edge} and its associated {@link DirectedEdge}s
+ * from their from-Nodes and from the graph.
+ * Note: This method does not remove the {@link Node}s associated
+ * with the {@link Edge}, even if the removal of the {@link Edge}
+ * reduces the degree of a {@link Node} to zero.
+ */
+ public void remove(Edge edge)
+ {
+ remove(edge.getDirEdge(0));
+ remove(edge.getDirEdge(1));
+ edges.remove(edge);
+ edge.remove();
+ }
+
+ /**
+ * Removes a {@link DirectedEdge} from its from-{@link Node} and from this graph.
+ * This method does not remove the {@link Node}s associated with the DirectedEdge,
+ * even if the removal of the DirectedEdge reduces the degree of a Node to zero.
+ */
+ public void remove(DirectedEdge de)
+ {
+ DirectedEdge sym = de.getSym();
+ if (sym != null) sym.setSym(null);
+
+ de.getFromNode().remove(de);
+ de.remove();
+ dirEdges.remove(de);
+ }
+
+ /**
+ * Removes a node from the graph, along with any associated DirectedEdges and
+ * Edges.
+ */
+ public void remove(Node node)
+ {
+ // unhook all directed edges
+ List outEdges = node.getOutEdges().getEdges();
+ for (Iterator i = outEdges.iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ DirectedEdge sym = de.getSym();
+ // remove the diredge that points to this node
+ if (sym != null) remove(sym);
+ // remove this diredge from the graph collection
+ dirEdges.remove(de);
+
+ Edge edge = de.getEdge();
+ if (edge != null) {
+ edges.remove(edge);
+ }
+
+ }
+ // remove the node from the graph
+ nodeMap.remove(node.getCoordinate());
+ node.remove();
+ }
+
+ /**
+ * Returns all Nodes with the given number of Edges around it.
+ */
+ public List findNodesOfDegree(int degree)
+ {
+ List nodesFound = new ArrayList();
+ for (Iterator i = nodeIterator(); i.hasNext(); ) {
+ Node node = (Node) i.next();
+ if (node.getDegree() == degree)
+ nodesFound.add(node);
+ }
+ return nodesFound;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/Subgraph.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/Subgraph.java
new file mode 100644
index 0000000..8e422c0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/Subgraph.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.planargraph;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A subgraph of a {@link PlanarGraph}.
+ * A subgraph may contain any subset of {@link Edge}s
+ * from the parent graph.
+ * It will also automatically contain all {@link DirectedEdge}s
+ * and {@link Node}s associated with those edges.
+ * No new objects are created when edges are added -
+ * all associated components must already exist in the parent graph.
+ */
+public class Subgraph
+{
+ protected PlanarGraph parentGraph;
+ protected Set edges = new HashSet();
+ protected List dirEdges = new ArrayList();
+ protected NodeMap nodeMap = new NodeMap();
+
+ /**
+ * Creates a new subgraph of the given {@link PlanarGraph}
+ *
+ * @param parentGraph the parent graph
+ */
+ public Subgraph(PlanarGraph parentGraph) {
+ this.parentGraph = parentGraph;
+ }
+
+ /**
+ * Gets the {@link PlanarGraph} which this subgraph
+ * is part of.
+ *
+ * @return the parent PlanarGraph
+ */
+ public PlanarGraph getParent()
+ {
+ return parentGraph;
+ }
+ /**
+ * Adds an {@link Edge} to the subgraph.
+ * The associated {@link DirectedEdge}s and {@link Node}s
+ * are also added.
+ *
+ * @param e the edge to add
+ */
+ public void add(Edge e)
+ {
+ if (edges.contains(e)) return;
+
+ edges.add(e);
+ dirEdges.add(e.getDirEdge(0));
+ dirEdges.add(e.getDirEdge(1));
+ nodeMap.add(e.getDirEdge(0).getFromNode());
+ nodeMap.add(e.getDirEdge(1).getFromNode());
+ }
+
+ /**
+ * Returns an {@link Iterator} over the {@link DirectedEdge}s in this graph,
+ * in the order in which they were added.
+ *
+ * @return an iterator over the directed edges
+ *
+ * @see #add(Edge)
+ */
+ public Iterator dirEdgeIterator() { return dirEdges.iterator(); }
+
+ /**
+ * Returns an {@link Iterator} over the {@link Edge}s in this graph,
+ * in the order in which they were added.
+ *
+ * @return an iterator over the edges
+ *
+ * @see #add(Edge)
+ */
+ public Iterator edgeIterator() { return edges.iterator(); }
+
+ /**
+ * Returns an {@link Iterator} over the {@link Node}s in this graph.
+ * @return an iterator over the nodes
+ */
+ public Iterator nodeIterator() { return nodeMap.iterator(); }
+
+ /**
+ * Tests whether an {@link Edge} is contained in this subgraph
+ * @param e the edge to test
+ * @return <code>true</code> if the edge is contained in this subgraph
+ */
+ public boolean contains(Edge e) { return edges.contains(e); }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/algorithm/ConnectedSubgraphFinder.java b/modules/core/src/main/java/org/locationtech/jts/planargraph/algorithm/ConnectedSubgraphFinder.java
new file mode 100644
index 0000000..dc2472c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/algorithm/ConnectedSubgraphFinder.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.planargraph.algorithm;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.planargraph.DirectedEdgeStar;
+import org.locationtech.jts.planargraph.Edge;
+import org.locationtech.jts.planargraph.GraphComponent;
+import org.locationtech.jts.planargraph.Node;
+import org.locationtech.jts.planargraph.PlanarGraph;
+import org.locationtech.jts.planargraph.Subgraph;
+
+/**
+ * Finds all connected {@link Subgraph}s of a {@link PlanarGraph}.
+ * <p>
+ * <b>Note:</b> uses the <code>isVisited</code> flag on the nodes.
+ */
+public class ConnectedSubgraphFinder
+{
+
+ private PlanarGraph graph;
+
+ public ConnectedSubgraphFinder(PlanarGraph graph) {
+ this.graph = graph;
+ }
+
+ public List getConnectedSubgraphs()
+ {
+ List subgraphs = new ArrayList();
+
+ GraphComponent.setVisited(graph.nodeIterator(), false);
+ for (Iterator i = graph.edgeIterator(); i.hasNext(); ) {
+ Edge e = (Edge) i.next();
+ Node node = e.getDirEdge(0).getFromNode();
+ if (! node.isVisited()) {
+ subgraphs.add(findSubgraph(node));
+ }
+ }
+ return subgraphs;
+ }
+
+ private Subgraph findSubgraph(Node node)
+ {
+ Subgraph subgraph = new Subgraph(graph);
+ addReachable(node, subgraph);
+ return subgraph;
+ }
+
+ /**
+ * Adds all nodes and edges reachable from this node to the subgraph.
+ * Uses an explicit stack to avoid a large depth of recursion.
+ *
+ * @param node a node known to be in the subgraph
+ */
+ private void addReachable(Node startNode, Subgraph subgraph)
+ {
+ Stack nodeStack = new Stack();
+ nodeStack.add(startNode);
+ while (! nodeStack.empty()) {
+ Node node = (Node) nodeStack.pop();
+ addEdges(node, nodeStack, subgraph);
+ }
+ }
+
+ /**
+ * Adds the argument node and all its out edges to the subgraph.
+ * @param node the node to add
+ * @param nodeStack the current set of nodes being traversed
+ */
+ private void addEdges(Node node, Stack nodeStack, Subgraph subgraph)
+ {
+ node.setVisited(true);
+ for (Iterator i = ((DirectedEdgeStar) node.getOutEdges()).iterator(); i.hasNext(); ) {
+ DirectedEdge de = (DirectedEdge) i.next();
+ subgraph.add(de.getEdge());
+ Node toNode = de.getToNode();
+ if (! toNode.isVisited()) nodeStack.push(toNode);
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/algorithm/package.html b/modules/core/src/main/java/org/locationtech/jts/planargraph/algorithm/package.html
new file mode 100644
index 0000000..7cdfd8a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/algorithm/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes which implement graph algorithms on planar graphs.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/planargraph/package.html b/modules/core/src/main/java/org/locationtech/jts/planargraph/package.html
new file mode 100644
index 0000000..e59938b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/planargraph/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Contains classes to implement a planar graph data structure.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/CommonBits.java b/modules/core/src/main/java/org/locationtech/jts/precision/CommonBits.java
new file mode 100644
index 0000000..12ad85e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/CommonBits.java
@@ -0,0 +1,139 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+/**
+ * Determines the maximum number of common most-significant
+ * bits in the mantissa of one or numbers.
+ * Can be used to compute the double-precision number which
+ * is represented by the common bits.
+ * If there are no common bits, the number computed is 0.0.
+ *
+ * @version 1.7
+ */
+public class CommonBits {
+
+ /**
+ * Computes the bit pattern for the sign and exponent of a
+ * double-precision number.
+ *
+ * @param num
+ * @return the bit pattern for the sign and exponent
+ */
+ public static long signExpBits(long num)
+ {
+ return num >> 52;
+ }
+
+ /**
+ * This computes the number of common most-significant bits in the mantissas
+ * of two double-precision numbers.
+ * It does not count the hidden bit, which is always 1.
+ * It does not determine whether the numbers have the same exponent - if they do
+ * not, the value computed by this function is meaningless.
+ *
+ * @param num1 the first number
+ * @param num2 the second number
+ * @return the number of common most-significant mantissa bits
+ */
+ public static int numCommonMostSigMantissaBits(long num1, long num2)
+ {
+ int count = 0;
+ for (int i = 52; i >= 0; i--)
+ {
+ if (getBit(num1, i) != getBit(num2, i))
+ return count;
+ count++;
+ }
+ return 52;
+ }
+
+ /**
+ * Zeroes the lower n bits of a bitstring.
+ *
+ * @param bits the bitstring to alter
+ * @return the zeroed bitstring
+ */
+ public static long zeroLowerBits(long bits, int nBits)
+ {
+ long invMask = (1L << nBits) - 1L;
+ long mask = ~ invMask;
+ long zeroed = bits & mask;
+ return zeroed;
+ }
+
+ /**
+ * Extracts the i'th bit of a bitstring.
+ *
+ * @param bits the bitstring to extract from
+ * @param i the bit to extract
+ * @return the value of the extracted bit
+ */
+ public static int getBit(long bits, int i)
+ {
+ long mask = (1L << i);
+ return (bits & mask) != 0 ? 1 : 0;
+ }
+
+ private boolean isFirst = true;
+ private int commonMantissaBitsCount = 53;
+ private long commonBits = 0;
+ private long commonSignExp;
+
+ public CommonBits() {
+ }
+
+ public void add(double num)
+ {
+ long numBits = Double.doubleToLongBits(num);
+ if (isFirst) {
+ commonBits = numBits;
+ commonSignExp = signExpBits(commonBits);
+ isFirst = false;
+ return;
+ }
+
+ long numSignExp = signExpBits(numBits);
+ if (numSignExp != commonSignExp) {
+ commonBits = 0;
+ return;
+ }
+
+// System.out.println(toString(commonBits));
+// System.out.println(toString(numBits));
+ commonMantissaBitsCount = numCommonMostSigMantissaBits(commonBits, numBits);
+ commonBits = zeroLowerBits(commonBits, 64 - (12 + commonMantissaBitsCount));
+// System.out.println(toString(commonBits));
+ }
+
+ public double getCommon()
+ {
+ return Double.longBitsToDouble(commonBits);
+ }
+ /**
+ * A representation of the Double bits formatted for easy readability
+ */
+ public String toString(long bits)
+ {
+ double x = Double.longBitsToDouble(bits);
+ String numStr = Long.toBinaryString(bits);
+ String padStr = "0000000000000000000000000000000000000000000000000000000000000000" + numStr;
+ String bitStr = padStr.substring(padStr.length() - 64);
+ String str = bitStr.substring(0, 1) + " "
+ + bitStr.substring(1, 12) + "(exp) "
+ + bitStr.substring(12)
+ + " [ " + x + " ]";
+ return str;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/CommonBitsOp.java b/modules/core/src/main/java/org/locationtech/jts/precision/CommonBitsOp.java
new file mode 100644
index 0000000..30bc000
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/CommonBitsOp.java
@@ -0,0 +1,163 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Provides versions of Geometry spatial functions which use
+ * common bit removal to reduce the likelihood of robustness problems.
+ * <p>
+ * In the current implementation no rounding is performed on the
+ * reshifted result geometry, which means that it is possible
+ * that the returned Geometry is invalid.
+ * Client classes should check the validity of the returned result themselves.
+ *
+ * @version 1.7
+ */
+public class CommonBitsOp {
+
+ private boolean returnToOriginalPrecision = true;
+ private CommonBitsRemover cbr;
+
+ /**
+ * Creates a new instance of class, which reshifts result {@link Geometry}s.
+ */
+ public CommonBitsOp()
+ {
+ this(true);
+ }
+
+ /**
+ * Creates a new instance of class, specifying whether
+ * the result {@link Geometry}s should be reshifted.
+ *
+ * @param returnToOriginalPrecision
+ */
+ public CommonBitsOp(boolean returnToOriginalPrecision)
+ {
+ this.returnToOriginalPrecision = returnToOriginalPrecision;
+ }
+
+ /**
+ * Computes the set-theoretic intersection of two {@link Geometry}s, using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry
+ * @return the Geometry representing the set-theoretic intersection of the input Geometries.
+ */
+ public Geometry intersection(Geometry geom0, Geometry geom1)
+ {
+ Geometry[] geom = removeCommonBits(geom0, geom1);
+ return computeResultPrecision(geom[0].intersection(geom[1]));
+ }
+
+ /**
+ * Computes the set-theoretic union of two {@link Geometry}s, using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry
+ * @return the Geometry representing the set-theoretic union of the input Geometries.
+ */
+ public Geometry union(Geometry geom0, Geometry geom1)
+ {
+ Geometry[] geom = removeCommonBits(geom0, geom1);
+ return computeResultPrecision(geom[0].union(geom[1]));
+ }
+
+ /**
+ * Computes the set-theoretic difference of two {@link Geometry}s, using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry, to be subtracted from the first
+ * @return the Geometry representing the set-theoretic difference of the input Geometries.
+ */
+ public Geometry difference(Geometry geom0, Geometry geom1)
+ {
+ Geometry[] geom = removeCommonBits(geom0, geom1);
+ return computeResultPrecision(geom[0].difference(geom[1]));
+ }
+
+ /**
+ * Computes the set-theoretic symmetric difference of two geometries,
+ * using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry
+ * @return the Geometry representing the set-theoretic symmetric difference of the input Geometries.
+ */
+ public Geometry symDifference(Geometry geom0, Geometry geom1)
+ {
+ Geometry[] geom = removeCommonBits(geom0, geom1);
+ return computeResultPrecision(geom[0].symDifference(geom[1]));
+ }
+
+ /**
+ * Computes the buffer a geometry,
+ * using enhanced precision.
+ * @param geom0 the Geometry to buffer
+ * @param distance the buffer distance
+ * @return the Geometry representing the buffer of the input Geometry.
+ */
+ public Geometry buffer(Geometry geom0, double distance)
+ {
+ Geometry geom = removeCommonBits(geom0);
+ return computeResultPrecision(geom.buffer(distance));
+ }
+
+ /**
+ * If required, returning the result to the original precision if required.
+ * <p>
+ * In this current implementation, no rounding is performed on the
+ * reshifted result geometry, which means that it is possible
+ * that the returned Geometry is invalid.
+ *
+ * @param result the result Geometry to modify
+ * @return the result Geometry with the required precision
+ */
+ private Geometry computeResultPrecision(Geometry result)
+ {
+ if (returnToOriginalPrecision)
+ cbr.addCommonBits(result);
+ return result;
+ }
+
+ /**
+ * Computes a copy of the input {@link Geometry} with the calculated common bits
+ * removed from each coordinate.
+ * @param geom0 the Geometry to remove common bits from
+ * @return a copy of the input Geometry with common bits removed
+ */
+ private Geometry removeCommonBits(Geometry geom0)
+ {
+ cbr = new CommonBitsRemover();
+ cbr.add(geom0);
+ Geometry geom = cbr.removeCommonBits(geom0.copy());
+ return geom;
+ }
+
+ /**
+ * Computes a copy of each input {@link Geometry}s with the calculated common bits
+ * removed from each coordinate.
+ * @param geom0 a Geometry to remove common bits from
+ * @param geom1 a Geometry to remove common bits from
+ * @return an array containing copies
+ * of the input Geometry's with common bits removed
+ */
+ private Geometry[] removeCommonBits(Geometry geom0, Geometry geom1)
+ {
+ cbr = new CommonBitsRemover();
+ cbr.add(geom0);
+ cbr.add(geom1);
+ Geometry geom[] = new Geometry[2];
+ geom[0] = cbr.removeCommonBits(geom0.copy());
+ geom[1] = cbr.removeCommonBits(geom1.copy());
+ return geom;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/CommonBitsRemover.java b/modules/core/src/main/java/org/locationtech/jts/precision/CommonBitsRemover.java
new file mode 100644
index 0000000..b767c67
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/CommonBitsRemover.java
@@ -0,0 +1,158 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Removes common most-significant mantissa bits
+ * from one or more {@link Geometry}s.
+ * <p>
+ * The CommonBitsRemover "scavenges" precision
+ * which is "wasted" by a large displacement of the geometry
+ * from the origin.
+ * For example, if a small geometry is displaced from the origin
+ * by a large distance,
+ * the displacement increases the significant figures in the coordinates,
+ * but does not affect the <i>relative</i> topology of the geometry.
+ * Thus the geometry can be translated back to the origin
+ * without affecting its topology.
+ * In order to compute the translation without affecting
+ * the full precision of the coordinate values,
+ * the translation is performed at the bit level by
+ * removing the common leading mantissa bits.
+ * <p>
+ * If the geometry envelope already contains the origin,
+ * the translation procedure cannot be applied.
+ * In this case, the common bits value is computed as zero.
+ * <p>
+ * If the geometry crosses the Y axis but not the X axis
+ * (and <i>mutatis mutandum</i>),
+ * the common bits for Y are zero,
+ * but the common bits for X are non-zero.
+ *
+ * @version 1.7
+ */
+public class CommonBitsRemover
+{
+ private Coordinate commonCoord;
+ private CommonCoordinateFilter ccFilter = new CommonCoordinateFilter();
+
+ public CommonBitsRemover()
+ {
+ }
+
+ /**
+ * Add a geometry to the set of geometries whose common bits are
+ * being computed. After this method has executed the
+ * common coordinate reflects the common bits of all added
+ * geometries.
+ *
+ * @param geom a Geometry to test for common bits
+ */
+ public void add(Geometry geom)
+ {
+ geom.apply(ccFilter);
+ commonCoord = ccFilter.getCommonCoordinate();
+ }
+
+ /**
+ * The common bits of the Coordinates in the supplied Geometries.
+ */
+ public Coordinate getCommonCoordinate() { return commonCoord; }
+
+ /**
+ * Removes the common coordinate bits from a Geometry.
+ * The coordinates of the Geometry are changed.
+ *
+ * @param geom the Geometry from which to remove the common coordinate bits
+ * @return the shifted Geometry
+ */
+ public Geometry removeCommonBits(Geometry geom)
+ {
+ if (commonCoord.x == 0.0 && commonCoord.y == 0.0)
+ return geom;
+ Coordinate invCoord = new Coordinate(commonCoord);
+ invCoord.x = -invCoord.x;
+ invCoord.y = -invCoord.y;
+ Translater trans = new Translater(invCoord);
+ geom.apply(trans);
+ geom.geometryChanged();
+ return geom;
+ }
+
+ /**
+ * Adds the common coordinate bits back into a Geometry.
+ * The coordinates of the Geometry are changed.
+ *
+ * @param geom the Geometry to which to add the common coordinate bits
+ */
+ public void addCommonBits(Geometry geom)
+ {
+ Translater trans = new Translater(commonCoord);
+ geom.apply(trans);
+ geom.geometryChanged();
+ }
+
+ static class CommonCoordinateFilter
+ implements CoordinateFilter
+ {
+ private CommonBits commonBitsX = new CommonBits();
+ private CommonBits commonBitsY = new CommonBits();
+
+ public void filter(Coordinate coord)
+ {
+ commonBitsX.add(coord.x);
+ commonBitsY.add(coord.y);
+ }
+
+ public Coordinate getCommonCoordinate()
+ {
+ return new Coordinate(
+ commonBitsX.getCommon(),
+ commonBitsY.getCommon());
+ }
+ }
+
+ static class Translater
+ implements CoordinateSequenceFilter
+ {
+ Coordinate trans = null;
+
+ public Translater(Coordinate trans)
+ {
+ this.trans = trans;
+ }
+
+ public void filter(CoordinateSequence seq, int i) {
+ double xp = seq.getOrdinate(i, 0) + trans.x;
+ double yp = seq.getOrdinate(i, 1) + trans.y;
+ seq.setOrdinate(i, 0, xp);
+ seq.setOrdinate(i, 1, yp);
+ }
+
+ public boolean isDone() {
+ return false;
+ }
+
+ public boolean isGeometryChanged() {
+ return true;
+ }
+
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/CoordinatePrecisionReducerFilter.java b/modules/core/src/main/java/org/locationtech/jts/precision/CoordinatePrecisionReducerFilter.java
new file mode 100644
index 0000000..ae36789
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/CoordinatePrecisionReducerFilter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.PrecisionModel;
+
+/**
+ * Reduces the precision of the {@link Coordinate}s in a
+ * {@link CoordinateSequence} to match the supplied {@link PrecisionModel}.
+ * Uses {@link PrecisionModel#makePrecise(double)}.
+ * The input is modified in-place, so
+ * it should be cloned beforehand if the
+ * original should not be modified.
+ *
+ * @author mbdavis
+ *
+ */
+public class CoordinatePrecisionReducerFilter
+ implements CoordinateSequenceFilter
+{
+ private PrecisionModel precModel;
+
+ /**
+ * Creates a new precision reducer filter.
+ *
+ * @param precModel the PrecisionModel to use
+ */
+ public CoordinatePrecisionReducerFilter(PrecisionModel precModel)
+ {
+ this.precModel = precModel;
+ }
+
+ /**
+ * Rounds the Coordinates in the sequence to match the PrecisionModel
+ */
+ public void filter(CoordinateSequence seq, int i)
+ {
+ seq.setOrdinate(i, 0, precModel.makePrecise(seq.getOrdinate(i, 0)));
+ seq.setOrdinate(i, 1, precModel.makePrecise(seq.getOrdinate(i, 1)));
+ }
+
+ /**
+ * Always runs over all geometry components.
+ *
+ * @return false
+ */
+ public boolean isDone() { return false; }
+
+ /**
+ * Always reports that the geometry has changed
+ *
+ * @return true
+ */
+ public boolean isGeometryChanged() { return true; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/EnhancedPrecisionOp.java b/modules/core/src/main/java/org/locationtech/jts/precision/EnhancedPrecisionOp.java
new file mode 100644
index 0000000..b86b34e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/EnhancedPrecisionOp.java
@@ -0,0 +1,204 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Provides versions of Geometry spatial functions which use
+ * enhanced precision techniques to reduce the likelihood of robustness problems.
+ *
+ * @version 1.7
+ */
+public class EnhancedPrecisionOp
+{
+ /**
+ * Computes the set-theoretic intersection of two {@link Geometry}s, using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry
+ * @return the Geometry representing the set-theoretic intersection of the input Geometries.
+ */
+ public static Geometry intersection(Geometry geom0, Geometry geom1)
+ {
+ RuntimeException originalEx;
+ try {
+ Geometry result = geom0.intersection(geom1);
+ return result;
+ }
+ catch (RuntimeException ex)
+ {
+ originalEx = ex;
+ }
+ /*
+ * If we are here, the original op encountered a precision problem
+ * (or some other problem). Retry the operation with
+ * enhanced precision to see if it succeeds
+ */
+ try {
+ CommonBitsOp cbo = new CommonBitsOp(true);
+ Geometry resultEP = cbo.intersection(geom0, geom1);
+ // check that result is a valid geometry after the reshift to orginal precision
+ if (! resultEP.isValid())
+ throw originalEx;
+ return resultEP;
+ }
+ catch (RuntimeException ex2)
+ {
+ throw originalEx;
+ }
+ }
+ /**
+ * Computes the set-theoretic union of two {@link Geometry}s, using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry
+ * @return the Geometry representing the set-theoretic union of the input Geometries.
+ */
+ public static Geometry union(Geometry geom0, Geometry geom1)
+ {
+ RuntimeException originalEx;
+ try {
+ Geometry result = geom0.union(geom1);
+ return result;
+ }
+ catch (RuntimeException ex)
+ {
+ originalEx = ex;
+ }
+ /*
+ * If we are here, the original op encountered a precision problem
+ * (or some other problem). Retry the operation with
+ * enhanced precision to see if it succeeds
+ */
+ try {
+ CommonBitsOp cbo = new CommonBitsOp(true);
+ Geometry resultEP = cbo.union(geom0, geom1);
+ // check that result is a valid geometry after the reshift to orginal precision
+ if (! resultEP.isValid())
+ throw originalEx;
+ return resultEP;
+ }
+ catch (RuntimeException ex2)
+ {
+ throw originalEx;
+ }
+ }
+ /**
+ * Computes the set-theoretic difference of two {@link Geometry}s, using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry
+ * @return the Geometry representing the set-theoretic difference of the input Geometries.
+ */
+ public static Geometry difference(Geometry geom0, Geometry geom1)
+ {
+ RuntimeException originalEx;
+ try {
+ Geometry result = geom0.difference(geom1);
+ return result;
+ }
+ catch (RuntimeException ex)
+ {
+ originalEx = ex;
+ }
+ /*
+ * If we are here, the original op encountered a precision problem
+ * (or some other problem). Retry the operation with
+ * enhanced precision to see if it succeeds
+ */
+ try {
+ CommonBitsOp cbo = new CommonBitsOp(true);
+ Geometry resultEP = cbo.difference(geom0, geom1);
+ // check that result is a valid geometry after the reshift to orginal precision
+ if (! resultEP.isValid())
+ throw originalEx;
+ return resultEP;
+ }
+ catch (RuntimeException ex2)
+ {
+ throw originalEx;
+ }
+ }
+ /**
+ * Computes the set-theoretic symmetric difference of two {@link Geometry}s, using enhanced precision.
+ * @param geom0 the first Geometry
+ * @param geom1 the second Geometry
+ * @return the Geometry representing the set-theoretic symmetric difference of the input Geometries.
+ */
+ public static Geometry symDifference(Geometry geom0, Geometry geom1)
+ {
+ RuntimeException originalEx;
+ try {
+ Geometry result = geom0.symDifference(geom1);
+ return result;
+ }
+ catch (RuntimeException ex)
+ {
+ originalEx = ex;
+ }
+ /*
+ * If we are here, the original op encountered a precision problem
+ * (or some other problem). Retry the operation with
+ * enhanced precision to see if it succeeds
+ */
+ try {
+ CommonBitsOp cbo = new CommonBitsOp(true);
+ Geometry resultEP = cbo.symDifference(geom0, geom1);
+ // check that result is a valid geometry after the reshift to orginal precision
+ if (! resultEP.isValid())
+ throw originalEx;
+ return resultEP;
+ }
+ catch (RuntimeException ex2)
+ {
+ throw originalEx;
+ }
+ }
+ /**
+ * Computes the buffer of a {@link Geometry}, using enhanced precision.
+ * This method should no longer be necessary, since the buffer algorithm
+ * now is highly robust.
+ *
+ * @param geom the first Geometry
+ * @param distance the buffer distance
+ * @return the Geometry representing the buffer of the input Geometry.
+ */
+ public static Geometry buffer(Geometry geom, double distance)
+ {
+ RuntimeException originalEx;
+ try {
+ Geometry result = geom.buffer(distance);
+ return result;
+ }
+ catch (RuntimeException ex)
+ {
+ originalEx = ex;
+ }
+ /*
+ * If we are here, the original op encountered a precision problem
+ * (or some other problem). Retry the operation with
+ * enhanced precision to see if it succeeds
+ */
+ try {
+ CommonBitsOp cbo = new CommonBitsOp(true);
+ Geometry resultEP = cbo.buffer(geom, distance);
+ // check that result is a valid geometry after the reshift to orginal precision
+ if (! resultEP.isValid())
+ throw originalEx;
+ return resultEP;
+ }
+ catch (RuntimeException ex2)
+ {
+ throw originalEx;
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/GeometryPrecisionReducer.java b/modules/core/src/main/java/org/locationtech/jts/precision/GeometryPrecisionReducer.java
new file mode 100644
index 0000000..8d97e0b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/GeometryPrecisionReducer.java
@@ -0,0 +1,217 @@
+
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.GeometryEditor;
+
+/**
+ * Reduces the precision of a {@link Geometry}
+ * according to the supplied {@link PrecisionModel},
+ * ensuring that the result is topologically valid.
+ *
+ * @version 1.12
+ */
+public class GeometryPrecisionReducer
+{
+ /**
+ * Convenience method for doing precision reduction
+ * on a single geometry,
+ * with collapses removed
+ * and keeping the geometry precision model the same,
+ * and preserving polygonal topology.
+ *
+ * @param g the geometry to reduce
+ * @param precModel the precision model to use
+ * @return the reduced geometry
+ */
+ public static Geometry reduce(Geometry g, PrecisionModel precModel)
+ {
+ GeometryPrecisionReducer reducer = new GeometryPrecisionReducer(precModel);
+ return reducer.reduce(g);
+ }
+
+ /**
+ * Convenience method for doing pointwise precision reduction
+ * on a single geometry,
+ * with collapses removed
+ * and keeping the geometry precision model the same,
+ * but NOT preserving valid polygonal topology.
+ *
+ * @param g the geometry to reduce
+ * @param precModel the precision model to use
+ * @return the reduced geometry
+ */
+ public static Geometry reducePointwise(Geometry g, PrecisionModel precModel)
+ {
+ GeometryPrecisionReducer reducer = new GeometryPrecisionReducer(precModel);
+ reducer.setPointwise(true);
+ return reducer.reduce(g);
+ }
+
+ private PrecisionModel targetPM;
+ private boolean removeCollapsed = true;
+ private boolean changePrecisionModel = false;
+ private boolean isPointwise = false;
+
+ public GeometryPrecisionReducer(PrecisionModel pm)
+ {
+ targetPM = pm;
+ }
+
+ /**
+ * Sets whether the reduction will result in collapsed components
+ * being removed completely, or simply being collapsed to an (invalid)
+ * Geometry of the same type.
+ * The default is to remove collapsed components.
+ *
+ * @param removeCollapsed if <code>true</code> collapsed components will be removed
+ */
+ public void setRemoveCollapsedComponents(boolean removeCollapsed)
+ {
+ this.removeCollapsed = removeCollapsed;
+ }
+
+ /**
+ * Sets whether the {@link PrecisionModel} of the new reduced Geometry
+ * will be changed to be the {@link PrecisionModel} supplied to
+ * specify the precision reduction.
+ * <p>
+ * The default is to <b>not</b> change the precision model
+ *
+ * @param changePrecisionModel if <code>true</code> the precision model of the created Geometry will be the
+ * the precisionModel supplied in the constructor.
+ */
+ public void setChangePrecisionModel(boolean changePrecisionModel)
+ {
+ this.changePrecisionModel = changePrecisionModel;
+ }
+
+ /**
+ * Sets whether the precision reduction will be done
+ * in pointwise fashion only.
+ * Pointwise precision reduction reduces the precision
+ * of the individual coordinates only, but does
+ * not attempt to recreate valid topology.
+ * This is only relevant for geometries containing polygonal components.
+ *
+ * @param isPointwise if reduction should be done pointwise only
+ */
+ public void setPointwise(boolean isPointwise)
+ {
+ this.isPointwise = isPointwise;
+ }
+
+ public Geometry reduce(Geometry geom)
+ {
+ Geometry reducePW = reducePointwise(geom);
+ if (isPointwise)
+ return reducePW;
+
+ //TODO: handle GeometryCollections containing polys
+ if (! (reducePW instanceof Polygonal))
+ return reducePW;
+
+ // Geometry is polygonal - test if topology needs to be fixed
+ if (reducePW.isValid()) return reducePW;
+
+ // hack to fix topology.
+ // TODO: implement snap-rounding and use that.
+ return fixPolygonalTopology(reducePW);
+ }
+
+ private Geometry reducePointwise(Geometry geom)
+ {
+ GeometryEditor geomEdit;
+ if (changePrecisionModel) {
+ GeometryFactory newFactory = createFactory(geom.getFactory(), targetPM);
+ geomEdit = new GeometryEditor(newFactory);
+ }
+ else
+ // don't change geometry factory
+ geomEdit = new GeometryEditor();
+
+ /**
+ * For polygonal geometries, collapses are always removed, in order
+ * to produce correct topology
+ */
+ boolean finalRemoveCollapsed = removeCollapsed;
+ if (geom.getDimension() >= 2)
+ finalRemoveCollapsed = true;
+
+ Geometry reduceGeom = geomEdit.edit(geom,
+ new PrecisionReducerCoordinateOperation(targetPM, finalRemoveCollapsed));
+
+ return reduceGeom;
+ }
+
+ private Geometry fixPolygonalTopology(Geometry geom)
+ {
+ /**
+ * If precision model was *not* changed, need to flip
+ * geometry to targetPM, buffer in that model, then flip back
+ */
+ Geometry geomToBuffer = geom;
+ if (! changePrecisionModel) {
+ geomToBuffer = changePM(geom, targetPM);
+ }
+
+ Geometry bufGeom = geomToBuffer.buffer(0);
+
+ Geometry finalGeom = bufGeom;
+ if (! changePrecisionModel) {
+ // a slick way to copy the geometry with the original precision factory
+ finalGeom = geom.getFactory().createGeometry(bufGeom);
+ }
+ return finalGeom;
+ }
+
+ /**
+ * Duplicates a geometry to one that uses a different PrecisionModel,
+ * without changing any coordinate values.
+ *
+ * @param geom the geometry to duplicate
+ * @param newPM the precision model to use
+ * @return the geometry value with a new precision model
+ */
+ private Geometry changePM(Geometry geom, PrecisionModel newPM)
+ {
+ GeometryEditor geomEditor = createEditor(geom.getFactory(), newPM);
+ // this operation changes the PM for the entire geometry tree
+ return geomEditor.edit(geom, new GeometryEditor.NoOpGeometryOperation());
+ }
+
+ private GeometryEditor createEditor(GeometryFactory geomFactory, PrecisionModel newPM)
+ {
+ // no need to change if precision model is the same
+ if (geomFactory.getPrecisionModel() == newPM)
+ return new GeometryEditor();
+ // otherwise create a geometry editor which changes PrecisionModel
+ GeometryFactory newFactory = createFactory(geomFactory, newPM);
+ GeometryEditor geomEdit = new GeometryEditor(newFactory);
+ return geomEdit;
+ }
+
+ private GeometryFactory createFactory(GeometryFactory inputFactory, PrecisionModel pm)
+ {
+ GeometryFactory newFactory
+ = new GeometryFactory(pm,
+ inputFactory.getSRID(),
+ inputFactory.getCoordinateSequenceFactory());
+ return newFactory;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/MinimumClearance.java b/modules/core/src/main/java/org/locationtech/jts/precision/MinimumClearance.java
new file mode 100644
index 0000000..2e99ac1
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/MinimumClearance.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Lineal;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Puntal;
+import org.locationtech.jts.index.strtree.ItemBoundable;
+import org.locationtech.jts.index.strtree.ItemDistance;
+import org.locationtech.jts.index.strtree.STRtree;
+import org.locationtech.jts.operation.distance.FacetSequence;
+import org.locationtech.jts.operation.distance.FacetSequenceTreeBuilder;
+
+/**
+ * Computes the Minimum Clearance of a {@link Geometry}.
+ * <p>
+ * The <b>Minimum Clearance</b> is a measure of
+ * what magnitude of perturbation of
+ * the vertices of a geometry can be tolerated
+ * before the geometry becomes topologically invalid.
+ * The smaller the Minimum Clearance distance,
+ * the less vertex perturbation the geometry can tolerate
+ * before becoming invalid.
+ * <p>
+ * The concept was introduced by Thompson and Van Oosterom
+ * [TV06], based on earlier work by Milenkovic [Mi88].
+ * <p>
+ * The Minimum Clearance of a geometry G
+ * is defined to be the value <i>r</i>
+ * such that "the movement of all points by a distance
+ * of <i>r</i> in any direction will
+ * guarantee to leave the geometry valid" [TV06].
+ * An equivalent constructive definition [Mi88] is that
+ * <i>r</i> is the largest value such:
+ * <ol>
+ * <li>No two distinct vertices of G are closer than <i>r</i>
+ * <li>No vertex of G is closer than <i>r</i> to an edge of G
+ * of which the vertex is not an endpoint
+ * </ol>
+ * The following image shows an example of the Minimum Clearance
+ * of a simple polygon.
+ * <p>
+ * <center><img src='doc-files/minClearance.png'></center>
+ * <p>
+ * If G has only a single vertex (i.e. is a
+ * {@link Point}), the value of the minimum clearance
+ * is {@link Double#MAX_VALUE}.
+ * <p>
+ * If G is a {@link Puntal} or {@link Lineal} geometry,
+ * then in fact no amount of perturbation
+ * will render the geometry invalid.
+ * In this case a Minimum Clearance is still computed
+ * based on the vertex and segment distances
+ * according to the constructive definition.
+ * <p>
+ * It is possible for no Minimum Clearance to exist.
+ * For instance, a {@link MultiPoint} with all members identical
+ * has no Minimum Clearance
+ * (i.e. no amount of perturbation will cause
+ * the member points to become non-identical).
+ * Empty geometries also have no such distance.
+ * The lack of a meaningful MinimumClearance distance is detected
+ * and suitable values are returned by
+ * {@link #getDistance()} and {@link #getLine()}.
+ * <p>
+ * The computation of Minimum Clearance utilizes
+ * the {@link STRtree#nearestNeighbour(ItemDistance)}
+ * method to provide good performance even for
+ * large inputs.
+ * <p>
+ * An interesting note is that for the case of {@link MultiPoint}s,
+ * the computed Minimum Clearance line
+ * effectively determines the Nearest Neighbours in the collection.
+ *
+ * <h3>References</h3>
+ * <ul>
+ * <li>[Mi88] Milenkovic, V. J.,
+ * <i>Verifiable implementations of geometric algorithms
+ * using finite precision arithmetic</i>.
+ * in Artificial Intelligence, 377-401. 1988
+ * <li>[TV06] Thompson, Rod and van Oosterom, Peter,
+ * <i>Interchange of Spatial Data-Inhibiting Factors</i>,
+ * Agile 2006, Visegrad, Hungary. 2006
+ * </ul>
+ *
+ * @author Martin Davis
+ *
+ */
+public class MinimumClearance
+{
+ /**
+ * Computes the Minimum Clearance distance for
+ * the given Geometry.
+ *
+ * @param g the input geometry
+ * @return the Minimum Clearance distance
+ */
+ public static double getDistance(Geometry g)
+ {
+ MinimumClearance rp = new MinimumClearance(g);
+ return rp.getDistance();
+ }
+
+ /**
+ * Gets a LineString containing two points
+ * which are at the Minimum Clearance distance
+ * for the given Geometry.
+ *
+ * @param g the input geometry
+ * @return the value of the minimum clearance distance
+ * or <tt>LINESTRING EMPTY</tt> if no Minimum Clearance distance exists
+ */
+ public static Geometry getLine(Geometry g)
+ {
+ MinimumClearance rp = new MinimumClearance(g);
+ return rp.getLine();
+ }
+
+ private Geometry inputGeom;
+ private double minClearance;
+ private Coordinate[] minClearancePts;
+
+ /**
+ * Creates an object to compute the Minimum Clearance
+ * for the given Geometry
+ *
+ * @param geom the input geometry
+ */
+ public MinimumClearance(Geometry geom)
+ {
+ inputGeom = geom;
+ }
+
+ /**
+ * Gets the Minimum Clearance distance.
+ * <p>
+ * If no distance exists
+ * (e.g. in the case of two identical points)
+ * <tt>Double.MAX_VALUE</tt> is returned.
+ *
+ * @return the value of the minimum clearance distance
+ * or <tt>Double.MAX_VALUE</tt> if no Minimum Clearance distance exists
+ */
+ public double getDistance()
+ {
+ compute();
+ return minClearance;
+ }
+
+ /**
+ * Gets a LineString containing two points
+ * which are at the Minimum Clearance distance.
+ * <p>
+ * If no distance could be found
+ * (e.g. in the case of two identical points)
+ * <tt>LINESTRING EMPTY</tt> is returned.
+ *
+ * @return the value of the minimum clearance distance
+ * or <tt>LINESTRING EMPTY</tt> if no Minimum Clearance distance exists
+ */
+ public LineString getLine()
+ {
+ compute();
+ // return empty line string if no min pts where found
+ if (minClearancePts == null || minClearancePts[0] == null)
+ return inputGeom.getFactory().createLineString();
+ return inputGeom.getFactory().createLineString(minClearancePts);
+ }
+
+ private void compute()
+ {
+ // already computed
+ if (minClearancePts != null) return;
+
+ // initialize to "No Distance Exists" state
+ minClearancePts = new Coordinate[2];
+ minClearance = Double.MAX_VALUE;
+
+ // handle empty geometries
+ if (inputGeom.isEmpty()) {
+ return;
+ }
+
+ STRtree geomTree = FacetSequenceTreeBuilder.build(inputGeom);
+
+ Object[] nearest = geomTree.nearestNeighbour(new MinClearanceDistance());
+ MinClearanceDistance mcd = new MinClearanceDistance();
+ minClearance = mcd.distance(
+ (FacetSequence) nearest[0],
+ (FacetSequence) nearest[1]);
+ minClearancePts = mcd.getCoordinates();
+ }
+
+ /**
+ * Implements the MinimumClearance distance function:
+ * <ul>
+ * <li>dist(p1, p2) =
+ * <ul>
+ * <li>p1 != p2 : p1.distance(p2)
+ * <li>p1 == p2 : Double.MAX
+ * </ul>
+ * <li>dist(p, seg) =
+ * <ul>
+ * <li>p != seq.p1 && p != seg.p2 : seg.distance(p)
+ * <li>ELSE : Double.MAX
+ * </ul>
+ * </ul>
+ * Also computes the values of the nearest points, if any.
+ *
+ * @author Martin Davis
+ *
+ */
+ private static class MinClearanceDistance
+ implements ItemDistance
+ {
+ private double minDist = Double.MAX_VALUE;
+ private Coordinate[] minPts = new Coordinate[2];
+
+ public Coordinate[] getCoordinates()
+ {
+ return minPts;
+ }
+
+ public double distance(ItemBoundable b1, ItemBoundable b2) {
+ FacetSequence fs1 = (FacetSequence) b1.getItem();
+ FacetSequence fs2 = (FacetSequence) b2.getItem();
+ minDist = Double.MAX_VALUE;
+ return distance(fs1, fs2);
+ }
+
+ public double distance(FacetSequence fs1, FacetSequence fs2) {
+
+ // compute MinClearance distance metric
+
+ vertexDistance(fs1, fs2);
+ if (fs1.size() == 1 && fs2.size() == 1) return minDist;
+ if (minDist <= 0.0) return minDist;
+ segmentDistance(fs1, fs2);
+ if (minDist <= 0.0) return minDist;
+ segmentDistance(fs2, fs1);
+ return minDist;
+ }
+
+ private double vertexDistance(FacetSequence fs1, FacetSequence fs2) {
+ for (int i1 = 0; i1 < fs1.size(); i1++) {
+ for (int i2 = 0; i2 < fs2.size(); i2++) {
+ Coordinate p1 = fs1.getCoordinate(i1);
+ Coordinate p2 = fs2.getCoordinate(i2);
+ if (! p1.equals2D(p2)) {
+ double d = p1.distance(p2);
+ if (d < minDist) {
+ minDist = d;
+ minPts[0] = p1;
+ minPts[1] = p2;
+ if (d == 0.0)
+ return d;
+ }
+ }
+ }
+ }
+ return minDist;
+ }
+
+ private double segmentDistance(FacetSequence fs1, FacetSequence fs2) {
+ for (int i1 = 0; i1 < fs1.size(); i1++) {
+ for (int i2 = 1; i2 < fs2.size(); i2++) {
+
+ Coordinate p = fs1.getCoordinate(i1);
+
+ Coordinate seg0 = fs2.getCoordinate(i2-1);
+ Coordinate seg1 = fs2.getCoordinate(i2);
+
+ if (! (p.equals2D(seg0) || p.equals2D(seg1))) {
+ double d = Distance.pointToSegment(p, seg0, seg1);
+ if (d < minDist) {
+ minDist = d;
+ updatePts(p, seg0, seg1);
+ if (d == 0.0)
+ return d;
+ }
+ }
+ }
+ }
+ return minDist;
+ }
+
+ private void updatePts(Coordinate p, Coordinate seg0, Coordinate seg1)
+ {
+ minPts[0] = p;
+ LineSegment seg = new LineSegment(seg0, seg1);
+ minPts[1] = new Coordinate(seg.closestPoint(p));
+ }
+
+
+ }
+
+
+ }
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/PrecisionReducerCoordinateOperation.java b/modules/core/src/main/java/org/locationtech/jts/precision/PrecisionReducerCoordinateOperation.java
new file mode 100644
index 0000000..25f4d28
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/PrecisionReducerCoordinateOperation.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.GeometryEditor;
+
+public class PrecisionReducerCoordinateOperation extends
+ GeometryEditor.CoordinateOperation
+{
+ private PrecisionModel targetPM;
+ private boolean removeCollapsed = true;
+
+ public PrecisionReducerCoordinateOperation(PrecisionModel targetPM, boolean removeCollapsed)
+ {
+ this.targetPM = targetPM;
+ this.removeCollapsed = removeCollapsed;
+ }
+
+ public Coordinate[] edit(Coordinate[] coordinates, Geometry geom) {
+ if (coordinates.length == 0)
+ return null;
+
+ Coordinate[] reducedCoords = new Coordinate[coordinates.length];
+ // copy coordinates and reduce
+ for (int i = 0; i < coordinates.length; i++) {
+ Coordinate coord = new Coordinate(coordinates[i]);
+ targetPM.makePrecise(coord);
+ reducedCoords[i] = coord;
+ }
+ // remove repeated points, to simplify returned geometry as much as possible
+ CoordinateList noRepeatedCoordList = new CoordinateList(reducedCoords,
+ false);
+ Coordinate[] noRepeatedCoords = noRepeatedCoordList.toCoordinateArray();
+
+ /**
+ * Check to see if the removal of repeated points collapsed the coordinate
+ * List to an invalid length for the type of the parent geometry. It is not
+ * necessary to check for Point collapses, since the coordinate list can
+ * never collapse to less than one point. If the length is invalid, return
+ * the full-length coordinate array first computed, or null if collapses are
+ * being removed. (This may create an invalid geometry - the client must
+ * handle this.)
+ */
+ int minLength = 0;
+ if (geom instanceof LineString)
+ minLength = 2;
+ if (geom instanceof LinearRing)
+ minLength = 4;
+
+ Coordinate[] collapsedCoords = reducedCoords;
+ if (removeCollapsed)
+ collapsedCoords = null;
+
+ // return null or orginal length coordinate array
+ if (noRepeatedCoords.length < minLength) {
+ return collapsedCoords;
+ }
+
+ // ok to return shorter coordinate array
+ return noRepeatedCoords;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducer.java b/modules/core/src/main/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducer.java
new file mode 100644
index 0000000..73c5f98
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducer.java
@@ -0,0 +1,153 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.GeometryEditor;
+
+/**
+ * Reduces the precision of the coordinates of a {@link Geometry}
+ * according to the supplied {@link PrecisionModel}, without
+ * attempting to preserve valid topology.
+ * <p>
+ * In the case of {@link Polygonal} geometries,
+ * the topology of the resulting geometry may be invalid if
+ * topological collapse occurs due to coordinates being shifted.
+ * It is up to the client to check this and handle it if necessary.
+ * Collapses may not matter for some uses. An example
+ * is simplifying the input to the buffer algorithm.
+ * The buffer algorithm does not depend on the validity of the input geometry.
+ *
+ * @version 1.7
+ *
+ * @deprecated use GeometryPrecisionReducer
+ */
+public class SimpleGeometryPrecisionReducer
+{
+ /**
+ * Convenience method for doing precision reduction on a single geometry,
+ * with collapses removed and keeping the geometry precision model the same.
+ *
+ * @param g
+ * @param precModel
+ * @return the reduced geometry
+ */
+ public static Geometry reduce(Geometry g, PrecisionModel precModel)
+ {
+ SimpleGeometryPrecisionReducer reducer = new SimpleGeometryPrecisionReducer(precModel);
+ return reducer.reduce(g);
+ }
+
+ private PrecisionModel newPrecisionModel;
+ private boolean removeCollapsed = true;
+ private boolean changePrecisionModel = false;
+
+ public SimpleGeometryPrecisionReducer(PrecisionModel pm)
+ {
+ newPrecisionModel = pm;
+ }
+
+ /**
+ * Sets whether the reduction will result in collapsed components
+ * being removed completely, or simply being collapsed to an (invalid)
+ * Geometry of the same type.
+ * The default is to remove collapsed components.
+ *
+ * @param removeCollapsed if <code>true</code> collapsed components will be removed
+ */
+ public void setRemoveCollapsedComponents(boolean removeCollapsed)
+ {
+ this.removeCollapsed = removeCollapsed;
+ }
+
+ /**
+ * Sets whether the {@link PrecisionModel} of the new reduced Geometry
+ * will be changed to be the {@link PrecisionModel} supplied to
+ * specify the precision reduction.
+ * <p>
+ * The default is to <b>not</b> change the precision model
+ *
+ * @param changePrecisionModel if <code>true</code> the precision model of the created Geometry will be the
+ * the precisionModel supplied in the constructor.
+ */
+ public void setChangePrecisionModel(boolean changePrecisionModel)
+ {
+ this.changePrecisionModel = changePrecisionModel;
+ }
+
+ public Geometry reduce(Geometry geom)
+ {
+ GeometryEditor geomEdit;
+ if (changePrecisionModel) {
+ GeometryFactory newFactory = new GeometryFactory(newPrecisionModel, geom.getFactory().getSRID());
+ geomEdit = new GeometryEditor(newFactory);
+ }
+ else
+ // don't change geometry factory
+ geomEdit = new GeometryEditor();
+
+ return geomEdit.edit(geom, new PrecisionReducerCoordinateOperation());
+ }
+
+ private class PrecisionReducerCoordinateOperation
+ extends GeometryEditor.CoordinateOperation
+ {
+ public Coordinate[] edit(Coordinate[] coordinates, Geometry geom)
+ {
+ if (coordinates.length == 0) return null;
+
+ Coordinate[] reducedCoords = new Coordinate[coordinates.length];
+ // copy coordinates and reduce
+ for (int i = 0; i < coordinates.length; i++) {
+ Coordinate coord = new Coordinate(coordinates[i]);
+ newPrecisionModel.makePrecise(coord);
+ reducedCoords[i] = coord;
+ }
+ // remove repeated points, to simplify returned geometry as much as possible
+ CoordinateList noRepeatedCoordList = new CoordinateList(reducedCoords, false);
+ Coordinate[] noRepeatedCoords = noRepeatedCoordList.toCoordinateArray();
+
+ /**
+ * Check to see if the removal of repeated points
+ * collapsed the coordinate List to an invalid length
+ * for the type of the parent geometry.
+ * It is not necessary to check for Point collapses, since the coordinate list can
+ * never collapse to less than one point.
+ * If the length is invalid, return the full-length coordinate array
+ * first computed, or null if collapses are being removed.
+ * (This may create an invalid geometry - the client must handle this.)
+ */
+ int minLength = 0;
+ if (geom instanceof LineString) minLength = 2;
+ if (geom instanceof LinearRing) minLength = 4;
+
+ Coordinate[] collapsedCoords = reducedCoords;
+ if (removeCollapsed) collapsedCoords = null;
+
+ // return null or orginal length coordinate array
+ if (noRepeatedCoords.length < minLength) {
+ return collapsedCoords;
+ }
+
+ // ok to return shorter coordinate array
+ return noRepeatedCoords;
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/SimpleMinimumClearance.java b/modules/core/src/main/java/org/locationtech/jts/precision/SimpleMinimumClearance.java
new file mode 100644
index 0000000..8d8c2af
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/SimpleMinimumClearance.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * Computes the minimum clearance of a geometry or
+ * set of geometries.
+ * <p>
+ * The <b>Minimum Clearance</b> is a measure of
+ * what magnitude of perturbation of its vertices can be tolerated
+ * by a geometry before it becomes topologically invalid.
+ * <p>
+ * This class uses an inefficient O(N^2) scan.
+ * It is primarily for testing purposes.
+ *
+ *
+ * @see MinimumClearance
+ * @author Martin Davis
+ *
+ */
+public class SimpleMinimumClearance
+{
+ public static double getDistance(Geometry g)
+ {
+ SimpleMinimumClearance rp = new SimpleMinimumClearance(g);
+ return rp.getDistance();
+ }
+
+ public static Geometry getLine(Geometry g)
+ {
+ SimpleMinimumClearance rp = new SimpleMinimumClearance(g);
+ return rp.getLine();
+ }
+
+ private Geometry inputGeom;
+ private double minClearance;
+ private Coordinate[] minClearancePts;
+
+ public SimpleMinimumClearance(Geometry geom)
+ {
+ inputGeom = geom;
+ }
+
+ public double getDistance()
+ {
+ compute();
+ return minClearance;
+ }
+
+ public LineString getLine()
+ {
+ compute();
+ return inputGeom.getFactory().createLineString(minClearancePts);
+ }
+
+ private void compute()
+ {
+ if (minClearancePts != null) return;
+ minClearancePts = new Coordinate[2];
+ minClearance = Double.MAX_VALUE;
+ inputGeom.apply(new VertexCoordinateFilter(this));
+ }
+
+ private void updateClearance(double candidateValue, Coordinate p0, Coordinate p1)
+ {
+ if (candidateValue < minClearance) {
+ minClearance = candidateValue;
+ minClearancePts[0] = new Coordinate(p0);
+ minClearancePts[1] = new Coordinate(p1);
+ }
+ }
+
+ private void updateClearance(double candidateValue, Coordinate p,
+ Coordinate seg0, Coordinate seg1)
+ {
+ if (candidateValue < minClearance) {
+ minClearance = candidateValue;
+ minClearancePts[0] = new Coordinate(p);
+ LineSegment seg = new LineSegment(seg0, seg1);
+ minClearancePts[1] = new Coordinate(seg.closestPoint(p));
+ }
+ }
+
+ private static class VertexCoordinateFilter
+ implements CoordinateFilter
+ {
+ SimpleMinimumClearance smc;
+
+ public VertexCoordinateFilter(SimpleMinimumClearance smc)
+ {
+ this.smc = smc;
+ }
+
+ public void filter(Coordinate coord) {
+ smc.inputGeom.apply(new ComputeMCCoordinateSequenceFilter(smc, coord));
+ }
+ }
+
+ private static class ComputeMCCoordinateSequenceFilter
+ implements CoordinateSequenceFilter
+ {
+ SimpleMinimumClearance smc;
+ private Coordinate queryPt;
+
+ public ComputeMCCoordinateSequenceFilter(SimpleMinimumClearance smc, Coordinate queryPt)
+ {
+ this.smc = smc;
+ this.queryPt = queryPt;
+ }
+ public void filter(CoordinateSequence seq, int i) {
+ // compare to vertex
+ checkVertexDistance(seq.getCoordinate(i));
+
+ // compare to segment, if this is one
+ if (i > 0) {
+ checkSegmentDistance(seq.getCoordinate(i - 1), seq.getCoordinate(i));
+ }
+ }
+
+ private void checkVertexDistance(Coordinate vertex)
+ {
+ double vertexDist = vertex.distance(queryPt);
+ if (vertexDist > 0) {
+ smc.updateClearance(vertexDist, queryPt, vertex);
+ }
+ }
+
+ private void checkSegmentDistance(Coordinate seg0, Coordinate seg1)
+ {
+ if (queryPt.equals2D(seg0) || queryPt.equals2D(seg1))
+ return;
+ double segDist = Distance.pointToSegment(queryPt, seg1, seg0);
+ if (segDist > 0)
+ smc.updateClearance(segDist, queryPt, seg1, seg0);
+ }
+
+ public boolean isDone() {
+ return false;
+ }
+
+ public boolean isGeometryChanged() {
+ return false;
+ }
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/doc-files/minClearance.png b/modules/core/src/main/java/org/locationtech/jts/precision/doc-files/minClearance.png
new file mode 100644
index 0000000..2547a7e
Binary files /dev/null and b/modules/core/src/main/java/org/locationtech/jts/precision/doc-files/minClearance.png differ
diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/package.html b/modules/core/src/main/java/org/locationtech/jts/precision/package.html
new file mode 100644
index 0000000..b091498
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/precision/package.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Provides classes for analyzing and
+manipulating the precision of Geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/shape/GeometricShapeBuilder.java b/modules/core/src/main/java/org/locationtech/jts/shape/GeometricShapeBuilder.java
new file mode 100644
index 0000000..7594958
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/shape/GeometricShapeBuilder.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.shape;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineSegment;
+
+public abstract class GeometricShapeBuilder
+{
+ protected Envelope extent = new Envelope(0, 1, 0, 1);
+ protected int numPts = 0;
+ protected GeometryFactory geomFactory;
+
+ public GeometricShapeBuilder(GeometryFactory geomFactory)
+ {
+ this.geomFactory = geomFactory;
+ }
+
+ public void setExtent(Envelope extent)
+ {
+ this.extent = extent;
+ }
+
+ public Envelope getExtent()
+ {
+ return extent;
+ }
+
+ public Coordinate getCentre()
+ {
+ return extent.centre();
+ }
+
+ public double getDiameter()
+ {
+ return Math.min(extent.getHeight(), extent.getWidth());
+ }
+
+ public double getRadius()
+ {
+ return getDiameter() / 2;
+ }
+
+ public LineSegment getSquareBaseLine()
+ {
+ double radius = getRadius();
+
+ Coordinate centre = getCentre();
+ Coordinate p0 = new Coordinate(centre.x - radius, centre.y - radius);
+ Coordinate p1 = new Coordinate(centre.x + radius, centre.y - radius);
+ return new LineSegment(p0, p1);
+ }
+
+ public Envelope getSquareExtent()
+ {
+ double radius = getRadius();
+
+ Coordinate centre = getCentre();
+ return new Envelope(centre.x - radius, centre.x + radius,
+ centre.y - radius, centre.y + radius);
+ }
+
+
+ /**
+ * Sets the total number of points in the created {@link Geometry}.
+ * The created geometry will have no more than this number of points,
+ * unless more are needed to create a valid geometry.
+ */
+ public void setNumPoints(int numPts) { this.numPts = numPts; }
+
+ public abstract Geometry getGeometry();
+
+ protected Coordinate createCoord(double x, double y)
+ {
+ Coordinate pt = new Coordinate(x, y);
+ geomFactory.getPrecisionModel().makePrecise(pt);
+ return pt;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/shape/fractal/KochSnowflakeBuilder.java b/modules/core/src/main/java/org/locationtech/jts/shape/fractal/KochSnowflakeBuilder.java
new file mode 100644
index 0000000..e1f3695
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/shape/fractal/KochSnowflakeBuilder.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.shape.fractal;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.math.Vector2D;
+import org.locationtech.jts.shape.GeometricShapeBuilder;
+
+public class KochSnowflakeBuilder
+extends GeometricShapeBuilder
+{
+ private CoordinateList coordList = new CoordinateList();
+
+ public KochSnowflakeBuilder(GeometryFactory geomFactory)
+ {
+ super(geomFactory);
+ }
+
+ public static int recursionLevelForSize(int numPts)
+ {
+ double pow4 = numPts / 3;
+ double exp = Math.log(pow4)/Math.log(4);
+ return (int) exp;
+ }
+
+ public Geometry getGeometry()
+ {
+ int level = recursionLevelForSize(numPts);
+ LineSegment baseLine = getSquareBaseLine();
+ Coordinate[] pts = getBoundary(level, baseLine.getCoordinate(0), baseLine.getLength());
+ return geomFactory.createPolygon(
+ geomFactory.createLinearRing(pts), null);
+ }
+
+ /**
+ * The height of an equilateral triangle of side one
+ */
+ private static final double HEIGHT_FACTOR = Math.sin(Math.PI / 3.0);
+ private static final double ONE_THIRD = 1.0/3.0;
+ private static final double THIRD_HEIGHT = HEIGHT_FACTOR/3.0;
+ private static final double TWO_THIRDS = 2.0/3.0;
+
+ private Coordinate[] getBoundary(int level, Coordinate origin, double width)
+ {
+ double y = origin.y;
+ // for all levels beyond 0 need to vertically shift shape by height of one "arm" to centre it
+ if (level > 0) {
+ y += THIRD_HEIGHT * width;
+ }
+
+ Coordinate p0 = new Coordinate(origin.x, y);
+ Coordinate p1 = new Coordinate(origin.x + width/2, y + width * HEIGHT_FACTOR);
+ Coordinate p2 = new Coordinate(origin.x + width, y);
+ addSide(level, p0, p1);
+ addSide(level, p1, p2);
+ addSide(level, p2, p0);
+ coordList.closeRing();
+ return coordList.toCoordinateArray();
+ }
+
+ public void addSide(int level, Coordinate p0, Coordinate p1) {
+ if (level == 0)
+ addSegment(p0, p1);
+ else {
+ Vector2D base = Vector2D.create(p0, p1);
+ Coordinate midPt = base.multiply(0.5).translate(p0);
+
+ Vector2D heightVec = base.multiply(THIRD_HEIGHT);
+ Vector2D offsetVec = heightVec.rotateByQuarterCircle(1);
+ Coordinate offsetPt = offsetVec.translate(midPt);
+
+ int n2 = level - 1;
+ Coordinate thirdPt = base.multiply(ONE_THIRD).translate(p0);
+ Coordinate twoThirdPt = base.multiply(TWO_THIRDS).translate(p0);
+
+ // construct sides recursively
+ addSide(n2, p0, thirdPt);
+ addSide(n2, thirdPt, offsetPt);
+ addSide(n2, offsetPt, twoThirdPt);
+ addSide(n2, twoThirdPt, p1);
+ }
+ }
+
+ private void addSegment(Coordinate p0, Coordinate p1)
+ {
+ coordList.add(p1);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/shape/fractal/SierpinskiCarpetBuilder.java b/modules/core/src/main/java/org/locationtech/jts/shape/fractal/SierpinskiCarpetBuilder.java
new file mode 100644
index 0000000..73dbd7c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/shape/fractal/SierpinskiCarpetBuilder.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.shape.fractal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.shape.GeometricShapeBuilder;
+
+
+public class SierpinskiCarpetBuilder
+extends GeometricShapeBuilder
+{
+ private CoordinateList coordList = new CoordinateList();
+
+ public SierpinskiCarpetBuilder(GeometryFactory geomFactory)
+ {
+ super(geomFactory);
+ }
+
+ public static int recursionLevelForSize(int numPts)
+ {
+ double pow4 = numPts / 3;
+ double exp = Math.log(pow4)/Math.log(4);
+ return (int) exp;
+ }
+
+ public Geometry getGeometry()
+ {
+ int level = recursionLevelForSize(numPts);
+ LineSegment baseLine = getSquareBaseLine();
+ Coordinate origin = baseLine.getCoordinate(0);
+ LinearRing[] holes = getHoles(level, origin.x, origin.y, getDiameter());
+ LinearRing shell = (LinearRing) ((Polygon) geomFactory.toGeometry(getSquareExtent())).getExteriorRing();
+ return geomFactory.createPolygon(
+ shell, holes);
+ }
+
+ private LinearRing[] getHoles(int n, double originX, double originY, double width)
+ {
+ List holeList = new ArrayList();
+
+ addHoles(n, originX, originY, width, holeList );
+
+ return GeometryFactory.toLinearRingArray(holeList);
+ }
+
+ private void addHoles(int n, double originX, double originY, double width, List holeList)
+ {
+ if (n < 0) return;
+ int n2 = n - 1;
+ double widthThird = width / 3.0;
+ double widthTwoThirds = width * 2.0 / 3.0;
+ double widthNinth = width / 9.0;
+ addHoles(n2, originX, originY, widthThird, holeList);
+ addHoles(n2, originX + widthThird, originY, widthThird, holeList);
+ addHoles(n2, originX + 2 * widthThird, originY, widthThird, holeList);
+
+ addHoles(n2, originX, originY + widthThird, widthThird, holeList);
+ addHoles(n2, originX + 2 * widthThird, originY + widthThird, widthThird, holeList);
+
+ addHoles(n2, originX, originY + 2 * widthThird, widthThird, holeList);
+ addHoles(n2, originX + widthThird, originY + 2 * widthThird, widthThird, holeList);
+ addHoles(n2, originX + 2 * widthThird, originY + 2 * widthThird, widthThird, holeList);
+
+ // add the centre hole
+ holeList.add(createSquareHole(originX + widthThird, originY + widthThird, widthThird));
+ }
+
+ private LinearRing createSquareHole(double x, double y, double width)
+ {
+ Coordinate[] pts = new Coordinate[]{
+ new Coordinate(x, y),
+ new Coordinate(x + width, y),
+ new Coordinate(x + width, y + width),
+ new Coordinate(x, y + width),
+ new Coordinate(x, y)
+ } ;
+ return geomFactory.createLinearRing(pts);
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/shape/random/RandomPointsBuilder.java b/modules/core/src/main/java/org/locationtech/jts/shape/random/RandomPointsBuilder.java
new file mode 100644
index 0000000..1d1de67
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/shape/random/RandomPointsBuilder.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.shape.random;
+
+import org.locationtech.jts.algorithm.locate.IndexedPointInAreaLocator;
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.shape.GeometricShapeBuilder;
+
+/**
+ * Creates random point sets contained in a
+ * region defined by either a rectangular or a polygonal extent.
+ *
+ * @author mbdavis
+ *
+ */
+public class RandomPointsBuilder
+extends GeometricShapeBuilder
+{
+ protected Geometry maskPoly = null;
+ private PointOnGeometryLocator extentLocator;
+
+ /**
+ * Create a shape factory which will create shapes using the default
+ * {@link GeometryFactory}.
+ */
+ public RandomPointsBuilder()
+ {
+ super(new GeometryFactory());
+ }
+
+ /**
+ * Create a shape factory which will create shapes using the given
+ * {@link GeometryFactory}.
+ *
+ * @param geomFact the factory to use
+ */
+ public RandomPointsBuilder(GeometryFactory geomFact)
+ {
+ super(geomFact);
+ }
+
+ /**
+ * Sets a polygonal mask.
+ *
+ * @param mask
+ * @throws IllegalArgumentException if the mask is not polygonal
+ */
+ public void setExtent(Geometry mask)
+ {
+ if (! (mask instanceof Polygonal))
+ throw new IllegalArgumentException("Only polygonal extents are supported");
+ this.maskPoly = mask;
+ setExtent(mask.getEnvelopeInternal());
+ extentLocator = new IndexedPointInAreaLocator(mask);
+ }
+
+ public Geometry getGeometry()
+ {
+ Coordinate[] pts = new Coordinate[numPts];
+ int i = 0;
+ while (i < numPts) {
+ Coordinate p = createRandomCoord(getExtent());
+ if (extentLocator != null && ! isInExtent(p))
+ continue;
+ pts[i++] = p;
+ }
+ return geomFactory.createMultiPointFromCoords(pts);
+ }
+
+ protected boolean isInExtent(Coordinate p)
+ {
+ if (extentLocator != null)
+ return extentLocator.locate(p) != Location.EXTERIOR;
+ return getExtent().contains(p);
+ }
+
+ protected Coordinate createCoord(double x, double y)
+ {
+ Coordinate pt = new Coordinate(x, y);
+ geomFactory.getPrecisionModel().makePrecise(pt);
+ return pt;
+ }
+
+ protected Coordinate createRandomCoord(Envelope env)
+ {
+ double x = env.getMinX() + env.getWidth() * Math.random();
+ double y = env.getMinY() + env.getHeight() * Math.random();
+ return createCoord(x, y);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/shape/random/RandomPointsInGridBuilder.java b/modules/core/src/main/java/org/locationtech/jts/shape/random/RandomPointsInGridBuilder.java
new file mode 100644
index 0000000..9ea42af
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/shape/random/RandomPointsInGridBuilder.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.shape.random;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.math.MathUtil;
+import org.locationtech.jts.shape.GeometricShapeBuilder;
+
+
+/**
+ * Creates random point sets
+ * where the points are constrained to lie in the cells of a grid.
+ *
+ * @author mbdavis
+ *
+ */
+public class RandomPointsInGridBuilder
+extends GeometricShapeBuilder
+{
+ private boolean isConstrainedToCircle = false;
+ private double gutterFraction = 0;
+
+ /**
+ * Create a builder which will create shapes using the default
+ * {@link GeometryFactory}.
+ */
+ public RandomPointsInGridBuilder()
+ {
+ super(new GeometryFactory());
+ }
+
+ /**
+ * Create a builder which will create shapes using the given
+ * {@link GeometryFactory}.
+ *
+ * @param geomFact the factory to use
+ */
+ public RandomPointsInGridBuilder(GeometryFactory geomFact)
+ {
+ super(geomFact);
+ }
+
+ /**
+ * Sets whether generated points are constrained to lie
+ * within a circle contained within each grid cell.
+ * This provides greater separation between points
+ * in adjacent cells.
+ * <p>
+ * The default is to not be constrained to a circle.
+ * @param isConstrainedToCircle
+ */
+ public void setConstrainedToCircle(boolean isConstrainedToCircle)
+ {
+ this.isConstrainedToCircle = isConstrainedToCircle;
+ }
+
+ /**
+ * Sets the fraction of the grid cell side which will be treated as
+ * a gutter, in which no points will be created.
+ * The provided value is clamped to the range [0.0, 1.0].
+ *
+ * @param gutterFraction
+ */
+ public void setGutterFraction(double gutterFraction)
+ {
+ this.gutterFraction = gutterFraction;
+ }
+
+ /**
+ * Gets the {@link MultiPoint} containing the generated point
+ *
+ * @return a MultiPoint
+ */
+ public Geometry getGeometry()
+ {
+ int nCells = (int) Math.sqrt(numPts);
+ // ensure that at least numPts points are generated
+ if (nCells * nCells < numPts)
+ nCells += 1;
+
+ double gridDX = getExtent().getWidth() / nCells;
+ double gridDY = getExtent().getHeight() / nCells;
+
+ double gutterFrac = MathUtil.clamp(gutterFraction, 0.0, 1.0);
+ double gutterOffsetX = gridDX * gutterFrac/2;
+ double gutterOffsetY = gridDY * gutterFrac/2;
+ double cellFrac = 1.0 - gutterFrac;
+ double cellDX = cellFrac * gridDX;
+ double cellDY = cellFrac * gridDY;
+
+ Coordinate[] pts = new Coordinate[nCells * nCells];
+ int index = 0;
+ for (int i = 0; i < nCells; i++) {
+ for (int j = 0; j < nCells; j++) {
+ double orgX = getExtent().getMinX() + i * gridDX + gutterOffsetX;
+ double orgY = getExtent().getMinY() + j * gridDY + gutterOffsetY;
+ pts[index++] = randomPointInCell(orgX, orgY, cellDX, cellDY);
+ }
+ }
+ return geomFactory.createMultiPointFromCoords(pts);
+ }
+
+ private Coordinate randomPointInCell(double orgX, double orgY, double xLen, double yLen)
+ {
+ if (isConstrainedToCircle) {
+ return randomPointInCircle(
+ orgX,
+ orgY,
+ xLen, yLen);
+ }
+ return randomPointInGridCell(orgX, orgY, xLen, yLen);
+ }
+
+ private Coordinate randomPointInGridCell(double orgX, double orgY, double xLen, double yLen)
+ {
+ double x = orgX + xLen * Math.random();
+ double y = orgY + yLen * Math.random();
+ return createCoord(x, y);
+ }
+
+ private static Coordinate randomPointInCircle(double orgX, double orgY, double width, double height)
+ {
+ double centreX = orgX + width/2;
+ double centreY = orgY + height/2;
+
+ double rndAng = 2 * Math.PI * Math.random();
+ double rndRadius = Math.random();
+ // use square root of radius, since area is proportional to square of radius
+ double rndRadius2 = Math.sqrt(rndRadius);
+ double rndX = width/2 * rndRadius2 * Math.cos(rndAng);
+ double rndY = height/2 * rndRadius2 * Math.sin(rndAng);
+
+ double x0 = centreX + rndX;
+ double y0 = centreY + rndY;
+ return new Coordinate(x0, y0);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerLineSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerLineSimplifier.java
new file mode 100644
index 0000000..62b5d68
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerLineSimplifier.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.LineSegment;
+
+/**
+ * Simplifies a linestring (sequence of points) using
+ * the standard Douglas-Peucker algorithm.
+ *
+ * @version 1.7
+ */
+class DouglasPeuckerLineSimplifier
+{
+ public static Coordinate[] simplify(Coordinate[] pts, double distanceTolerance)
+ {
+ DouglasPeuckerLineSimplifier simp = new DouglasPeuckerLineSimplifier(pts);
+ simp.setDistanceTolerance(distanceTolerance);
+ return simp.simplify();
+ }
+
+ private Coordinate[] pts;
+ private boolean[] usePt;
+ private double distanceTolerance;
+
+ public DouglasPeuckerLineSimplifier(Coordinate[] pts)
+ {
+ this.pts = pts;
+ }
+ /**
+ * Sets the distance tolerance for the simplification.
+ * All vertices in the simplified linestring will be within this
+ * distance of the original linestring.
+ *
+ * @param distanceTolerance the approximation tolerance to use
+ */
+ public void setDistanceTolerance(double distanceTolerance) {
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ public Coordinate[] simplify()
+ {
+ usePt = new boolean[pts.length];
+ for (int i = 0; i < pts.length; i++) {
+ usePt[i] = true;
+ }
+ simplifySection(0, pts.length - 1);
+ CoordinateList coordList = new CoordinateList();
+ for (int i = 0; i < pts.length; i++) {
+ if (usePt[i])
+ coordList.add(new Coordinate(pts[i]));
+ }
+ return coordList.toCoordinateArray();
+ }
+
+ private LineSegment seg = new LineSegment();
+
+ private void simplifySection(int i, int j)
+ {
+ if((i+1) == j) {
+ return;
+ }
+ seg.p0 = pts[i];
+ seg.p1 = pts[j];
+ double maxDistance = -1.0;
+ int maxIndex = i;
+ for (int k = i + 1; k < j; k++) {
+ double distance = seg.distance(pts[k]);
+ if (distance > maxDistance) {
+ maxDistance = distance;
+ maxIndex = k;
+ }
+ }
+ if (maxDistance <= distanceTolerance) {
+ for(int k = i + 1; k < j; k++) {
+ usePt[k] = false;
+ }
+ }
+ else {
+ simplifySection(i, maxIndex);
+ simplifySection(maxIndex, j);
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifier.java
new file mode 100644
index 0000000..8718975
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifier.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.GeometryTransformer;
+
+/**
+ * Simplifies a {@link Geometry} using the Douglas-Peucker algorithm.
+ * Ensures that any polygonal geometries returned are valid.
+ * Simple lines are not guaranteed to remain simple after simplification.
+ * All geometry types are handled.
+ * Empty and point geometries are returned unchanged.
+ * Empty geometry components are deleted.
+ * <p>
+ * Note that in general D-P does not preserve topology -
+ * e.g. polygons can be split, collapse to lines or disappear
+ * holes can be created or disappear,
+ * and lines can cross.
+ * To simplify geometry while preserving topology use {@link TopologyPreservingSimplifier}.
+ * (However, using D-P is significantly faster).
+ *<h2>KNOWN BUGS</h2>
+ *<ul>
+ *<li>In some cases the approach used to clean invalid simplified polygons
+ *can distort the output geometry severely.
+ *</ul>
+ *
+ *
+ * @version 1.7
+ * @see TopologyPreservingSimplifier
+ */
+public class DouglasPeuckerSimplifier
+{
+
+ /**
+ * Simplifies a geometry using a given tolerance.
+ *
+ * @param geom geometry to simplify
+ * @param distanceTolerance the tolerance to use
+ * @return a simplified version of the geometry
+ */
+ public static Geometry simplify(Geometry geom, double distanceTolerance)
+ {
+ DouglasPeuckerSimplifier tss = new DouglasPeuckerSimplifier(geom);
+ tss.setDistanceTolerance(distanceTolerance);
+ return tss.getResultGeometry();
+ }
+
+ private Geometry inputGeom;
+ private double distanceTolerance;
+ private boolean isEnsureValidTopology = true;
+
+ /**
+ * Creates a simplifier for a given geometry.
+ *
+ * @param inputGeom the geometry to simplify
+ */
+ public DouglasPeuckerSimplifier(Geometry inputGeom)
+ {
+ this.inputGeom = inputGeom;
+ }
+
+ /**
+ * Sets the distance tolerance for the simplification.
+ * All vertices in the simplified geometry will be within this
+ * distance of the original geometry.
+ * The tolerance value must be non-negative.
+ *
+ * @param distanceTolerance the approximation tolerance to use
+ */
+ public void setDistanceTolerance(double distanceTolerance) {
+ if (distanceTolerance < 0.0)
+ throw new IllegalArgumentException("Tolerance must be non-negative");
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ /**
+ * Controls whether simplified polygons will be "fixed"
+ * to have valid topology.
+ * The caller may choose to disable this because:
+ * <ul>
+ * <li>valid topology is not required
+ * <li>fixing topology is a relative expensive operation
+ * <li>in some pathological cases the topology fixing operation may either fail or run for too long
+ * </ul>
+ *
+ * The default is to fix polygon topology.
+ *
+ * @param isEnsureValidTopology
+ */
+ public void setEnsureValid(boolean isEnsureValidTopology)
+ {
+ this.isEnsureValidTopology = isEnsureValidTopology;
+ }
+
+ /**
+ * Gets the simplified geometry.
+ *
+ * @return the simplified geometry
+ */
+ public Geometry getResultGeometry()
+ {
+ // empty input produces an empty result
+ if (inputGeom.isEmpty()) return inputGeom.copy();
+
+ return (new DPTransformer(isEnsureValidTopology, distanceTolerance)).transform(inputGeom);
+ }
+
+static class DPTransformer
+ extends GeometryTransformer
+{
+ private boolean isEnsureValidTopology = true;
+ private double distanceTolerance;
+
+ public DPTransformer(boolean isEnsureValidTopology, double distanceTolerance)
+ {
+ this.isEnsureValidTopology = isEnsureValidTopology;
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ protected CoordinateSequence transformCoordinates(CoordinateSequence coords, Geometry parent)
+ {
+ Coordinate[] inputPts = coords.toCoordinateArray();
+ Coordinate[] newPts = null;
+ if (inputPts.length == 0) {
+ newPts = new Coordinate[0];
+ }
+ else {
+ newPts = DouglasPeuckerLineSimplifier.simplify(inputPts, distanceTolerance);
+ }
+ return factory.getCoordinateSequenceFactory().create(newPts);
+ }
+
+ /**
+ * Simplifies a polygon, fixing it if required.
+ */
+ protected Geometry transformPolygon(Polygon geom, Geometry parent) {
+ // empty geometries are simply removed
+ if (geom.isEmpty())
+ return null;
+ Geometry rawGeom = super.transformPolygon(geom, parent);
+ // don't try and correct if the parent is going to do this
+ if (parent instanceof MultiPolygon) {
+ return rawGeom;
+ }
+ return createValidArea(rawGeom);
+ }
+
+ /**
+ * Simplifies a LinearRing. If the simplification results
+ * in a degenerate ring, remove the component.
+ *
+ * @return null if the simplification results in a degenerate ring
+ */
+ protected Geometry transformLinearRing(LinearRing geom, Geometry parent)
+ {
+ boolean removeDegenerateRings = parent instanceof Polygon;
+ Geometry simpResult = super.transformLinearRing(geom, parent);
+ if (removeDegenerateRings && ! (simpResult instanceof LinearRing))
+ return null;;
+ return simpResult;
+ }
+
+ /**
+ * Simplifies a MultiPolygon, fixing it if required.
+ */
+ protected Geometry transformMultiPolygon(MultiPolygon geom, Geometry parent) {
+ Geometry rawGeom = super.transformMultiPolygon(geom, parent);
+ return createValidArea(rawGeom);
+ }
+
+ /**
+ * Creates a valid area geometry from one that possibly has
+ * bad topology (i.e. self-intersections).
+ * Since buffer can handle invalid topology, but always returns
+ * valid geometry, constructing a 0-width buffer "corrects" the
+ * topology.
+ * Note this only works for area geometries, since buffer always returns
+ * areas. This also may return empty geometries, if the input
+ * has no actual area.
+ *
+ * @param rawAreaGeom an area geometry possibly containing self-intersections
+ * @return a valid area geometry
+ */
+ private Geometry createValidArea(Geometry rawAreaGeom)
+ {
+ if ( isEnsureValidTopology)
+ return rawAreaGeom.buffer(0.0);
+ return rawAreaGeom;
+ }
+}
+
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/LineSegmentIndex.java b/modules/core/src/main/java/org/locationtech/jts/simplify/LineSegmentIndex.java
new file mode 100644
index 0000000..7b006aa
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/LineSegmentIndex.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.index.quadtree.Quadtree;
+
+/**
+ * An spatial index on a set of {@link LineSegment}s.
+ * Supports adding and removing items.
+ *
+ * @author Martin Davis
+ */
+class LineSegmentIndex
+{
+ private Quadtree index = new Quadtree();
+
+ public LineSegmentIndex()
+ {
+ }
+
+ public void add(TaggedLineString line) {
+ TaggedLineSegment[] segs = line.getSegments();
+ for (int i = 0; i < segs.length; i++) {
+ TaggedLineSegment seg = segs[i];
+ add(seg);
+ }
+ }
+
+ public void add(LineSegment seg)
+ {
+ index.insert(new Envelope(seg.p0, seg.p1), seg);
+ }
+
+ public void remove(LineSegment seg)
+ {
+ index.remove(new Envelope(seg.p0, seg.p1), seg);
+ }
+
+ public List query(LineSegment querySeg)
+ {
+ Envelope env = new Envelope(querySeg.p0, querySeg.p1);
+
+ LineSegmentVisitor visitor = new LineSegmentVisitor(querySeg);
+ index.query(env, visitor);
+ List itemsFound = visitor.getItems();
+
+// List listQueryItems = index.query(env);
+// System.out.println("visitor size = " + itemsFound.size()
+// + " query size = " + listQueryItems.size());
+// List itemsFound = index.query(env);
+
+ return itemsFound;
+ }
+}
+
+/**
+ * ItemVisitor subclass to reduce volume of query results.
+ */
+class LineSegmentVisitor
+ implements ItemVisitor
+{
+// MD - only seems to make about a 10% difference in overall time.
+
+ private LineSegment querySeg;
+ private ArrayList items = new ArrayList();
+
+ public LineSegmentVisitor(LineSegment querySeg) {
+ this.querySeg = querySeg;
+ }
+
+ public void visitItem(Object item)
+ {
+ LineSegment seg = (LineSegment) item;
+ if (Envelope.intersects(seg.p0, seg.p1, querySeg.p0, querySeg.p1))
+ items.add(item);
+ }
+
+ public ArrayList getItems() { return items; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineSegment.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineSegment.java
new file mode 100644
index 0000000..5862df9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineSegment.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+
+/**
+ * A {@link LineSegment} which is tagged with its location in a parent {@link Geometry}.
+ * Used to index the segments in a geometry and recover the segment locations
+ * from the index.
+ */
+class TaggedLineSegment
+ extends LineSegment
+{
+ private Geometry parent;
+ private int index;
+
+ public TaggedLineSegment(Coordinate p0, Coordinate p1, Geometry parent, int index) {
+ super(p0, p1);
+ this.parent = parent;
+ this.index = index;
+ }
+
+ public TaggedLineSegment(Coordinate p0, Coordinate p1) {
+ this(p0, p1, null, -1);
+ }
+
+ public Geometry getParent() { return parent; }
+ public int getIndex() { return index; }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineString.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineString.java
new file mode 100644
index 0000000..d87f57a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineString.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+
+/**
+ * Represents a {@link LineString} which can be modified to a simplified shape.
+ * This class provides an attribute which specifies the minimum allowable length
+ * for the modified result.
+ *
+ * @version 1.7
+ */
+class TaggedLineString
+{
+
+ private LineString parentLine;
+ private TaggedLineSegment[] segs;
+ private List resultSegs = new ArrayList();
+ private int minimumSize;
+
+ public TaggedLineString(LineString parentLine) {
+ this(parentLine, 2);
+ }
+
+ public TaggedLineString(LineString parentLine, int minimumSize) {
+ this.parentLine = parentLine;
+ this.minimumSize = minimumSize;
+ init();
+ }
+
+ public int getMinimumSize() { return minimumSize; }
+ public LineString getParent() { return parentLine; }
+ public Coordinate[] getParentCoordinates() { return parentLine.getCoordinates(); }
+ public Coordinate[] getResultCoordinates() { return extractCoordinates(resultSegs); }
+
+ public int getResultSize()
+ {
+ int resultSegsSize = resultSegs.size();
+ return resultSegsSize == 0 ? 0 : resultSegsSize + 1;
+ }
+
+ public TaggedLineSegment getSegment(int i) { return segs[i]; }
+
+ private void init()
+ {
+ Coordinate[] pts = parentLine.getCoordinates();
+ segs = new TaggedLineSegment[pts.length - 1];
+ for (int i = 0; i < pts.length - 1; i++) {
+ TaggedLineSegment seg
+ = new TaggedLineSegment(pts[i], pts[i + 1], parentLine, i);
+ segs[i] = seg;
+ }
+ }
+
+ public TaggedLineSegment[] getSegments() { return segs; }
+
+ public void addToResult(LineSegment seg)
+ {
+ resultSegs.add(seg);
+ }
+
+ public LineString asLineString()
+ {
+ return parentLine.getFactory().createLineString(extractCoordinates(resultSegs));
+ }
+
+ public LinearRing asLinearRing() {
+ return parentLine.getFactory().createLinearRing(extractCoordinates(resultSegs));
+ }
+
+ private static Coordinate[] extractCoordinates(List segs)
+ {
+ Coordinate[] pts = new Coordinate[segs.size() + 1];
+ LineSegment seg = null;
+ for (int i = 0; i < segs.size(); i++) {
+ seg = (LineSegment) segs.get(i);
+ pts[i] = seg.p0;
+ }
+ // add last point
+ pts[pts.length - 1] = seg.p1;
+ return pts;
+ }
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineStringSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineStringSimplifier.java
new file mode 100644
index 0000000..f59b383
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineStringSimplifier.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+
+/**
+ * Simplifies a TaggedLineString, preserving topology
+ * (in the sense that no new intersections are introduced).
+ * Uses the recursive Douglas-Peucker algorithm.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class TaggedLineStringSimplifier
+{
+ private LineIntersector li = new RobustLineIntersector();
+ private LineSegmentIndex inputIndex = new LineSegmentIndex();
+ private LineSegmentIndex outputIndex = new LineSegmentIndex();
+ private TaggedLineString line;
+ private Coordinate[] linePts;
+ private double distanceTolerance = 0.0;
+
+ public TaggedLineStringSimplifier(LineSegmentIndex inputIndex,
+ LineSegmentIndex outputIndex)
+ {
+ this.inputIndex = inputIndex;
+ this.outputIndex = outputIndex;
+ }
+
+ /**
+ * Sets the distance tolerance for the simplification.
+ * All vertices in the simplified geometry will be within this
+ * distance of the original geometry.
+ *
+ * @param distanceTolerance the approximation tolerance to use
+ */
+ public void setDistanceTolerance(double distanceTolerance) {
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ /**
+ * Simplifies the given {@link TaggedLineString}
+ * using the distance tolerance specified.
+ *
+ * @param line the linestring to simplify
+ */
+ void simplify(TaggedLineString line)
+ {
+ this.line = line;
+ linePts = line.getParentCoordinates();
+ simplifySection(0, linePts.length - 1, 0);
+ }
+
+ private void simplifySection(int i, int j, int depth)
+ {
+ depth += 1;
+ int[] sectionIndex = new int[2];
+ if((i+1) == j) {
+ LineSegment newSeg = line.getSegment(i);
+ line.addToResult(newSeg);
+ // leave this segment in the input index, for efficiency
+ return;
+ }
+
+ boolean isValidToSimplify = true;
+
+ /**
+ * Following logic ensures that there is enough points in the output line.
+ * If there is already more points than the minimum, there's nothing to check.
+ * Otherwise, if in the worst case there wouldn't be enough points,
+ * don't flatten this segment (which avoids the worst case scenario)
+ */
+ if (line.getResultSize() < line.getMinimumSize()) {
+ int worstCaseSize = depth + 1;
+ if (worstCaseSize < line.getMinimumSize())
+ isValidToSimplify = false;
+ }
+
+ double[] distance = new double[1];
+ int furthestPtIndex = findFurthestPoint(linePts, i, j, distance);
+ // flattening must be less than distanceTolerance
+ if (distance[0] > distanceTolerance) isValidToSimplify = false;
+ // test if flattened section would cause intersection
+ LineSegment candidateSeg = new LineSegment();
+ candidateSeg.p0 = linePts[i];
+ candidateSeg.p1 = linePts[j];
+ sectionIndex[0] = i;
+ sectionIndex[1] = j;
+ if (hasBadIntersection(line, sectionIndex, candidateSeg)) isValidToSimplify = false;
+
+ if (isValidToSimplify) {
+ LineSegment newSeg = flatten(i, j);
+ line.addToResult(newSeg);
+ return;
+ }
+ simplifySection(i, furthestPtIndex, depth);
+ simplifySection(furthestPtIndex, j, depth);
+ }
+
+ private int findFurthestPoint(Coordinate[] pts, int i, int j, double[] maxDistance)
+ {
+ LineSegment seg = new LineSegment();
+ seg.p0 = pts[i];
+ seg.p1 = pts[j];
+ double maxDist = -1.0;
+ int maxIndex = i;
+ for (int k = i + 1; k < j; k++) {
+ Coordinate midPt = pts[k];
+ double distance = seg.distance(midPt);
+ if (distance > maxDist) {
+ maxDist = distance;
+ maxIndex = k;
+ }
+ }
+ maxDistance[0] = maxDist;
+ return maxIndex;
+ }
+
+ /**
+ * Flattens a section of the line between
+ * indexes <code>start</code> and <code>end</code>,
+ * replacing them with a line between the endpoints.
+ * The input and output indexes are updated
+ * to reflect this.
+ *
+ * @param start the start index of the flattened section
+ * @param end the end index of the flattened section
+ * @return the new segment created
+ */
+ private LineSegment flatten(int start, int end)
+ {
+ // make a new segment for the simplified geometry
+ Coordinate p0 = linePts[start];
+ Coordinate p1 = linePts[end];
+ LineSegment newSeg = new LineSegment(p0, p1);
+ // update the indexes
+ remove(line, start, end);
+ outputIndex.add(newSeg);
+ return newSeg;
+ }
+
+ private boolean hasBadIntersection(TaggedLineString parentLine,
+ int[] sectionIndex,
+ LineSegment candidateSeg)
+ {
+ if (hasBadOutputIntersection(candidateSeg)) return true;
+ if (hasBadInputIntersection(parentLine, sectionIndex, candidateSeg)) return true;
+ return false;
+ }
+
+ private boolean hasBadOutputIntersection(LineSegment candidateSeg)
+ {
+ List querySegs = outputIndex.query(candidateSeg);
+ for (Iterator i = querySegs.iterator(); i.hasNext(); ) {
+ LineSegment querySeg = (LineSegment) i.next();
+ if (hasInteriorIntersection(querySeg, candidateSeg)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean hasBadInputIntersection(TaggedLineString parentLine,
+ int[] sectionIndex,
+ LineSegment candidateSeg)
+ {
+ List querySegs = inputIndex.query(candidateSeg);
+ for (Iterator i = querySegs.iterator(); i.hasNext(); ) {
+ TaggedLineSegment querySeg = (TaggedLineSegment) i.next();
+ if (hasInteriorIntersection(querySeg, candidateSeg)) {
+ if (isInLineSection(parentLine, sectionIndex, querySeg))
+ continue;
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Tests whether a segment is in a section of a TaggedLineString
+ * @param line
+ * @param sectionIndex
+ * @param seg
+ * @return
+ */
+ private static boolean isInLineSection(
+ TaggedLineString line,
+ int[] sectionIndex,
+ TaggedLineSegment seg)
+ {
+ // not in this line
+ if (seg.getParent() != line.getParent())
+ return false;
+ int segIndex = seg.getIndex();
+ if (segIndex >= sectionIndex[0] && segIndex < sectionIndex[1])
+ return true;
+ return false;
+ }
+
+ private boolean hasInteriorIntersection(LineSegment seg0, LineSegment seg1)
+ {
+ li.computeIntersection(seg0.p0, seg0.p1, seg1.p0, seg1.p1);
+ return li.isInteriorIntersection();
+ }
+
+ /**
+ * Remove the segs in the section of the line
+ * @param line
+ * @param pts
+ * @param sectionStartIndex
+ * @param sectionEndIndex
+ */
+ private void remove(TaggedLineString line,
+ int start, int end)
+ {
+ for (int i = start; i < end; i++) {
+ TaggedLineSegment seg = line.getSegment(i);
+ inputIndex.remove(seg);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLinesSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLinesSimplifier.java
new file mode 100644
index 0000000..26bb3b2
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLinesSimplifier.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Simplifies a collection of TaggedLineStrings, preserving topology
+ * (in the sense that no new intersections are introduced).
+ * This class is essentially just a container for the common
+ * indexes used by {@link TaggedLineStringSimplifier}.
+ */
+class TaggedLinesSimplifier
+{
+ private LineSegmentIndex inputIndex = new LineSegmentIndex();
+ private LineSegmentIndex outputIndex = new LineSegmentIndex();
+ private double distanceTolerance = 0.0;
+
+ public TaggedLinesSimplifier()
+ {
+
+ }
+
+ /**
+ * Sets the distance tolerance for the simplification.
+ * All vertices in the simplified geometry will be within this
+ * distance of the original geometry.
+ *
+ * @param distanceTolerance the approximation tolerance to use
+ */
+ public void setDistanceTolerance(double distanceTolerance) {
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ /**
+ * Simplify a collection of TaggedLineStrings
+ *
+ * @param taggedLines the collection of lines to simplify
+ */
+ public void simplify(Collection taggedLines) {
+ for (Iterator i = taggedLines.iterator(); i.hasNext(); ) {
+ inputIndex.add((TaggedLineString) i.next());
+ }
+ for (Iterator i = taggedLines.iterator(); i.hasNext(); ) {
+ TaggedLineStringSimplifier tlss
+ = new TaggedLineStringSimplifier(inputIndex, outputIndex);
+ tlss.setDistanceTolerance(distanceTolerance);
+ tlss.simplify((TaggedLineString) i.next());
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TopologyPreservingSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TopologyPreservingSimplifier.java
new file mode 100644
index 0000000..6024dd5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/TopologyPreservingSimplifier.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryComponentFilter;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.GeometryTransformer;
+
+/**
+ * Simplifies a geometry and ensures that
+ * the result is a valid geometry having the
+ * same dimension and number of components as the input,
+ * and with the components having the same topological
+ * relationship.
+ * <p>
+ * If the input is a polygonal geometry
+ * ( {@link Polygon} or {@link MultiPolygon} ):
+ * <ul>
+ * <li>The result has the same number of shells and holes as the input,
+ * with the same topological structure
+ * <li>The result rings touch at <b>no more</b> than the number of touching points in the input
+ * (although they may touch at fewer points).
+ * The key implication of this statement is that if the
+ * input is topologically valid, so is the simplified output.
+ * </ul>
+ * For linear geometries, if the input does not contain
+ * any intersecting line segments, this property
+ * will be preserved in the output.
+ * <p>
+ * For all geometry types, the result will contain
+ * enough vertices to ensure validity. For polygons
+ * and closed linear geometries, the result will have at
+ * least 4 vertices; for open linestrings the result
+ * will have at least 2 vertices.
+ * <p>
+ * All geometry types are handled.
+ * Empty and point geometries are returned unchanged.
+ * Empty geometry components are deleted.
+ * <p>
+ * The simplification uses a maximum-distance difference algorithm
+ * similar to the Douglas-Peucker algorithm.
+ *
+ * <h3>KNOWN BUGS</h3>
+ * <ul>
+ * <li>May create invalid topology if there are components which are
+ * small relative to the tolerance value.
+ * In particular, if a small hole is very near an edge, it is possible for the edge to be moved by
+ * a relatively large tolerance value and end up with the hole outside the result shell
+ * (or inside another hole).
+ * Similarly, it is possible for a small polygon component to end up inside
+ * a nearby larger polygon.
+ * A workaround is to test for this situation in post-processing and remove
+ * any invalid holes or polygons.
+ * </ul>
+ *
+ * @author Martin Davis
+ * @see DouglasPeuckerSimplifier
+ *
+ */
+public class TopologyPreservingSimplifier
+{
+ public static Geometry simplify(Geometry geom, double distanceTolerance)
+ {
+ TopologyPreservingSimplifier tss = new TopologyPreservingSimplifier(geom);
+ tss.setDistanceTolerance(distanceTolerance);
+ return tss.getResultGeometry();
+ }
+
+ private Geometry inputGeom;
+ private TaggedLinesSimplifier lineSimplifier = new TaggedLinesSimplifier();
+ private Map linestringMap;
+
+ public TopologyPreservingSimplifier(Geometry inputGeom)
+ {
+ this.inputGeom = inputGeom;
+ }
+
+ /**
+ * Sets the distance tolerance for the simplification.
+ * All vertices in the simplified geometry will be within this
+ * distance of the original geometry.
+ * The tolerance value must be non-negative. A tolerance value
+ * of zero is effectively a no-op.
+ *
+ * @param distanceTolerance the approximation tolerance to use
+ */
+ public void setDistanceTolerance(double distanceTolerance) {
+ if (distanceTolerance < 0.0)
+ throw new IllegalArgumentException("Tolerance must be non-negative");
+ lineSimplifier.setDistanceTolerance(distanceTolerance);
+ }
+
+ public Geometry getResultGeometry()
+ {
+ // empty input produces an empty result
+ if (inputGeom.isEmpty()) return inputGeom.copy();
+
+ linestringMap = new HashMap();
+ inputGeom.apply(new LineStringMapBuilderFilter(this));
+ lineSimplifier.simplify(linestringMap.values());
+ Geometry result = (new LineStringTransformer(linestringMap)).transform(inputGeom);
+ return result;
+ }
+
+ static class LineStringTransformer
+ extends GeometryTransformer
+ {
+ private Map linestringMap;
+
+ public LineStringTransformer(Map linestringMap) {
+ this.linestringMap = linestringMap;
+ }
+
+ protected CoordinateSequence transformCoordinates(CoordinateSequence coords, Geometry parent)
+ {
+ if (coords.size() == 0) return null;
+ // for linear components (including rings), simplify the linestring
+ if (parent instanceof LineString) {
+ TaggedLineString taggedLine = (TaggedLineString) linestringMap.get(parent);
+ return createCoordinateSequence(taggedLine.getResultCoordinates());
+ }
+ // for anything else (e.g. points) just copy the coordinates
+ return super.transformCoordinates(coords, parent);
+ }
+ }
+
+ /**
+ * A filter to add linear geometries to the linestring map
+ * with the appropriate minimum size constraint.
+ * Closed {@link LineString}s (including {@link LinearRing}s
+ * have a minimum output size constraint of 4,
+ * to ensure the output is valid.
+ * For all other linestrings, the minimum size is 2 points.
+ *
+ * @author Martin Davis
+ *
+ */
+ static class LineStringMapBuilderFilter
+ implements GeometryComponentFilter
+ {
+ TopologyPreservingSimplifier tps;
+
+ LineStringMapBuilderFilter(TopologyPreservingSimplifier tps) {
+ this.tps = tps;
+ }
+
+ /**
+ * Filters linear geometries.
+ *
+ * geom a geometry of any type
+ */
+ public void filter(Geometry geom)
+ {
+ if (geom instanceof LineString) {
+ LineString line = (LineString) geom;
+ // skip empty geometries
+ if (line.isEmpty()) return;
+
+ int minSize = ((LineString) line).isClosed() ? 4 : 2;
+ TaggedLineString taggedLine = new TaggedLineString((LineString) line, minSize);
+ tps.linestringMap.put(line, taggedLine);
+ }
+ }
+ }
+
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/VWLineSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/VWLineSimplifier.java
new file mode 100644
index 0000000..f5276dc
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/VWLineSimplifier.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Triangle;
+
+/**
+ * Simplifies a linestring (sequence of points) using the
+ * Visvalingam-Whyatt algorithm.
+ * The Visvalingam-Whyatt algorithm simplifies geometry
+ * by removing vertices while trying to minimize the area changed.
+ *
+ * @version 1.7
+ */
+class VWLineSimplifier
+{
+ public static Coordinate[] simplify(Coordinate[] pts, double distanceTolerance)
+ {
+ VWLineSimplifier simp = new VWLineSimplifier(pts, distanceTolerance);
+ return simp.simplify();
+ }
+
+ private Coordinate[] pts;
+ private double tolerance;
+
+ public VWLineSimplifier(Coordinate[] pts, double distanceTolerance)
+ {
+ this.pts = pts;
+ this.tolerance = distanceTolerance * distanceTolerance;
+ }
+
+ public Coordinate[] simplify()
+ {
+ VWLineSimplifier.VWVertex vwLine = VWVertex.buildLine(pts);
+ double minArea = tolerance;
+ do {
+ minArea = simplifyVertex(vwLine);
+ } while (minArea < tolerance);
+ Coordinate[] simp = vwLine.getCoordinates();
+ // ensure computed value is a valid line
+ if (simp.length < 2) {
+ return new Coordinate[] { simp[0], new Coordinate(simp[0]) };
+ }
+ return simp;
+ }
+
+ private double simplifyVertex(VWLineSimplifier.VWVertex vwLine)
+ {
+ /**
+ * Scan vertices in line and remove the one with smallest effective area.
+ */
+ // TODO: use an appropriate data structure to optimize finding the smallest area vertex
+ VWLineSimplifier.VWVertex curr = vwLine;
+ double minArea = curr.getArea();
+ VWLineSimplifier.VWVertex minVertex = null;
+ while (curr != null) {
+ double area = curr.getArea();
+ if (area < minArea) {
+ minArea = area;
+ minVertex = curr;
+ }
+ curr = curr.next;
+ }
+ if (minVertex != null && minArea < tolerance) {
+ minVertex.remove();
+ }
+ if (! vwLine.isLive()) return -1;
+ return minArea;
+ }
+
+
+ static class VWVertex
+ {
+ public static VWLineSimplifier.VWVertex buildLine(Coordinate[] pts)
+ {
+ VWLineSimplifier.VWVertex first = null;
+ VWLineSimplifier.VWVertex prev = null;
+ for (int i = 0; i < pts.length; i++) {
+ VWLineSimplifier.VWVertex v = new VWVertex(pts[i]);
+ if (first == null)
+ first = v;
+ v.setPrev(prev);
+ if (prev != null) {
+ prev.setNext(v);
+ prev.updateArea();
+ }
+ prev = v;
+ }
+ return first;
+ }
+
+ public static double MAX_AREA = Double.MAX_VALUE;
+
+ private Coordinate pt;
+ private VWLineSimplifier.VWVertex prev;
+ private VWLineSimplifier.VWVertex next;
+ private double area = MAX_AREA;
+ private boolean isLive = true;
+
+ public VWVertex(Coordinate pt)
+ {
+ this.pt = pt;
+ }
+
+ public void setPrev(VWLineSimplifier.VWVertex prev)
+ {
+ this.prev = prev;
+ }
+
+ public void setNext(VWLineSimplifier.VWVertex next)
+ {
+ this.next = next;
+ }
+
+ public void updateArea()
+ {
+ if (prev == null || next == null) {
+ area = MAX_AREA;
+ return;
+ }
+ area = Math.abs(Triangle.area(prev.pt, pt, next.pt));
+ }
+
+ public double getArea()
+ {
+ return area;
+ }
+ public boolean isLive()
+ {
+ return isLive;
+ }
+ public VWLineSimplifier.VWVertex remove()
+ {
+ VWLineSimplifier.VWVertex tmpPrev = prev;
+ VWLineSimplifier.VWVertex tmpNext = next;
+ VWLineSimplifier.VWVertex result = null;
+ if (prev != null) {
+ prev.setNext(tmpNext);
+ prev.updateArea();
+ result = prev;
+ }
+ if (next != null) {
+ next.setPrev(tmpPrev);
+ next.updateArea();
+ if (result == null)
+ result = next;
+ }
+ isLive = false;
+ return result;
+ }
+ public Coordinate[] getCoordinates()
+ {
+ CoordinateList coords = new CoordinateList();
+ VWLineSimplifier.VWVertex curr = this;
+ do {
+ coords.add(curr.pt, false);
+ curr = curr.next;
+ } while (curr != null);
+ return coords.toCoordinateArray();
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/VWSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/VWSimplifier.java
new file mode 100644
index 0000000..0af77e1
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/VWSimplifier.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.GeometryTransformer;
+
+/**
+ * Simplifies a {@link Geometry} using the Visvalingam-Whyatt area-based algorithm.
+ * Ensures that any polygonal geometries returned are valid. Simple lines are not
+ * guaranteed to remain simple after simplification. All geometry types are
+ * handled. Empty and point geometries are returned unchanged. Empty geometry
+ * components are deleted.
+ * <p>
+ * The simplification tolerance is specified as a distance.
+ * This is converted to an area tolerance by squaring it.
+ * <p>
+ * Note that in general this algorithm does not preserve topology - e.g. polygons can be split,
+ * collapse to lines or disappear holes can be created or disappear, and lines
+ * can cross.
+ *
+ * <h3>Known Bugs</h3>
+ * <ul>
+ * <li>Not yet optimized for performance
+ * <li>Does not simplify the endpoint of rings
+ * </ul>
+ * <h3>To Do</h3>
+ * <ul>
+ * <li>Allow specifying desired number of vertices in the output
+ * </ul>
+ *
+ * @version 1.7
+ */
+public class VWSimplifier
+{
+
+ /**
+ * Simplifies a geometry using a given tolerance.
+ *
+ * @param geom geometry to simplify
+ * @param distanceTolerance the tolerance to use
+ * @return a simplified version of the geometry
+ */
+ public static Geometry simplify(Geometry geom, double distanceTolerance)
+ {
+ VWSimplifier simp = new VWSimplifier(geom);
+ simp.setDistanceTolerance(distanceTolerance);
+ return simp.getResultGeometry();
+ }
+
+ private Geometry inputGeom;
+ private double distanceTolerance;
+ private boolean isEnsureValidTopology = true;
+
+ /**
+ * Creates a simplifier for a given geometry.
+ *
+ * @param inputGeom the geometry to simplify
+ */
+ public VWSimplifier(Geometry inputGeom)
+ {
+ this.inputGeom = inputGeom;
+ }
+
+ /**
+ * Sets the distance tolerance for the simplification. All vertices in the
+ * simplified geometry will be within this distance of the original geometry.
+ * The tolerance value must be non-negative.
+ *
+ * @param distanceTolerance
+ * the approximation tolerance to use
+ */
+ public void setDistanceTolerance(double distanceTolerance)
+ {
+ if (distanceTolerance < 0.0)
+ throw new IllegalArgumentException("Tolerance must be non-negative");
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ /**
+ * Controls whether simplified polygons will be "fixed" to have valid
+ * topology. The caller may choose to disable this because:
+ * <ul>
+ * <li>valid topology is not required
+ * <li>fixing topology is a relative expensive operation
+ * <li>in some pathological cases the topology fixing operation may either
+ * fail or run for too long
+ * </ul>
+ *
+ * The default is to fix polygon topology.
+ *
+ * @param isEnsureValidTopology
+ */
+ public void setEnsureValid(boolean isEnsureValidTopology)
+ {
+ this.isEnsureValidTopology = isEnsureValidTopology;
+ }
+
+ /**
+ * Gets the simplified geometry.
+ *
+ * @return the simplified geometry
+ */
+ public Geometry getResultGeometry()
+ {
+ // empty input produces an empty result
+ if (inputGeom.isEmpty())
+ return inputGeom.copy();
+
+ return (new VWTransformer(isEnsureValidTopology, distanceTolerance)).transform(inputGeom);
+ }
+
+ static class VWTransformer extends GeometryTransformer
+ {
+ private boolean isEnsureValidTopology = true;
+ private double distanceTolerance;
+
+ public VWTransformer(boolean isEnsureValidTopology, double distanceTolerance)
+ {
+ this.isEnsureValidTopology = isEnsureValidTopology;
+ this.distanceTolerance = distanceTolerance;
+ }
+
+ protected CoordinateSequence transformCoordinates(CoordinateSequence coords, Geometry parent)
+ {
+ Coordinate[] inputPts = coords.toCoordinateArray();
+ Coordinate[] newPts = null;
+ if (inputPts.length == 0) {
+ newPts = new Coordinate[0];
+ }
+ else {
+ newPts = VWLineSimplifier.simplify(inputPts, distanceTolerance);
+ }
+ return factory.getCoordinateSequenceFactory().create(newPts);
+ }
+
+ /**
+ * Simplifies a polygon, fixing it if required.
+ */
+ protected Geometry transformPolygon(Polygon geom, Geometry parent)
+ {
+ // empty geometries are simply removed
+ if (geom.isEmpty())
+ return null;
+ Geometry rawGeom = super.transformPolygon(geom, parent);
+ // don't try and correct if the parent is going to do this
+ if (parent instanceof MultiPolygon) {
+ return rawGeom;
+ }
+ return createValidArea(rawGeom);
+ }
+
+ /**
+ * Simplifies a LinearRing. If the simplification results in a degenerate
+ * ring, remove the component.
+ *
+ * @return null if the simplification results in a degenerate ring
+ */
+ protected Geometry transformLinearRing(LinearRing geom, Geometry parent)
+ {
+ boolean removeDegenerateRings = parent instanceof Polygon;
+ Geometry simpResult = super.transformLinearRing(geom, parent);
+ if (removeDegenerateRings && !(simpResult instanceof LinearRing))
+ return null;
+ ;
+ return simpResult;
+ }
+
+ /**
+ * Simplifies a MultiPolygon, fixing it if required.
+ */
+ protected Geometry transformMultiPolygon(MultiPolygon geom, Geometry parent)
+ {
+ Geometry rawGeom = super.transformMultiPolygon(geom, parent);
+ return createValidArea(rawGeom);
+ }
+
+ /**
+ * Creates a valid area geometry from one that possibly has bad topology
+ * (i.e. self-intersections). Since buffer can handle invalid topology, but
+ * always returns valid geometry, constructing a 0-width buffer "corrects"
+ * the topology. Note this only works for area geometries, since buffer
+ * always returns areas. This also may return empty geometries, if the input
+ * has no actual area.
+ *
+ * @param rawAreaGeom
+ * an area geometry possibly containing self-intersections
+ * @return a valid area geometry
+ */
+ private Geometry createValidArea(Geometry rawAreaGeom)
+ {
+ if (isEnsureValidTopology)
+ return rawAreaGeom.buffer(0.0);
+ return rawAreaGeom;
+ }
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/package.html b/modules/core/src/main/java/org/locationtech/jts/simplify/package.html
new file mode 100644
index 0000000..127e21b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/simplify/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes which implement algorithms for simplifying or generalizing geometries.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/ConformingDelaunayTriangulationBuilder.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConformingDelaunayTriangulationBuilder.java
new file mode 100644
index 0000000..75195df
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConformingDelaunayTriangulationBuilder.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+import org.locationtech.jts.triangulate.quadedge.Vertex;
+
+
+/**
+ * A utility class which creates Conforming Delaunay Triangulations
+ * from collections of points and linear constraints, and extract the resulting
+ * triangulation edges or triangles as geometries.
+ *
+ * @author Martin Davis
+ *
+ */
+public class ConformingDelaunayTriangulationBuilder
+{
+ private Collection siteCoords;
+ private Geometry constraintLines;
+ private double tolerance = 0.0;
+ private QuadEdgeSubdivision subdiv = null;
+
+ private Map constraintVertexMap = new TreeMap();
+
+ public ConformingDelaunayTriangulationBuilder()
+ {
+ }
+
+ /**
+ * Sets the sites (point or vertices) which will be triangulated.
+ * All vertices of the given geometry will be used as sites.
+ * The site vertices do not have to contain the constraint
+ * vertices as well; any site vertices which are
+ * identical to a constraint vertex will be removed
+ * from the site vertex set.
+ *
+ * @param geom the geometry from which the sites will be extracted.
+ */
+ public void setSites(Geometry geom)
+ {
+ siteCoords = DelaunayTriangulationBuilder.extractUniqueCoordinates(geom);
+ }
+
+ /**
+ * Sets the linear constraints to be conformed to.
+ * All linear components in the input will be used as constraints.
+ * The constraint vertices do not have to be disjoint from
+ * the site vertices.
+ * The constraints must not contain duplicate segments (up to orientation).
+ *
+ * @param constraintLines the lines to constraint to
+ */
+ public void setConstraints(Geometry constraintLines)
+ {
+ this.constraintLines = constraintLines;
+ }
+
+ /**
+ * Sets the snapping tolerance which will be used
+ * to improved the robustness of the triangulation computation.
+ * A tolerance of 0.0 specifies that no snapping will take place.
+ *
+ * @param tolerance the tolerance distance to use
+ */
+ public void setTolerance(double tolerance)
+ {
+ this.tolerance = tolerance;
+ }
+
+
+ private void create()
+ {
+ if (subdiv != null) return;
+
+ Envelope siteEnv = DelaunayTriangulationBuilder.envelope(siteCoords);
+
+ List segments = new ArrayList();
+ if (constraintLines != null) {
+ siteEnv.expandToInclude(constraintLines.getEnvelopeInternal());
+ createVertices(constraintLines);
+ segments = createConstraintSegments(constraintLines);
+ }
+ List sites = createSiteVertices(siteCoords);
+
+ ConformingDelaunayTriangulator cdt = new ConformingDelaunayTriangulator(sites, tolerance);
+
+ cdt.setConstraints(segments, new ArrayList(constraintVertexMap.values()));
+
+ cdt.formInitialDelaunay();
+ cdt.enforceConstraints();
+ subdiv = cdt.getSubdivision();
+ }
+
+ private List createSiteVertices(Collection coords)
+ {
+ List verts = new ArrayList();
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate coord = (Coordinate) i.next();
+ if (constraintVertexMap.containsKey(coord))
+ continue;
+ verts.add(new ConstraintVertex(coord));
+ }
+ return verts;
+ }
+
+ private void createVertices(Geometry geom)
+ {
+ Coordinate[] coords = geom.getCoordinates();
+ for (int i = 0; i < coords.length; i++) {
+ Vertex v = new ConstraintVertex(coords[i]);
+ constraintVertexMap.put(coords[i], v);
+ }
+ }
+
+ private static List createConstraintSegments(Geometry geom)
+ {
+ List lines = LinearComponentExtracter.getLines(geom);
+ List constraintSegs = new ArrayList();
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ createConstraintSegments(line, constraintSegs);
+ }
+ return constraintSegs;
+ }
+
+ private static void createConstraintSegments(LineString line, List constraintSegs)
+ {
+ Coordinate[] coords = line.getCoordinates();
+ for (int i = 1; i < coords.length; i++) {
+ constraintSegs.add(new Segment(coords[i-1], coords[i]));
+ }
+ }
+
+ /**
+ * Gets the QuadEdgeSubdivision which models the computed triangulation.
+ *
+ * @return the subdivision containing the triangulation
+ */
+ public QuadEdgeSubdivision getSubdivision()
+ {
+ create();
+ return subdiv;
+ }
+
+ /**
+ * Gets the edges of the computed triangulation as a {@link MultiLineString}.
+ *
+ * @param geomFact the geometry factory to use to create the output
+ * @return the edges of the triangulation
+ */
+ public Geometry getEdges(GeometryFactory geomFact)
+ {
+ create();
+ return subdiv.getEdges(geomFact);
+ }
+
+ /**
+ * Gets the faces of the computed triangulation as a {@link GeometryCollection}
+ * of {@link Polygon}.
+ *
+ * @param geomFact the geometry factory to use to create the output
+ * @return the faces of the triangulation
+ */
+ public Geometry getTriangles(GeometryFactory geomFact)
+ {
+ create();
+ return subdiv.getTriangles(geomFact);
+ }
+
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/ConformingDelaunayTriangulator.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConformingDelaunayTriangulator.java
new file mode 100644
index 0000000..5ba2c9c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConformingDelaunayTriangulator.java
@@ -0,0 +1,544 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.ConvexHull;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.index.kdtree.KdNode;
+import org.locationtech.jts.index.kdtree.KdTree;
+import org.locationtech.jts.triangulate.quadedge.LastFoundQuadEdgeLocator;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+import org.locationtech.jts.triangulate.quadedge.Vertex;
+import org.locationtech.jts.util.Debug;
+
+
+/**
+ * Computes a Conforming Delaunay Triangulation over a set of sites and a set of
+ * linear constraints.
+ * <p>
+ * A conforming Delaunay triangulation is a true Delaunay triangulation. In it
+ * each constraint segment is present as a union of one or more triangulation
+ * edges. Constraint segments may be subdivided into two or more triangulation
+ * edges by the insertion of additional sites. The additional sites are called
+ * Steiner points, and are necessary to allow the segments to be faithfully
+ * reflected in the triangulation while maintaining the Delaunay property.
+ * Another way of stating this is that in a conforming Delaunay triangulation
+ * every constraint segment will be the union of a subset of the triangulation
+ * edges (up to tolerance).
+ * <p>
+ * A Conforming Delaunay triangulation is distinct from a Constrained Delaunay triangulation.
+ * A Constrained Delaunay triangulation is not necessarily fully Delaunay,
+ * and it contains the constraint segments exactly as edges of the triangulation.
+ * <p>
+ * A typical usage pattern for the triangulator is:
+ * <pre>
+ * ConformingDelaunayTriangulator cdt = new ConformingDelaunayTriangulator(sites, tolerance);
+ *
+ * // optional
+ * cdt.setSplitPointFinder(splitPointFinder);
+ * cdt.setVertexFactory(vertexFactory);
+ *
+ * cdt.setConstraints(segments, new ArrayList(vertexMap.values()));
+ * cdt.formInitialDelaunay();
+ * cdt.enforceConstraints();
+ * subdiv = cdt.getSubdivision();
+ * </pre>
+ *
+ * @author David Skea
+ * @author Martin Davis
+ */
+public class ConformingDelaunayTriangulator
+{
+ private static Envelope computeVertexEnvelope(Collection vertices) {
+ Envelope env = new Envelope();
+ for (Iterator i = vertices.iterator(); i.hasNext();) {
+ Vertex v = (Vertex) i.next();
+ env.expandToInclude(v.getCoordinate());
+ }
+ return env;
+ }
+
+ private List initialVertices; // List<Vertex>
+ private List segVertices; // List<Vertex>
+
+ // MD - using a Set doesn't seem to be much faster
+ // private Set segments = new HashSet();
+ private List segments = new ArrayList(); // List<Segment>
+ private QuadEdgeSubdivision subdiv = null;
+ private IncrementalDelaunayTriangulator incDel;
+ private Geometry convexHull;
+ private ConstraintSplitPointFinder splitFinder = new NonEncroachingSplitPointFinder();
+ private KdTree kdt = null;
+ private ConstraintVertexFactory vertexFactory = null;
+
+ // allPointsEnv expanded by a small buffer
+ private Envelope computeAreaEnv;
+ // records the last split point computed, for error reporting
+ private Coordinate splitPt = null;
+
+ private double tolerance; // defines if two sites are the same.
+
+ /**
+ * Creates a Conforming Delaunay Triangulation based on the given
+ * unconstrained initial vertices. The initial vertex set should not contain
+ * any vertices which appear in the constraint set.
+ *
+ * @param initialVertices
+ * a collection of {@link ConstraintVertex}
+ * @param tolerance
+ * the distance tolerance below which points are considered identical
+ */
+ public ConformingDelaunayTriangulator(Collection initialVertices,
+ double tolerance) {
+ this.initialVertices = new ArrayList(initialVertices);
+ this.tolerance = tolerance;
+ kdt = new KdTree(tolerance);
+ }
+
+ /**
+ * Sets the constraints to be conformed to by the computed triangulation.
+ * The constraints must not contain duplicate segments (up to orientation).
+ * The unique set of vertices (as {@link ConstraintVertex}es)
+ * forming the constraints must also be supplied.
+ * Supplying it explicitly allows the ConstraintVertexes to be initialized
+ * appropriately (e.g. with external data), and avoids re-computing the unique set
+ * if it is already available.
+ *
+ * @param segments a list of the constraint {@link Segment}s
+ * @param segVertices the set of unique {@link ConstraintVertex}es referenced by the segments
+ */
+ public void setConstraints(List segments, List segVertices) {
+ this.segments = segments;
+ this.segVertices = segVertices;
+ }
+
+ /**
+ * Sets the {@link ConstraintSplitPointFinder} to be
+ * used during constraint enforcement.
+ * Different splitting strategies may be appropriate
+ * for special situations.
+ *
+ * @param splitFinder the ConstraintSplitPointFinder to be used
+ */
+ public void setSplitPointFinder(ConstraintSplitPointFinder splitFinder) {
+ this.splitFinder = splitFinder;
+ }
+
+ /**
+ * Gets the tolerance value used to construct the triangulation.
+ *
+ * @return a tolerance value
+ */
+ public double getTolerance()
+ {
+ return tolerance;
+ }
+
+ /**
+ * Gets the <tt>ConstraintVertexFactory</tt> used to create new constraint vertices at split points.
+ *
+ * @return a new constraint vertex
+ */
+ public ConstraintVertexFactory getVertexFactory() {
+ return vertexFactory;
+ }
+
+ /**
+ * Sets a custom {@link ConstraintVertexFactory} to be used
+ * to allow vertices carrying extra information to be created.
+ *
+ * @param vertexFactory the ConstraintVertexFactory to be used
+ */
+ public void setVertexFactory(ConstraintVertexFactory vertexFactory) {
+ this.vertexFactory = vertexFactory;
+ }
+
+ /**
+ * Gets the {@link QuadEdgeSubdivision} which represents the triangulation.
+ *
+ * @return a subdivision
+ */
+ public QuadEdgeSubdivision getSubdivision() {
+ return subdiv;
+ }
+
+ /**
+ * Gets the {@link KdTree} which contains the vertices of the triangulation.
+ *
+ * @return a KdTree
+ */
+ public KdTree getKDT() {
+ return kdt;
+ }
+
+ /**
+ * Gets the sites (vertices) used to initialize the triangulation.
+ *
+ * @return a List of Vertex
+ */
+ public List getInitialVertices() {
+ return initialVertices;
+ }
+
+ /**
+ * Gets the {@link Segment}s which represent the constraints.
+ *
+ * @return a collection of Segments
+ */
+ public Collection getConstraintSegments() {
+ return segments;
+ }
+
+ /**
+ * Gets the convex hull of all the sites in the triangulation,
+ * including constraint vertices.
+ * Only valid after the constraints have been enforced.
+ *
+ * @return the convex hull of the sites
+ */
+ public Geometry getConvexHull() {
+ return convexHull;
+ }
+
+ // ==================================================================
+
+ private void computeBoundingBox() {
+ Envelope vertexEnv = computeVertexEnvelope(initialVertices);
+ Envelope segEnv = computeVertexEnvelope(segVertices);
+
+ Envelope allPointsEnv = new Envelope(vertexEnv);
+ allPointsEnv.expandToInclude(segEnv);
+
+ double deltaX = allPointsEnv.getWidth() * 0.2;
+ double deltaY = allPointsEnv.getHeight() * 0.2;
+
+ double delta = Math.max(deltaX, deltaY);
+
+ computeAreaEnv = new Envelope(allPointsEnv);
+ computeAreaEnv.expandBy(delta);
+ }
+
+ private void computeConvexHull() {
+ GeometryFactory fact = new GeometryFactory();
+ Coordinate[] coords = getPointArray();
+ ConvexHull hull = new ConvexHull(coords, fact);
+ convexHull = hull.getConvexHull();
+ }
+
+ // /**
+ // * Adds the segments in the Convex Hull of all sites in the input data as
+ // linear constraints.
+ // * This is required if TIN Refinement is performed. The hull segments are
+ // flagged with a
+ // unique
+ // * data object to allow distinguishing them.
+ // *
+ // * @param convexHullSegmentData the data object to attach to each convex
+ // hull segment
+ // */
+ // private void addConvexHullToConstraints(Object convexHullSegmentData) {
+ // Coordinate[] coords = convexHull.getCoordinates();
+ // for (int i = 1; i < coords.length; i++) {
+ // Segment s = new Segment(coords[i - 1], coords[i], convexHullSegmentData);
+ // addConstraintIfUnique(s);
+ // }
+ // }
+
+ // private void addConstraintIfUnique(Segment r) {
+ // boolean exists = false;
+ // Iterator it = segments.iterator();
+ // Segment s = null;
+ // while (it.hasNext()) {
+ // s = (Segment) it.next();
+ // if (r.equalsTopo(s)) {
+ // exists = true;
+ // }
+ // }
+ // if (!exists) {
+ // segments.add((Object) r);
+ // }
+ // }
+
+ private Coordinate[] getPointArray() {
+ Coordinate[] pts = new Coordinate[initialVertices.size()
+ + segVertices.size()];
+ int index = 0;
+ for (Iterator i = initialVertices.iterator(); i.hasNext();) {
+ Vertex v = (Vertex) i.next();
+ pts[index++] = v.getCoordinate();
+ }
+ for (Iterator i2 = segVertices.iterator(); i2.hasNext();) {
+ Vertex v = (Vertex) i2.next();
+ pts[index++] = v.getCoordinate();
+ }
+ return pts;
+ }
+
+ private ConstraintVertex createVertex(Coordinate p) {
+ ConstraintVertex v = null;
+ if (vertexFactory != null)
+ v = vertexFactory.createVertex(p, null);
+ else
+ v = new ConstraintVertex(p);
+ return v;
+ }
+
+ /**
+ * Creates a vertex on a constraint segment
+ *
+ * @param p the location of the vertex to create
+ * @param seg the constraint segment it lies on
+ * @return the new constraint vertex
+ */
+ private ConstraintVertex createVertex(Coordinate p, Segment seg) {
+ ConstraintVertex v = null;
+ if (vertexFactory != null)
+ v = vertexFactory.createVertex(p, seg);
+ else
+ v = new ConstraintVertex(p);
+ v.setOnConstraint(true);
+ return v;
+ }
+
+ /**
+ * Inserts all sites in a collection
+ *
+ * @param vertices a collection of ConstraintVertex
+ */
+ private void insertSites(Collection vertices) {
+ Debug.println("Adding sites: " + vertices.size());
+ for (Iterator i = vertices.iterator(); i.hasNext();) {
+ ConstraintVertex v = (ConstraintVertex) i.next();
+ insertSite(v);
+ }
+ }
+
+ private ConstraintVertex insertSite(ConstraintVertex v) {
+ KdNode kdnode = kdt.insert(v.getCoordinate(), v);
+ if (!kdnode.isRepeated()) {
+ incDel.insertSite(v);
+ } else {
+ ConstraintVertex snappedV = (ConstraintVertex) kdnode.getData();
+ snappedV.merge(v);
+ return snappedV;
+ // testing
+ // if ( v.isOnConstraint() && ! currV.isOnConstraint()) {
+ // System.out.println(v);
+ // }
+ }
+ return v;
+ }
+
+ /**
+ * Inserts a site into the triangulation, maintaining the conformal Delaunay property.
+ * This can be used to further refine the triangulation if required
+ * (e.g. to approximate the medial axis of the constraints,
+ * or to improve the grading of the triangulation).
+ *
+ * @param p the location of the site to insert
+ */
+ public void insertSite(Coordinate p) {
+ insertSite(createVertex(p));
+ }
+
+ // ==================================================================
+
+ /**
+ * Computes the Delaunay triangulation of the initial sites.
+ */
+ public void formInitialDelaunay() {
+ computeBoundingBox();
+ subdiv = new QuadEdgeSubdivision(computeAreaEnv, tolerance);
+ subdiv.setLocator(new LastFoundQuadEdgeLocator(subdiv));
+ incDel = new IncrementalDelaunayTriangulator(subdiv);
+ insertSites(initialVertices);
+ }
+
+ // ==================================================================
+
+ private final static int MAX_SPLIT_ITER = 99;
+
+ /**
+ * Enforces the supplied constraints into the triangulation.
+ *
+ * @throws ConstraintEnforcementException
+ * if the constraints cannot be enforced
+ */
+ public void enforceConstraints() {
+ addConstraintVertices();
+ // if (true) return;
+
+ int count = 0;
+ int splits = 0;
+ do {
+ splits = enforceGabriel(segments);
+
+ count++;
+ Debug.println("Iter: " + count + " Splits: " + splits
+ + " Current # segments = " + segments.size());
+ } while (splits > 0 && count < MAX_SPLIT_ITER);
+ if (count == MAX_SPLIT_ITER) {
+ Debug.println("ABORTED! Too many iterations while enforcing constraints");
+ if (!Debug.isDebugging())
+ throw new ConstraintEnforcementException(
+ "Too many splitting iterations while enforcing constraints. Last split point was at: ",
+ splitPt);
+ }
+ }
+
+ private void addConstraintVertices() {
+ computeConvexHull();
+ // insert constraint vertices as sites
+ insertSites(segVertices);
+ }
+
+ /*
+ * private List findMissingConstraints() { List missingSegs = new ArrayList();
+ * for (int i = 0; i < segments.size(); i++) { Segment s = (Segment)
+ * segments.get(i); QuadEdge q = subdiv.locate(s.getStart(), s.getEnd()); if
+ * (q == null) missingSegs.add(s); } return missingSegs; }
+ */
+
+ private int enforceGabriel(Collection segsToInsert) {
+ List newSegments = new ArrayList();
+ int splits = 0;
+ List segsToRemove = new ArrayList();
+
+ /**
+ * On each iteration must always scan all constraint (sub)segments, since
+ * some constraints may be rebroken by Delaunay triangle flipping caused by
+ * insertion of another constraint. However, this process must converge
+ * eventually, with no splits remaining to find.
+ */
+ for (Iterator i = segsToInsert.iterator(); i.hasNext();) {
+ Segment seg = (Segment) i.next();
+ // System.out.println(seg);
+
+ Coordinate encroachPt = findNonGabrielPoint(seg);
+ // no encroachment found - segment must already be in subdivision
+ if (encroachPt == null)
+ continue;
+
+ // compute split point
+ splitPt = splitFinder.findSplitPoint(seg, encroachPt);
+ ConstraintVertex splitVertex = createVertex(splitPt, seg);
+
+ // DebugFeature.addLineSegment(DEBUG_SEG_SPLIT, encroachPt, splitPt, "");
+ // Debug.println(WKTWriter.toLineString(encroachPt, splitPt));
+
+ /**
+ * Check whether the inserted point still equals the split pt. This will
+ * not be the case if the split pt was too close to an existing site. If
+ * the point was snapped, the triangulation will not respect the inserted
+ * constraint - this is a failure. This can be caused by:
+ * <ul>
+ * <li>An initial site that lies very close to a constraint segment The
+ * cure for this is to remove any initial sites which are close to
+ * constraint segments in a preprocessing phase.
+ * <li>A narrow constraint angle which causing repeated splitting until
+ * the split segments are too small. The cure for this is to either choose
+ * better split points or "guard" narrow angles by cracking the segments
+ * equidistant from the corner.
+ * </ul>
+ */
+ ConstraintVertex insertedVertex = insertSite(splitVertex);
+ if (!insertedVertex.getCoordinate().equals2D(splitPt)) {
+ Debug.println("Split pt snapped to: " + insertedVertex);
+ // throw new ConstraintEnforcementException("Split point snapped to
+ // existing point
+ // (tolerance too large or constraint interior narrow angle?)",
+ // splitPt);
+ }
+
+ // split segment and record the new halves
+ Segment s1 = new Segment(seg.getStartX(), seg.getStartY(), seg
+ .getStartZ(), splitVertex.getX(), splitVertex.getY(), splitVertex
+ .getZ(), seg.getData());
+ Segment s2 = new Segment(splitVertex.getX(), splitVertex.getY(),
+ splitVertex.getZ(), seg.getEndX(), seg.getEndY(), seg.getEndZ(), seg
+ .getData());
+ newSegments.add(s1);
+ newSegments.add(s2);
+ segsToRemove.add(seg);
+
+ splits = splits + 1;
+ }
+ segsToInsert.removeAll(segsToRemove);
+ segsToInsert.addAll(newSegments);
+
+ return splits;
+ }
+
+// public static final String DEBUG_SEG_SPLIT = "C:\\proj\\CWB\\test\\segSplit.jml";
+
+ /**
+ * Given a set of points stored in the kd-tree and a line segment defined by
+ * two points in this set, finds a {@link Coordinate} in the circumcircle of
+ * the line segment, if one exists. This is called the Gabriel point - if none
+ * exists then the segment is said to have the Gabriel condition. Uses the
+ * heuristic of finding the non-Gabriel point closest to the midpoint of the
+ * segment.
+ *
+ * @param p
+ * start of the line segment
+ * @param q
+ * end of the line segment
+ * @return a point which is non-Gabriel
+ * or null if no point is non-Gabriel
+ */
+ private Coordinate findNonGabrielPoint(Segment seg) {
+ Coordinate p = seg.getStart();
+ Coordinate q = seg.getEnd();
+ // Find the mid point on the line and compute the radius of enclosing circle
+ Coordinate midPt = new Coordinate((p.x + q.x) / 2.0, (p.y + q.y) / 2.0);
+ double segRadius = p.distance(midPt);
+
+ // compute envelope of circumcircle
+ Envelope env = new Envelope(midPt);
+ env.expandBy(segRadius);
+ // Find all points in envelope
+ List result = kdt.query(env);
+
+ // For each point found, test if it falls strictly in the circle
+ // find closest point
+ Coordinate closestNonGabriel = null;
+ double minDist = Double.MAX_VALUE;
+ for (Iterator i = result.iterator(); i.hasNext();) {
+ KdNode nextNode = (KdNode) i.next();
+ Coordinate testPt = nextNode.getCoordinate();
+ // ignore segment endpoints
+ if (testPt.equals2D(p) || testPt.equals2D(q))
+ continue;
+
+ double testRadius = midPt.distance(testPt);
+ if (testRadius < segRadius) {
+ // double testDist = seg.distance(testPt);
+ double testDist = testRadius;
+ if (closestNonGabriel == null || testDist < minDist) {
+ closestNonGabriel = testPt;
+ minDist = testDist;
+ }
+ }
+ }
+ return closestNonGabriel;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintEnforcementException.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintEnforcementException.java
new file mode 100644
index 0000000..36d4bad
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintEnforcementException.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.io.WKTWriter;
+
+/**
+ * Indicates a failure during constraint enforcement.
+ *
+ * @author Martin Davis
+ * @version 1.0
+ */
+public class ConstraintEnforcementException extends RuntimeException {
+
+ private static final long serialVersionUID = 386496846550080140L;
+
+ private static String msgWithCoord(String msg, Coordinate pt) {
+ if (pt != null)
+ return msg + " [ " + WKTWriter.toPoint(pt) + " ]";
+ return msg;
+ }
+
+ private Coordinate pt = null;
+
+ /**
+ * Creates a new instance with a given message.
+ *
+ * @param msg a string
+ */
+ public ConstraintEnforcementException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Creates a new instance with a given message and approximate location.
+ *
+ * @param msg a string
+ * @param pt the location of the error
+ */
+ public ConstraintEnforcementException(String msg, Coordinate pt) {
+ super(msgWithCoord(msg, pt));
+ this.pt = new Coordinate(pt);
+ }
+
+ /**
+ * Gets the approximate location of this error.
+ *
+ * @return a location
+ */
+ public Coordinate getCoordinate() {
+ return pt;
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintSplitPointFinder.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintSplitPointFinder.java
new file mode 100644
index 0000000..31582a3
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintSplitPointFinder.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * An interface for strategies for determining the location of split points on constraint segments.
+ * The location of split points has a large effect on the performance and robustness of enforcing a
+ * constrained Delaunay triangulation. Poorly chosen split points can cause repeated splitting,
+ * especially at narrow constraint angles, since the split point will end up encroaching on the
+ * segment containing the original encroaching point. With detailed knowledge of the geometry of the
+ * constraints, it is sometimes possible to choose better locations for splitting.
+ *
+ * @author mbdavis
+ */
+public interface ConstraintSplitPointFinder {
+ /**
+ * Finds a point at which to split an encroached segment to allow the original segment to appear
+ * as edges in a constrained Delaunay triangulation.
+ *
+ * @param seg the encroached segment
+ * @param encroachPt the encroaching point
+ * @return the point at which to split the encroached segment
+ */
+ Coordinate findSplitPoint(Segment seg, Coordinate encroachPt);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintVertex.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintVertex.java
new file mode 100644
index 0000000..e6293ce
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintVertex.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate;
+
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.triangulate.quadedge.Vertex;
+
+/**
+ * A vertex in a Constrained Delaunay Triangulation.
+ * The vertex may or may not lie on a constraint.
+ * If it does it may carry extra information about the original constraint.
+ *
+ * @author Martin Davis
+ */
+public class ConstraintVertex extends Vertex {
+ private boolean isOnConstraint;
+ private Object constraint = null;
+
+ /**
+ * Creates a new constraint vertex
+ *
+ * @param p the location of the vertex
+ */
+ public ConstraintVertex(Coordinate p) {
+ super(p);
+ }
+
+ /**
+ * Sets whether this vertex lies on a constraint.
+ *
+ * @param isOnConstraint true if this vertex lies on a constraint
+ */
+ public void setOnConstraint(boolean isOnConstraint) {
+ this.isOnConstraint = isOnConstraint;
+ }
+
+ /**
+ * Tests whether this vertex lies on a constraint.
+ *
+ * @return true if the vertex lies on a constraint
+ */
+ public boolean isOnConstraint() {
+ return isOnConstraint;
+ }
+
+ /**
+ * Sets the external constraint information
+ *
+ * @param constraint an object which carries information about the constraint this vertex lies on
+ */
+ public void setConstraint(Object constraint) {
+ isOnConstraint = true;
+ this.constraint = constraint;
+ }
+
+ /**
+ * Gets the external constraint object
+ *
+ * @return the external constraint object
+ */
+ public Object getConstraint() {
+ return constraint;
+ }
+
+ /**
+ * Merges the constraint data in the vertex <tt>other</tt> into this vertex.
+ * This method is called when an inserted vertex is
+ * very close to an existing vertex in the triangulation.
+ *
+ * @param other the constraint vertex to merge
+ */
+ protected void merge(ConstraintVertex other) {
+ if (other.isOnConstraint) {
+ isOnConstraint = true;
+ constraint = other.constraint;
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintVertexFactory.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintVertexFactory.java
new file mode 100644
index 0000000..3415ed8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/ConstraintVertexFactory.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * An interface for factories which create a {@link ConstraintVertex}
+ *
+ * @author Martin Davis
+ */
+public interface ConstraintVertexFactory {
+ ConstraintVertex createVertex(Coordinate p, Segment constraintSeg);
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/DelaunayTriangulationBuilder.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/DelaunayTriangulationBuilder.java
new file mode 100644
index 0000000..ed531c0
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/DelaunayTriangulationBuilder.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+import org.locationtech.jts.triangulate.quadedge.Vertex;
+
+
+/**
+ * A utility class which creates Delaunay Triangulations
+ * from collections of points and extract the resulting
+ * triangulation edges or triangles as geometries.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DelaunayTriangulationBuilder
+{
+ /**
+ * Extracts the unique {@link Coordinate}s from the given {@link Geometry}.
+ * @param geom the geometry to extract from
+ * @return a List of the unique Coordinates
+ */
+ public static CoordinateList extractUniqueCoordinates(Geometry geom)
+ {
+ if (geom == null)
+ return new CoordinateList();
+
+ Coordinate[] coords = geom.getCoordinates();
+ return unique(coords);
+ }
+
+ public static CoordinateList unique(Coordinate[] coords)
+ {
+ Coordinate[] coordsCopy = CoordinateArrays.copyDeep(coords);
+ Arrays.sort(coordsCopy);
+ CoordinateList coordList = new CoordinateList(coordsCopy, false);
+ return coordList;
+ }
+
+ /**
+ * Converts all {@link Coordinate}s in a collection to {@link Vertex}es.
+ * @param coords the coordinates to convert
+ * @return a List of Vertex objects
+ */
+ public static List toVertices(Collection coords)
+ {
+ List verts = new ArrayList();
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate coord = (Coordinate) i.next();
+ verts.add(new Vertex(coord));
+ }
+ return verts;
+ }
+
+ /**
+ * Computes the {@link Envelope} of a collection of {@link Coordinate}s.
+ *
+ * @param coords a List of Coordinates
+ * @return the envelope of the set of coordinates
+ */
+ public static Envelope envelope(Collection coords)
+ {
+ Envelope env = new Envelope();
+ for (Iterator i = coords.iterator(); i.hasNext(); ) {
+ Coordinate coord = (Coordinate) i.next();
+ env.expandToInclude(coord);
+ }
+ return env;
+ }
+
+ private Collection siteCoords;
+ private double tolerance = 0.0;
+ private QuadEdgeSubdivision subdiv = null;
+
+ /**
+ * Creates a new triangulation builder.
+ *
+ */
+ public DelaunayTriangulationBuilder()
+ {
+ }
+
+ /**
+ * Sets the sites (vertices) which will be triangulated.
+ * All vertices of the given geometry will be used as sites.
+ *
+ * @param geom the geometry from which the sites will be extracted.
+ */
+ public void setSites(Geometry geom)
+ {
+ // remove any duplicate points (they will cause the triangulation to fail)
+ siteCoords = extractUniqueCoordinates(geom);
+ }
+
+ /**
+ * Sets the sites (vertices) which will be triangulated
+ * from a collection of {@link Coordinate}s.
+ *
+ * @param coords a collection of Coordinates.
+ */
+ public void setSites(Collection coords)
+ {
+ // remove any duplicate points (they will cause the triangulation to fail)
+ siteCoords = unique(CoordinateArrays.toCoordinateArray(coords));
+ }
+
+ /**
+ * Sets the snapping tolerance which will be used
+ * to improved the robustness of the triangulation computation.
+ * A tolerance of 0.0 specifies that no snapping will take place.
+ *
+ * @param tolerance the tolerance distance to use
+ */
+ public void setTolerance(double tolerance)
+ {
+ this.tolerance = tolerance;
+ }
+
+ private void create()
+ {
+ if (subdiv != null) return;
+
+ Envelope siteEnv = envelope(siteCoords);
+ List vertices = toVertices(siteCoords);
+ subdiv = new QuadEdgeSubdivision(siteEnv, tolerance);
+ IncrementalDelaunayTriangulator triangulator = new IncrementalDelaunayTriangulator(subdiv);
+ triangulator.insertSites(vertices);
+ }
+
+ /**
+ * Gets the {@link QuadEdgeSubdivision} which models the computed triangulation.
+ *
+ * @return the subdivision containing the triangulation
+ */
+ public QuadEdgeSubdivision getSubdivision()
+ {
+ create();
+ return subdiv;
+ }
+
+ /**
+ * Gets the edges of the computed triangulation as a {@link MultiLineString}.
+ *
+ * @param geomFact the geometry factory to use to create the output
+ * @return the edges of the triangulation
+ */
+ public Geometry getEdges(GeometryFactory geomFact)
+ {
+ create();
+ return subdiv.getEdges(geomFact);
+ }
+
+ /**
+ * Gets the faces of the computed triangulation as a {@link GeometryCollection}
+ * of {@link Polygon}.
+ *
+ * @param geomFact the geometry factory to use to create the output
+ * @return the faces of the triangulation
+ */
+ public Geometry getTriangles(GeometryFactory geomFact)
+ {
+ create();
+ return subdiv.getTriangles(geomFact);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/IncrementalDelaunayTriangulator.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/IncrementalDelaunayTriangulator.java
new file mode 100644
index 0000000..346f45b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/IncrementalDelaunayTriangulator.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.triangulate.quadedge.LocateFailureException;
+import org.locationtech.jts.triangulate.quadedge.QuadEdge;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+import org.locationtech.jts.triangulate.quadedge.Vertex;
+
+
+/**
+ * Computes a Delaunay Triangulation of a set of {@link Vertex}es, using an
+ * incremental insertion algorithm.
+ *
+ * @author Martin Davis
+ * @version 1.0
+ */
+public class IncrementalDelaunayTriangulator
+{
+ private QuadEdgeSubdivision subdiv;
+ private boolean isUsingTolerance = false;
+
+ /**
+ * Creates a new triangulator using the given {@link QuadEdgeSubdivision}.
+ * The triangulator uses the tolerance of the supplied subdivision.
+ *
+ * @param subdiv
+ * a subdivision in which to build the TIN
+ */
+ public IncrementalDelaunayTriangulator(QuadEdgeSubdivision subdiv) {
+ this.subdiv = subdiv;
+ isUsingTolerance = subdiv.getTolerance() > 0.0;
+
+ }
+
+ /**
+ * Inserts all sites in a collection. The inserted vertices <b>MUST</b> be
+ * unique up to the provided tolerance value. (i.e. no two vertices should be
+ * closer than the provided tolerance value). They do not have to be rounded
+ * to the tolerance grid, however.
+ *
+ * @param vertices a Collection of Vertex
+ *
+ * @throws LocateFailureException if the location algorithm fails to converge in a reasonable number of iterations
+ */
+ public void insertSites(Collection vertices) {
+ for (Iterator i = vertices.iterator(); i.hasNext();) {
+ Vertex v = (Vertex) i.next();
+ insertSite(v);
+ }
+ }
+
+ /**
+ * Inserts a new point into a subdivision representing a Delaunay
+ * triangulation, and fixes the affected edges so that the result is still a
+ * Delaunay triangulation.
+ * <p>
+ *
+ * @return a quadedge containing the inserted vertex
+ */
+ public QuadEdge insertSite(Vertex v) {
+
+ /**
+ * This code is based on Guibas and Stolfi (1985), with minor modifications
+ * and a bug fix from Dani Lischinski (Graphic Gems 1993). (The modification
+ * I believe is the test for the inserted site falling exactly on an
+ * existing edge. Without this test zero-width triangles have been observed
+ * to be created)
+ */
+ QuadEdge e = subdiv.locate(v);
+
+ if (subdiv.isVertexOfEdge(e, v)) {
+ // point is already in subdivision.
+ return e;
+ }
+ else if (subdiv.isOnEdge(e, v.getCoordinate())) {
+ // the point lies exactly on an edge, so delete the edge
+ // (it will be replaced by a pair of edges which have the point as a vertex)
+ e = e.oPrev();
+ subdiv.delete(e.oNext());
+ }
+
+ /**
+ * Connect the new point to the vertices of the containing triangle
+ * (or quadrilateral, if the new point fell on an existing edge.)
+ */
+ QuadEdge base = subdiv.makeEdge(e.orig(), v);
+ QuadEdge.splice(base, e);
+ QuadEdge startEdge = base;
+ do {
+ base = subdiv.connect(e, base.sym());
+ e = base.oPrev();
+ } while (e.lNext() != startEdge);
+
+ // Examine suspect edges to ensure that the Delaunay condition
+ // is satisfied.
+ do {
+ QuadEdge t = e.oPrev();
+ if (t.dest().rightOf(e) && v.isInCircle(e.orig(), t.dest(), e.dest())) {
+ QuadEdge.swap(e);
+ e = e.oPrev();
+ } else if (e.oNext() == startEdge) {
+ return base; // no more suspect edges.
+ } else {
+ e = e.oNext().lPrev();
+ }
+ } while (true);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/MidpointSplitPointFinder.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/MidpointSplitPointFinder.java
new file mode 100644
index 0000000..14c2d8e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/MidpointSplitPointFinder.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * A simple split point finder which returns the midpoint of the split segment. This is a default
+ * strategy only. Usually a more sophisticated strategy is required to prevent repeated splitting.
+ * Other points which could be used are:
+ * <ul>
+ * <li>The projection of the encroaching point on the segment
+ * <li>A point on the segment which will produce two segments which will not be further encroached
+ * <li>The point on the segment which is the same distance from an endpoint as the encroaching
+ * point
+ * </ul>
+ *
+ * @author Martin Davis
+ */
+public class MidpointSplitPointFinder implements ConstraintSplitPointFinder {
+ /**
+ * Gets the midpoint of the split segment
+ */
+ public Coordinate findSplitPoint(Segment seg, Coordinate encroachPt) {
+ Coordinate p0 = seg.getStart();
+ Coordinate p1 = seg.getEnd();
+ return new Coordinate((p0.x + p1.x) / 2, (p0.y + p1.y) / 2);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/NonEncroachingSplitPointFinder.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/NonEncroachingSplitPointFinder.java
new file mode 100644
index 0000000..93f9a2e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/NonEncroachingSplitPointFinder.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+
+/**
+ * A strategy for finding constraint split points which attempts to maximise the length of the split
+ * segments while preventing further encroachment. (This is not always possible for narrow angles).
+ *
+ * @author Martin Davis
+ */
+public class NonEncroachingSplitPointFinder implements ConstraintSplitPointFinder {
+
+ public NonEncroachingSplitPointFinder() {}
+
+ /**
+ * A basic strategy for finding split points when nothing extra is known about the geometry of
+ * the situation.
+ *
+ * @param seg the encroached segment
+ * @param encroachPt the encroaching point
+ * @return the point at which to split the encroached segment
+ */
+ public Coordinate findSplitPoint(Segment seg, Coordinate encroachPt) {
+ LineSegment lineSeg = seg.getLineSegment();
+ double segLen = lineSeg.getLength();
+ double midPtLen = segLen / 2;
+ SplitSegment splitSeg = new SplitSegment(lineSeg);
+
+ Coordinate projPt = projectedSplitPoint(seg, encroachPt);
+ /**
+ * Compute the largest diameter (length) that will produce a split segment which is not
+ * still encroached upon by the encroaching point (The length is reduced slightly by a
+ * safety factor)
+ */
+ double nonEncroachDiam = projPt.distance(encroachPt) * 2 * 0.8; // .99;
+ double maxSplitLen = nonEncroachDiam;
+ if (maxSplitLen > midPtLen) {
+ maxSplitLen = midPtLen;
+ }
+ splitSeg.setMinimumLength(maxSplitLen);
+
+ splitSeg.splitAt(projPt);
+
+ return splitSeg.getSplitPoint();
+ }
+
+ /**
+ * Computes a split point which is the projection of the encroaching point on the segment
+ *
+ * @param seg
+ * @param encroachPt
+ * @return a split point on the segment
+ */
+ public static Coordinate projectedSplitPoint(Segment seg, Coordinate encroachPt) {
+ LineSegment lineSeg = seg.getLineSegment();
+ Coordinate projPt = lineSeg.project(encroachPt);
+ return projPt;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/Segment.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/Segment.java
new file mode 100644
index 0000000..31be424
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/Segment.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+
+/**
+ * Models a constraint segment in a triangulation.
+ * A constraint segment is an oriented straight line segment between a start point
+ * and an end point.
+ *
+ * @author David Skea
+ * @author Martin Davis
+ */
+public class Segment
+{
+ private LineSegment ls;
+ private Object data = null;
+
+ /**
+ * Creates a new instance for the given ordinates.
+ */
+ public Segment(double x1, double y1, double z1, double x2, double y2, double z2) {
+ this(new Coordinate(x1, y1, z1), new Coordinate(x2, y2, z2));
+ }
+
+ /**
+ * Creates a new instance for the given ordinates, with associated external data.
+ */
+ public Segment(double x1, double y1, double z1, double x2, double y2, double z2, Object data) {
+ this(new Coordinate(x1, y1, z1), new Coordinate(x2, y2, z2), data);
+ }
+
+ /**
+ * Creates a new instance for the given points, with associated external data.
+ *
+ * @param p0 the start point
+ * @param p1 the end point
+ * @param data an external data object
+ */
+ public Segment(Coordinate p0, Coordinate p1, Object data) {
+ ls = new LineSegment(p0, p1);
+ this.data = data;
+ }
+
+ /**
+ * Creates a new instance for the given points.
+ *
+ * @param p0 the start point
+ * @param p1 the end point
+ */
+ public Segment(Coordinate p0, Coordinate p1) {
+ ls = new LineSegment(p0, p1);
+ }
+
+ /**
+ * Gets the start coordinate of the segment
+ *
+ * @return a Coordinate
+ */
+ public Coordinate getStart() {
+ return ls.getCoordinate(0);
+ }
+
+ /**
+ * Gets the end coordinate of the segment
+ *
+ * @return a Coordinate
+ */
+ public Coordinate getEnd() {
+ return ls.getCoordinate(1);
+ }
+
+ /**
+ * Gets the start X ordinate of the segment
+ *
+ * @return the X ordinate value
+ */
+ public double getStartX() {
+ Coordinate p = ls.getCoordinate(0);
+ return p.x;
+ }
+
+ /**
+ * Gets the start Y ordinate of the segment
+ *
+ * @return the Y ordinate value
+ */
+ public double getStartY() {
+ Coordinate p = ls.getCoordinate(0);
+ return p.y;
+ }
+
+ /**
+ * Gets the start Z ordinate of the segment
+ *
+ * @return the Z ordinate value
+ */
+ public double getStartZ() {
+ Coordinate p = ls.getCoordinate(0);
+ return p.z;
+ }
+
+ /**
+ * Gets the end X ordinate of the segment
+ *
+ * @return the X ordinate value
+ */
+ public double getEndX() {
+ Coordinate p = ls.getCoordinate(1);
+ return p.x;
+ }
+
+ /**
+ * Gets the end Y ordinate of the segment
+ *
+ * @return the Y ordinate value
+ */
+ public double getEndY() {
+ Coordinate p = ls.getCoordinate(1);
+ return p.y;
+ }
+
+ /**
+ * Gets the end Z ordinate of the segment
+ *
+ * @return the Z ordinate value
+ */
+ public double getEndZ() {
+ Coordinate p = ls.getCoordinate(1);
+ return p.z;
+ }
+
+ /**
+ * Gets a <tt>LineSegment</tt> modelling this segment.
+ *
+ * @return a LineSegment
+ */
+ public LineSegment getLineSegment() {
+ return ls;
+ }
+
+ /**
+ * Gets the external data associated with this segment
+ *
+ * @return a data object
+ */
+ public Object getData() {
+ return data;
+ }
+
+ /**
+ * Sets the external data to be associated with this segment
+ *
+ * @param data a data object
+ */
+ public void setData(Object data) {
+ this.data = data;
+ }
+
+ /**
+ * Determines whether two segments are topologically equal.
+ * I.e. equal up to orientation.
+ *
+ * @param s a segment
+ * @return true if the segments are topologically equal
+ */
+ public boolean equalsTopo(Segment s) {
+ return ls.equalsTopo(s.getLineSegment());
+ }
+
+ /**
+ * Computes the intersection point between this segment and another one.
+ *
+ * @param s a segment
+ * @return the intersection point, or <code>null</code> if there is none
+ */
+ public Coordinate intersection(Segment s) {
+ return ls.intersection(s.getLineSegment());
+ }
+
+ /**
+ * Computes a string representation of this segment.
+ *
+ * @return a string
+ */
+ public String toString() {
+ return ls.toString();
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/SplitSegment.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/SplitSegment.java
new file mode 100644
index 0000000..5d4c063
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/SplitSegment.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+
+/**
+ * Models a constraint segment which can be split in two in various ways,
+ * according to certain geometric constraints.
+ *
+ * @author Martin Davis
+ */
+public class SplitSegment {
+ /**
+ * Computes the {@link Coordinate} that lies a given fraction along the line defined by the
+ * reverse of the given segment. A fraction of <code>0.0</code> returns the end point of the
+ * segment; a fraction of <code>1.0</code> returns the start point of the segment.
+ *
+ * @param seg the LineSegment
+ * @param segmentLengthFraction the fraction of the segment length along the line
+ * @return the point at that distance
+ */
+ private static Coordinate pointAlongReverse(LineSegment seg, double segmentLengthFraction) {
+ Coordinate coord = new Coordinate();
+ coord.x = seg.p1.x - segmentLengthFraction * (seg.p1.x - seg.p0.x);
+ coord.y = seg.p1.y - segmentLengthFraction * (seg.p1.y - seg.p0.y);
+ return coord;
+ }
+
+ private LineSegment seg;
+ private double segLen;
+ private Coordinate splitPt;
+ private double minimumLen = 0.0;
+
+ public SplitSegment(LineSegment seg) {
+ this.seg = seg;
+ segLen = seg.getLength();
+ }
+
+ public void setMinimumLength(double minLen) {
+ minimumLen = minLen;
+ }
+
+ public Coordinate getSplitPoint() {
+ return splitPt;
+ }
+
+ public void splitAt(double length, Coordinate endPt) {
+ double actualLen = getConstrainedLength(length);
+ double frac = actualLen / segLen;
+ if (endPt.equals2D(seg.p0))
+ splitPt = seg.pointAlong(frac);
+ else
+ splitPt = pointAlongReverse(seg, frac);
+ }
+
+ public void splitAt(Coordinate pt) {
+ // check that given pt doesn't violate min length
+ double minFrac = minimumLen / segLen;
+ if (pt.distance(seg.p0) < minimumLen) {
+ splitPt = seg.pointAlong(minFrac);
+ return;
+ }
+ if (pt.distance(seg.p1) < minimumLen) {
+ splitPt = pointAlongReverse(seg, minFrac);
+ return;
+ }
+ // passes minimum distance check - use provided point as split pt
+ splitPt = pt;
+ }
+
+ private double getConstrainedLength(double len) {
+ if (len < minimumLen)
+ return minimumLen;
+ return len;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/VertexTaggedGeometryDataMapper.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/VertexTaggedGeometryDataMapper.java
new file mode 100644
index 0000000..bcd8476
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/VertexTaggedGeometryDataMapper.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Creates a map between the vertex {@link Coordinate}s of a
+ * set of {@link Geometry}s,
+ * and the parent geometry, and transfers the source geometry
+ * data objects to geometry components tagged with the coordinates.
+ * <p>
+ * This class can be used in conjunction with {@link VoronoiDiagramBuilder}
+ * to transfer data objects from the input site geometries
+ * to the constructed Voronoi polygons.
+ *
+ * @author Martin Davis
+ * @see VoronoiDiagramBuilder
+ *
+ */
+public class VertexTaggedGeometryDataMapper
+{
+ private Map coordDataMap = new TreeMap();
+
+ public VertexTaggedGeometryDataMapper()
+ {
+
+ }
+
+ public void loadSourceGeometries(Collection geoms)
+ {
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry geom = (Geometry) i.next();
+ loadVertices(geom.getCoordinates(), geom.getUserData());
+ }
+ }
+
+ public void loadSourceGeometries(Geometry geomColl)
+ {
+ for (int i = 0; i < geomColl.getNumGeometries(); i++) {
+ Geometry geom = geomColl.getGeometryN(i);
+ loadVertices(geom.getCoordinates(), geom.getUserData());
+ }
+ }
+
+ private void loadVertices(Coordinate[] pts, Object data)
+ {
+ for (int i = 0; i < pts.length; i++) {
+ coordDataMap.put(pts[i], data);
+ }
+ }
+
+ public List getCoordinates()
+ {
+ return new ArrayList(coordDataMap.keySet());
+ }
+
+ /**
+ * Input is assumed to be a multiGeometry
+ * in which every component has its userData
+ * set to be a Coordinate which is the key to the output data.
+ * The Coordinate is used to determine
+ * the output data object to be written back into the component.
+ *
+ * @param targetGeom
+ */
+ public void transferData(Geometry targetGeom)
+ {
+ for (int i = 0; i < targetGeom.getNumGeometries(); i++) {
+ Geometry geom = targetGeom.getGeometryN(i);
+ Coordinate vertexKey = (Coordinate) geom.getUserData();
+ if (vertexKey == null) continue;
+ geom.setUserData(coordDataMap.get(vertexKey));
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/VoronoiDiagramBuilder.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/VoronoiDiagramBuilder.java
new file mode 100644
index 0000000..10b457a
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/VoronoiDiagramBuilder.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+
+
+/**
+ * A utility class which creates Voronoi Diagrams
+ * from collections of points.
+ * The diagram is returned as a {@link GeometryCollection} of {@link Polygon}s
+ * representing the faces of the Voronoi diagram.
+ * The faces are clipped to the larger of:
+ * <ul>
+ * <li> an envelope supplied by {@link #setClipEnvelope(Envelope)}
+ * <li> an envelope determined by the input sites
+ * </ul>
+ * The <tt>userData</tt> attribute of each face <tt>Polygon</tt> is set to
+ * the <tt>Coordinate</tt> of the corresponding input site.
+ * This allows using a <tt>Map</tt> to link faces to data associated with sites.
+ *
+ * @author Martin Davis
+ *
+ */
+public class VoronoiDiagramBuilder
+{
+ private Collection siteCoords;
+ private double tolerance = 0.0;
+ private QuadEdgeSubdivision subdiv = null;
+ private Envelope clipEnv = null;
+ private Envelope diagramEnv = null;
+
+ /**
+ * Creates a new Voronoi diagram builder.
+ *
+ */
+ public VoronoiDiagramBuilder()
+ {
+ }
+
+ /**
+ * Sets the sites (point or vertices) which will be diagrammed.
+ * All vertices of the given geometry will be used as sites.
+ *
+ * @param geom the geometry from which the sites will be extracted.
+ */
+ public void setSites(Geometry geom)
+ {
+ // remove any duplicate points (they will cause the triangulation to fail)
+ siteCoords = DelaunayTriangulationBuilder.extractUniqueCoordinates(geom);
+ }
+
+ /**
+ * Sets the sites (point or vertices) which will be diagrammed
+ * from a collection of {@link Coordinate}s.
+ *
+ * @param coords a collection of Coordinates.
+ */
+ public void setSites(Collection coords)
+ {
+ // remove any duplicate points (they will cause the triangulation to fail)
+ siteCoords = DelaunayTriangulationBuilder.unique(CoordinateArrays.toCoordinateArray(coords));
+ }
+
+ /**
+ * Sets the envelope to clip the diagram to.
+ * The diagram will be clipped to the larger
+ * of this envelope or an envelope surrounding the sites.
+ *
+ * @param clipEnv the clip envelope.
+ */
+ public void setClipEnvelope(Envelope clipEnv)
+ {
+ this.clipEnv = clipEnv;
+ }
+ /**
+ * Sets the snapping tolerance which will be used
+ * to improved the robustness of the triangulation computation.
+ * A tolerance of 0.0 specifies that no snapping will take place.
+ *
+ * @param tolerance the tolerance distance to use
+ */
+ public void setTolerance(double tolerance)
+ {
+ this.tolerance = tolerance;
+ }
+
+ private void create()
+ {
+ if (subdiv != null) return;
+
+ Envelope siteEnv = DelaunayTriangulationBuilder.envelope(siteCoords);
+ diagramEnv = siteEnv;
+ // add a buffer around the final envelope
+ double expandBy = Math.max(diagramEnv.getWidth(), diagramEnv.getHeight());
+ diagramEnv.expandBy(expandBy);
+ if (clipEnv != null)
+ diagramEnv.expandToInclude(clipEnv);
+
+ List vertices = DelaunayTriangulationBuilder.toVertices(siteCoords);
+ subdiv = new QuadEdgeSubdivision(siteEnv, tolerance);
+ IncrementalDelaunayTriangulator triangulator = new IncrementalDelaunayTriangulator(subdiv);
+ triangulator.insertSites(vertices);
+ }
+
+ /**
+ * Gets the {@link QuadEdgeSubdivision} which models the computed diagram.
+ *
+ * @return the subdivision containing the triangulation
+ */
+ public QuadEdgeSubdivision getSubdivision()
+ {
+ create();
+ return subdiv;
+ }
+
+ /**
+ * Gets the faces of the computed diagram as a {@link GeometryCollection}
+ * of {@link Polygon}s, clipped as specified.
+ * <p>
+ * The <tt>userData</tt> attribute of each face <tt>Polygon</tt> is set to
+ * the <tt>Coordinate</tt> of the corresponding input site.
+ * This allows using a <tt>Map</tt> to link faces to data associated with sites.
+ *
+ * @param geomFact the geometry factory to use to create the output
+ * @return a <tt>GeometryCollection</tt> containing the face <tt>Polygon</tt>s of the diagram
+ */
+ public Geometry getDiagram(GeometryFactory geomFact)
+ {
+ create();
+ Geometry polys = subdiv.getVoronoiDiagram(geomFact);
+
+ // clip polys to diagramEnv
+ return clipGeometryCollection(polys, diagramEnv);
+ }
+
+ private static Geometry clipGeometryCollection(Geometry geom, Envelope clipEnv)
+ {
+ Geometry clipPoly = geom.getFactory().toGeometry(clipEnv);
+ List clipped = new ArrayList();
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ Geometry g = geom.getGeometryN(i);
+ Geometry result = null;
+ // don't clip unless necessary
+ if (clipEnv.contains(g.getEnvelopeInternal()))
+ result = g;
+ else if (clipEnv.intersects(g.getEnvelopeInternal())) {
+ result = clipPoly.intersection(g);
+ // keep vertex key info
+ result.setUserData(g.getUserData());
+ }
+
+ if (result != null && ! result.isEmpty()) {
+ clipped.add(result);
+ }
+ }
+ return geom.getFactory().createGeometryCollection(GeometryFactory.toGeometryArray(clipped));
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/package.html b/modules/core/src/main/java/org/locationtech/jts/triangulate/package.html
new file mode 100644
index 0000000..d49fa04
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/package.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to compute Delaunay triangulations.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/EdgeConnectedTriangleTraversal.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/EdgeConnectedTriangleTraversal.java
new file mode 100644
index 0000000..165d39e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/EdgeConnectedTriangleTraversal.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ * A framework to visit sets of edge-connected {@link QuadEdgeTriangle}s in breadth-first order
+ *
+ * @author Martin Davis
+ * @version 1.0
+ */
+public class EdgeConnectedTriangleTraversal {
+ private LinkedList triQueue = new LinkedList();
+
+ public EdgeConnectedTriangleTraversal() {}
+
+ public void init(QuadEdgeTriangle tri) {
+ triQueue.addLast(tri);
+ }
+
+ /**
+ * Called to initialize the traversal queue with a given set of {@link QuadEdgeTriangle}s
+ *
+ * @param tris a collection of QuadEdgeTriangle
+ */
+ public void init(Collection tris) {
+ triQueue.addAll(tris);
+ }
+
+ /**
+ * Subclasses can call this method to add a triangle to the end of the queue. This is useful for
+ * initializing the queue to a chosen set of triangles.
+ *
+ * @param tri a triangle
+ */
+ /*
+ * protected void addLast(QuadEdgeTriangle tri) { triQueue.addLast(tri); }
+ */
+
+ /**
+ * Subclasses call this method to perform the visiting process.
+ */
+ public void visitAll(TraversalVisitor visitor) {
+ while (!triQueue.isEmpty()) {
+ QuadEdgeTriangle tri = (QuadEdgeTriangle) triQueue.removeFirst();
+ process(tri, visitor);
+ }
+ }
+
+ private void process(QuadEdgeTriangle currTri, TraversalVisitor visitor) {
+ currTri.getNeighbours();
+ for (int i = 0; i < 3; i++) {
+ QuadEdgeTriangle neighTri = (QuadEdgeTriangle) currTri.getEdge(i).sym().getData();
+ if (neighTri == null)
+ continue;
+ if (visitor.visit(currTri, i, neighTri))
+ triQueue.addLast(neighTri);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/LastFoundQuadEdgeLocator.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/LastFoundQuadEdgeLocator.java
new file mode 100644
index 0000000..571e427
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/LastFoundQuadEdgeLocator.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+import java.util.Collection;
+
+/**
+ * Locates {@link QuadEdge}s in a {@link QuadEdgeSubdivision},
+ * optimizing the search by starting in the
+ * locality of the last edge found.
+ *
+ * @author Martin Davis
+ */
+public class LastFoundQuadEdgeLocator implements QuadEdgeLocator {
+ private QuadEdgeSubdivision subdiv;
+ private QuadEdge lastEdge = null;
+
+ public LastFoundQuadEdgeLocator(QuadEdgeSubdivision subdiv) {
+ this.subdiv = subdiv;
+ init();
+ }
+
+ private void init() {
+ lastEdge = findEdge();
+ }
+
+ private QuadEdge findEdge() {
+ Collection edges = subdiv.getEdges();
+ // assume there is an edge - otherwise will get an exception
+ return (QuadEdge) edges.iterator().next();
+ }
+
+ /**
+ * Locates an edge e, such that either v is on e, or e is an edge of a triangle containing v.
+ * The search starts from the last located edge and proceeds on the general direction of v.
+ */
+ public QuadEdge locate(Vertex v) {
+ if (! lastEdge.isLive()) {
+ init();
+ }
+
+ QuadEdge e = subdiv.locateFromEdge(v, lastEdge);
+ lastEdge = e;
+ return e;
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/LocateFailureException.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/LocateFailureException.java
new file mode 100644
index 0000000..b52a3cb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/LocateFailureException.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate.quadedge;
+
+import org.locationtech.jts.geom.LineSegment;
+
+public class LocateFailureException
+ extends RuntimeException
+{
+ private static String msgWithSpatial(String msg, LineSegment seg) {
+ if (seg != null)
+ return msg + " [ " + seg + " ]";
+ return msg;
+ }
+
+ private LineSegment seg = null;
+
+ public LocateFailureException(String msg) {
+ super(msg);
+ }
+
+ public LocateFailureException(String msg, LineSegment seg) {
+ super(msgWithSpatial(msg, seg));
+ this.seg = new LineSegment(seg);
+ }
+
+ public LocateFailureException(LineSegment seg) {
+ super(
+ "Locate failed to converge (at edge: "
+ + seg
+ + "). Possible causes include invalid Subdivision topology or very close sites");
+ this.seg = new LineSegment(seg);
+ }
+
+ public LineSegment getSegment() {
+ return seg;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdge.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdge.java
new file mode 100644
index 0000000..266546f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdge.java
@@ -0,0 +1,414 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.io.WKTWriter;
+
+/**
+ * A class that represents the edge data structure which implements the quadedge algebra.
+ * The quadedge algebra was described in a well-known paper by Guibas and Stolfi,
+ * "Primitives for the manipulation of general subdivisions and the computation of Voronoi diagrams",
+ * <i>ACM Transactions on Graphics</i>, 4(2), 1985, 75-123.
+ * <p>
+ * Each edge object is part of a quartet of 4 edges,
+ * linked via their <tt>rot</tt> references.
+ * Any edge in the group may be accessed using a series of {@link #rot()} operations.
+ * Quadedges in a subdivision are linked together via their <tt>next</tt> references.
+ * The linkage between the quadedge quartets determines the topology
+ * of the subdivision.
+ * <p>
+ * The edge class does not contain separate information for vertices or faces; a vertex is implicitly
+ * defined as a ring of edges (created using the <tt>next</tt> field).
+ *
+ * @author David Skea
+ * @author Martin Davis
+ */
+public class QuadEdge
+{
+ /**
+ * Creates a new QuadEdge quartet from {@link Vertex} o to {@link Vertex} d.
+ *
+ * @param o
+ * the origin Vertex
+ * @param d
+ * the destination Vertex
+ * @return the new QuadEdge quartet
+ */
+ public static QuadEdge makeEdge(Vertex o, Vertex d) {
+ QuadEdge q0 = new QuadEdge();
+ QuadEdge q1 = new QuadEdge();
+ QuadEdge q2 = new QuadEdge();
+ QuadEdge q3 = new QuadEdge();
+
+ q0.rot = q1;
+ q1.rot = q2;
+ q2.rot = q3;
+ q3.rot = q0;
+
+ q0.setNext(q0);
+ q1.setNext(q3);
+ q2.setNext(q2);
+ q3.setNext(q1);
+
+ QuadEdge base = q0;
+ base.setOrig(o);
+ base.setDest(d);
+ return base;
+ }
+
+ /**
+ * Creates a new QuadEdge connecting the destination of a to the origin of
+ * b, in such a way that all three have the same left face after the
+ * connection is complete. Additionally, the data pointers of the new edge
+ * are set.
+ *
+ * @return the connected edge.
+ */
+ public static QuadEdge connect(QuadEdge a, QuadEdge b) {
+ QuadEdge e = makeEdge(a.dest(), b.orig());
+ splice(e, a.lNext());
+ splice(e.sym(), b);
+ return e;
+ }
+
+ /**
+ * Splices two edges together or apart.
+ * Splice affects the two edge rings around the origins of a and b, and, independently, the two
+ * edge rings around the left faces of <tt>a</tt> and <tt>b</tt>.
+ * In each case, (i) if the two rings are distinct,
+ * Splice will combine them into one, or (ii) if the two are the same ring, Splice will break it
+ * into two separate pieces. Thus, Splice can be used both to attach the two edges together, and
+ * to break them apart.
+ *
+ * @param a an edge to splice
+ * @param b an edge to splice
+ *
+ */
+ public static void splice(QuadEdge a, QuadEdge b) {
+ QuadEdge alpha = a.oNext().rot();
+ QuadEdge beta = b.oNext().rot();
+
+ QuadEdge t1 = b.oNext();
+ QuadEdge t2 = a.oNext();
+ QuadEdge t3 = beta.oNext();
+ QuadEdge t4 = alpha.oNext();
+
+ a.setNext(t1);
+ b.setNext(t2);
+ alpha.setNext(t3);
+ beta.setNext(t4);
+ }
+
+ /**
+ * Turns an edge counterclockwise inside its enclosing quadrilateral.
+ *
+ * @param e the quadedge to turn
+ */
+ public static void swap(QuadEdge e) {
+ QuadEdge a = e.oPrev();
+ QuadEdge b = e.sym().oPrev();
+ splice(e, a);
+ splice(e.sym(), b);
+ splice(e, a.lNext());
+ splice(e.sym(), b.lNext());
+ e.setOrig(a.dest());
+ e.setDest(b.dest());
+ }
+
+ // the dual of this edge, directed from right to left
+ private QuadEdge rot;
+ private Vertex vertex; // The vertex that this edge represents
+ private QuadEdge next; // A reference to a connected edge
+ private Object data = null;
+// private int visitedKey = 0;
+
+ /**
+ * Quadedges must be made using {@link makeEdge},
+ * to ensure proper construction.
+ */
+ private QuadEdge()
+ {
+
+ }
+
+ /**
+ * Gets the primary edge of this quadedge and its <tt>sym</tt>.
+ * The primary edge is the one for which the origin
+ * and destination coordinates are ordered
+ * according to the standard {@link Coordinate} ordering
+ *
+ * @return the primary quadedge
+ */
+ public QuadEdge getPrimary()
+ {
+ if (orig().getCoordinate().compareTo(dest().getCoordinate()) <= 0)
+ return this;
+ else
+ return sym();
+ }
+
+ /**
+ * Sets the external data value for this edge.
+ *
+ * @param data an object containing external data
+ */
+ public void setData(Object data) {
+ this.data = data;
+ }
+
+ /**
+ * Gets the external data value for this edge.
+ *
+ * @return the data object
+ */
+ public Object getData() {
+ return data;
+ }
+
+ /**
+ * Marks this quadedge as being deleted.
+ * This does not free the memory used by
+ * this quadedge quartet, but indicates
+ * that this edge no longer participates
+ * in a subdivision.
+ *
+ */
+ public void delete() {
+ rot = null;
+ }
+
+ /**
+ * Tests whether this edge has been deleted.
+ *
+ * @return true if this edge has not been deleted.
+ */
+ public boolean isLive() {
+ return rot != null;
+ }
+
+
+ /**
+ * Sets the connected edge
+ *
+ * @param next edge
+ */
+ public void setNext(QuadEdge next) {
+ this.next = next;
+ }
+
+ /***************************************************************************
+ * QuadEdge Algebra
+ ***************************************************************************
+ */
+
+ /**
+ * Gets the dual of this edge, directed from its right to its left.
+ *
+ * @return the rotated edge
+ */
+ public final QuadEdge rot() {
+ return rot;
+ }
+
+ /**
+ * Gets the dual of this edge, directed from its left to its right.
+ *
+ * @return the inverse rotated edge.
+ */
+ public final QuadEdge invRot() {
+ return rot.sym();
+ }
+
+ /**
+ * Gets the edge from the destination to the origin of this edge.
+ *
+ * @return the sym of the edge
+ */
+ public final QuadEdge sym() {
+ return rot.rot;
+ }
+
+ /**
+ * Gets the next CCW edge around the origin of this edge.
+ *
+ * @return the next linked edge.
+ */
+ public final QuadEdge oNext() {
+ return next;
+ }
+
+ /**
+ * Gets the next CW edge around (from) the origin of this edge.
+ *
+ * @return the previous edge.
+ */
+ public final QuadEdge oPrev() {
+ return rot.next.rot;
+ }
+
+ /**
+ * Gets the next CCW edge around (into) the destination of this edge.
+ *
+ * @return the next destination edge.
+ */
+ public final QuadEdge dNext() {
+ return this.sym().oNext().sym();
+ }
+
+ /**
+ * Gets the next CW edge around (into) the destination of this edge.
+ *
+ * @return the previous destination edge.
+ */
+ public final QuadEdge dPrev() {
+ return this.invRot().oNext().invRot();
+ }
+
+ /**
+ * Gets the CCW edge around the left face following this edge.
+ *
+ * @return the next left face edge.
+ */
+ public final QuadEdge lNext() {
+ return this.invRot().oNext().rot();
+ }
+
+ /**
+ * Gets the CCW edge around the left face before this edge.
+ *
+ * @return the previous left face edge.
+ */
+ public final QuadEdge lPrev() {
+ return next.sym();
+ }
+
+ /**
+ * Gets the edge around the right face ccw following this edge.
+ *
+ * @return the next right face edge.
+ */
+ public final QuadEdge rNext() {
+ return rot.next.invRot();
+ }
+
+ /**
+ * Gets the edge around the right face ccw before this edge.
+ *
+ * @return the previous right face edge.
+ */
+ public final QuadEdge rPrev() {
+ return this.sym().oNext();
+ }
+
+ /***********************************************************************************************
+ * Data Access
+ **********************************************************************************************/
+ /**
+ * Sets the vertex for this edge's origin
+ *
+ * @param o the origin vertex
+ */
+ void setOrig(Vertex o) {
+ vertex = o;
+ }
+
+ /**
+ * Sets the vertex for this edge's destination
+ *
+ * @param d the destination vertex
+ */
+ void setDest(Vertex d) {
+ sym().setOrig(d);
+ }
+
+ /**
+ * Gets the vertex for the edge's origin
+ *
+ * @return the origin vertex
+ */
+ public final Vertex orig() {
+ return vertex;
+ }
+
+ /**
+ * Gets the vertex for the edge's destination
+ *
+ * @return the destination vertex
+ */
+ public final Vertex dest() {
+ return sym().orig();
+ }
+
+ /**
+ * Gets the length of the geometry of this quadedge.
+ *
+ * @return the length of the quadedge
+ */
+ public double getLength() {
+ return orig().getCoordinate().distance(dest().getCoordinate());
+ }
+
+ /**
+ * Tests if this quadedge and another have the same line segment geometry,
+ * regardless of orientation.
+ *
+ * @param qe a quadedge
+ * @return true if the quadedges are based on the same line segment regardless of orientation
+ */
+ public boolean equalsNonOriented(QuadEdge qe) {
+ if (equalsOriented(qe))
+ return true;
+ if (equalsOriented(qe.sym()))
+ return true;
+ return false;
+ }
+
+ /**
+ * Tests if this quadedge and another have the same line segment geometry
+ * with the same orientation.
+ *
+ * @param qe a quadedge
+ * @return true if the quadedges are based on the same line segment
+ */
+ public boolean equalsOriented(QuadEdge qe) {
+ if (orig().getCoordinate().equals2D(qe.orig().getCoordinate())
+ && dest().getCoordinate().equals2D(qe.dest().getCoordinate()))
+ return true;
+ return false;
+ }
+
+ /**
+ * Creates a {@link LineSegment} representing the
+ * geometry of this edge.
+ *
+ * @return a LineSegment
+ */
+ public LineSegment toLineSegment()
+ {
+ return new LineSegment(vertex.getCoordinate(), dest().getCoordinate());
+ }
+
+ /**
+ * Converts this edge to a WKT two-point <tt>LINESTRING</tt> indicating
+ * the geometry of this edge.
+ *
+ * @return a String representing this edge's geometry
+ */
+ public String toString() {
+ Coordinate p0 = vertex.getCoordinate();
+ Coordinate p1 = dest().getCoordinate();
+ return WKTWriter.toLineString(p0, p1);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeLocator.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeLocator.java
new file mode 100644
index 0000000..d70d6e8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeLocator.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+/**
+ * An interface for classes which locate an edge in a {@link QuadEdgeSubdivision}
+ * which either contains a given {@link Vertex} V
+ * or is an edge of a triangle which contains V.
+ * Implementors may utilized different strategies for
+ * optimizing locating containing edges/triangles.
+ *
+ * @author Martin Davis
+ */
+public interface QuadEdgeLocator {
+ QuadEdge locate(Vertex v);
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeSubdivision.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeSubdivision.java
new file mode 100644
index 0000000..f9d743e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeSubdivision.java
@@ -0,0 +1,950 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.Stack;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateList;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Triangle;
+import org.locationtech.jts.io.WKTWriter;
+
+
+/**
+ * A class that contains the {@link QuadEdge}s representing a planar
+ * subdivision that models a triangulation.
+ * The subdivision is constructed using the
+ * quadedge algebra defined in the class {@link QuadEdge}.
+ * All metric calculations
+ * are done in the {@link Vertex} class.
+ * In addition to a triangulation, subdivisions
+ * support extraction of Voronoi diagrams.
+ * This is easily accomplished, since the Voronoi diagram is the dual
+ * of the Delaunay triangulation.
+ * <p>
+ * Subdivisions can be provided with a tolerance value. Inserted vertices which
+ * are closer than this value to vertices already in the subdivision will be
+ * ignored. Using a suitable tolerance value can prevent robustness failures
+ * from happening during Delaunay triangulation.
+ * <p>
+ * Subdivisions maintain a <b>frame</b> triangle around the client-created
+ * edges. The frame is used to provide a bounded "container" for all edges
+ * within a TIN. Normally the frame edges, frame connecting edges, and frame
+ * triangles are not included in client processing.
+ *
+ * @author David Skea
+ * @author Martin Davis
+ */
+public class QuadEdgeSubdivision {
+ /**
+ * Gets the edges for the triangle to the left of the given {@link QuadEdge}.
+ *
+ * @param startQE
+ * @param triEdge
+ *
+ * @throws IllegalArgumentException
+ * if the edges do not form a triangle
+ */
+ public static void getTriangleEdges(QuadEdge startQE, QuadEdge[] triEdge) {
+ triEdge[0] = startQE;
+ triEdge[1] = triEdge[0].lNext();
+ triEdge[2] = triEdge[1].lNext();
+ if (triEdge[2].lNext() != triEdge[0])
+ throw new IllegalArgumentException("Edges do not form a triangle");
+ }
+
+ private final static double EDGE_COINCIDENCE_TOL_FACTOR = 1000;
+
+ // debugging only - preserve current subdiv statically
+ // private static QuadEdgeSubdivision currentSubdiv;
+
+ // used for edge extraction to ensure edge uniqueness
+ private int visitedKey = 0;
+// private Set quadEdges = new HashSet();
+ private List quadEdges = new ArrayList();
+ private QuadEdge startingEdge;
+ private double tolerance;
+ private double edgeCoincidenceTolerance;
+ private Vertex[] frameVertex = new Vertex[3];
+ private Envelope frameEnv;
+ private QuadEdgeLocator locator = null;
+
+ /**
+ * Creates a new instance of a quad-edge subdivision based on a frame triangle
+ * that encloses a supplied bounding box. A new super-bounding box that
+ * contains the triangle is computed and stored.
+ *
+ * @param env
+ * the bounding box to surround
+ * @param tolerance
+ * the tolerance value for determining if two sites are equal
+ */
+ public QuadEdgeSubdivision(Envelope env, double tolerance) {
+ // currentSubdiv = this;
+ this.tolerance = tolerance;
+ edgeCoincidenceTolerance = tolerance / EDGE_COINCIDENCE_TOL_FACTOR;
+
+ createFrame(env);
+
+ startingEdge = initSubdiv();
+ locator = new LastFoundQuadEdgeLocator(this);
+ }
+
+ private void createFrame(Envelope env)
+ {
+ double deltaX = env.getWidth();
+ double deltaY = env.getHeight();
+ double offset = 0.0;
+ if (deltaX > deltaY) {
+ offset = deltaX * 10.0;
+ } else {
+ offset = deltaY * 10.0;
+ }
+
+ frameVertex[0] = new Vertex((env.getMaxX() + env.getMinX()) / 2.0, env
+ .getMaxY()
+ + offset);
+ frameVertex[1] = new Vertex(env.getMinX() - offset, env.getMinY() - offset);
+ frameVertex[2] = new Vertex(env.getMaxX() + offset, env.getMinY() - offset);
+
+ frameEnv = new Envelope(frameVertex[0].getCoordinate(), frameVertex[1]
+ .getCoordinate());
+ frameEnv.expandToInclude(frameVertex[2].getCoordinate());
+ }
+
+ private QuadEdge initSubdiv()
+ {
+ // build initial subdivision from frame
+ QuadEdge ea = makeEdge(frameVertex[0], frameVertex[1]);
+ QuadEdge eb = makeEdge(frameVertex[1], frameVertex[2]);
+ QuadEdge.splice(ea.sym(), eb);
+ QuadEdge ec = makeEdge(frameVertex[2], frameVertex[0]);
+ QuadEdge.splice(eb.sym(), ec);
+ QuadEdge.splice(ec.sym(), ea);
+ return ea;
+ }
+
+ /**
+ * Gets the vertex-equality tolerance value
+ * used in this subdivision
+ *
+ * @return the tolerance value
+ */
+ public double getTolerance() {
+ return tolerance;
+ }
+
+ /**
+ * Gets the envelope of the Subdivision (including the frame).
+ *
+ * @return the envelope
+ */
+ public Envelope getEnvelope() {
+ return new Envelope(frameEnv);
+ }
+
+ /**
+ * Gets the collection of base {@link QuadEdge}s (one for every pair of
+ * vertices which is connected).
+ *
+ * @return a collection of QuadEdges
+ */
+ public Collection getEdges() {
+ return quadEdges;
+ }
+
+ /**
+ * Sets the {@link QuadEdgeLocator} to use for locating containing triangles
+ * in this subdivision.
+ *
+ * @param locator
+ * a QuadEdgeLocator
+ */
+ public void setLocator(QuadEdgeLocator locator) {
+ this.locator = locator;
+ }
+
+ /**
+ * Creates a new quadedge, recording it in the edges list.
+ *
+ * @param o
+ * @param d
+ * @return a new quadedge
+ */
+ public QuadEdge makeEdge(Vertex o, Vertex d) {
+ QuadEdge q = QuadEdge.makeEdge(o, d);
+ quadEdges.add(q);
+ return q;
+ }
+
+ /**
+ * Creates a new QuadEdge connecting the destination of a to the origin of b,
+ * in such a way that all three have the same left face after the connection
+ * is complete. The quadedge is recorded in the edges list.
+ *
+ * @param a
+ * @param b
+ * @return a quadedge
+ */
+ public QuadEdge connect(QuadEdge a, QuadEdge b) {
+ QuadEdge q = QuadEdge.connect(a, b);
+ quadEdges.add(q);
+ return q;
+ }
+
+ /**
+ * Deletes a quadedge from the subdivision. Linked quadedges are updated to
+ * reflect the deletion.
+ *
+ * @param e
+ * the quadedge to delete
+ */
+ public void delete(QuadEdge e) {
+ QuadEdge.splice(e, e.oPrev());
+ QuadEdge.splice(e.sym(), e.sym().oPrev());
+
+ QuadEdge eSym = e.sym();
+ QuadEdge eRot = e.rot();
+ QuadEdge eRotSym = e.rot().sym();
+
+ // this is inefficient on an ArrayList, but this method should be called infrequently
+ quadEdges.remove(e);
+ quadEdges.remove(eSym);
+ quadEdges.remove(eRot);
+ quadEdges.remove(eRotSym);
+
+ e.delete();
+ eSym.delete();
+ eRot.delete();
+ eRotSym.delete();
+ }
+
+ /**
+ * Locates an edge of a triangle which contains a location
+ * specified by a Vertex v.
+ * The edge returned has the
+ * property that either v is on e, or e is an edge of a triangle containing v.
+ * The search starts from startEdge amd proceeds on the general direction of v.
+ * <p>
+ * This locate algorithm relies on the subdivision being Delaunay. For
+ * non-Delaunay subdivisions, this may loop for ever.
+ *
+ * @param v the location to search for
+ * @param startEdge an edge of the subdivision to start searching at
+ * @return a QuadEdge which contains v, or is on the edge of a triangle containing v
+ * @throws LocateFailureException
+ * if the location algorithm fails to converge in a reasonable
+ * number of iterations
+ */
+ public QuadEdge locateFromEdge(Vertex v, QuadEdge startEdge) {
+ int iter = 0;
+ int maxIter = quadEdges.size();
+
+ QuadEdge e = startEdge;
+
+ while (true) {
+ iter++;
+
+ /**
+ * So far it has always been the case that failure to locate indicates an
+ * invalid subdivision. So just fail completely. (An alternative would be
+ * to perform an exhaustive search for the containing triangle, but this
+ * would mask errors in the subdivision topology)
+ *
+ * This can also happen if two vertices are located very close together,
+ * since the orientation predicates may experience precision failures.
+ */
+ if (iter > maxIter) {
+ throw new LocateFailureException(e.toLineSegment());
+ // String msg = "Locate failed to converge (at edge: " + e + ").
+ // Possible causes include invalid Subdivision topology or very close
+ // sites";
+ // System.err.println(msg);
+ // dumpTriangles();
+ }
+
+ if ((v.equals(e.orig())) || (v.equals(e.dest()))) {
+ break;
+ } else if (v.rightOf(e)) {
+ e = e.sym();
+ } else if (!v.rightOf(e.oNext())) {
+ e = e.oNext();
+ } else if (!v.rightOf(e.dPrev())) {
+ e = e.dPrev();
+ } else {
+ // on edge or in triangle containing edge
+ break;
+ }
+ }
+ // System.out.println("Locate count: " + iter);
+ return e;
+ }
+
+ /**
+ * Finds a quadedge of a triangle containing a location
+ * specified by a {@link Vertex}, if one exists.
+ *
+ * @param v the vertex to locate
+ * @return a quadedge on the edge of a triangle which touches or contains the location
+ * or null if no such triangle exists
+ */
+ public QuadEdge locate(Vertex v) {
+ return locator.locate(v);
+ }
+
+ /**
+ * Finds a quadedge of a triangle containing a location
+ * specified by a {@link Coordinate}, if one exists.
+ *
+ * @param p the Coordinate to locate
+ * @return a quadedge on the edge of a triangle which touches or contains the location
+ * or null if no such triangle exists
+ */
+ public QuadEdge locate(Coordinate p) {
+ return locator.locate(new Vertex(p));
+ }
+
+ /**
+ * Locates the edge between the given vertices, if it exists in the
+ * subdivision.
+ *
+ * @param p0 a coordinate
+ * @param p1 another coordinate
+ * @return the edge joining the coordinates, if present
+ * or null if no such edge exists
+ */
+ public QuadEdge locate(Coordinate p0, Coordinate p1) {
+ // find an edge containing one of the points
+ QuadEdge e = locator.locate(new Vertex(p0));
+ if (e == null)
+ return null;
+
+ // normalize so that p0 is origin of base edge
+ QuadEdge base = e;
+ if (e.dest().getCoordinate().equals2D(p0))
+ base = e.sym();
+ // check all edges around origin of base edge
+ QuadEdge locEdge = base;
+ do {
+ if (locEdge.dest().getCoordinate().equals2D(p1))
+ return locEdge;
+ locEdge = locEdge.oNext();
+ } while (locEdge != base);
+ return null;
+ }
+
+ /**
+ * Inserts a new site into the Subdivision, connecting it to the vertices of
+ * the containing triangle (or quadrilateral, if the split point falls on an
+ * existing edge).
+ * <p>
+ * This method does NOT maintain the Delaunay condition. If desired, this must
+ * be checked and enforced by the caller.
+ * <p>
+ * This method does NOT check if the inserted vertex falls on an edge. This
+ * must be checked by the caller, since this situation may cause erroneous
+ * triangulation
+ *
+ * @param v
+ * the vertex to insert
+ * @return a new quad edge terminating in v
+ */
+ public QuadEdge insertSite(Vertex v) {
+ QuadEdge e = locate(v);
+
+ if ((v.equals(e.orig(), tolerance)) || (v.equals(e.dest(), tolerance))) {
+ return e; // point already in subdivision.
+ }
+
+ // Connect the new point to the vertices of the containing
+ // triangle (or quadrilateral, if the new point fell on an
+ // existing edge.)
+ QuadEdge base = makeEdge(e.orig(), v);
+ QuadEdge.splice(base, e);
+ QuadEdge startEdge = base;
+ do {
+ base = connect(e, base.sym());
+ e = base.oPrev();
+ } while (e.lNext() != startEdge);
+
+ return startEdge;
+ }
+
+ /**
+ * Tests whether a QuadEdge is an edge incident on a frame triangle vertex.
+ *
+ * @param e
+ * the edge to test
+ * @return true if the edge is connected to the frame triangle
+ */
+ public boolean isFrameEdge(QuadEdge e) {
+ if (isFrameVertex(e.orig()) || isFrameVertex(e.dest()))
+ return true;
+ return false;
+ }
+
+ /**
+ * Tests whether a QuadEdge is an edge on the border of the frame facets and
+ * the internal facets. E.g. an edge which does not itself touch a frame
+ * vertex, but which touches an edge which does.
+ *
+ * @param e
+ * the edge to test
+ * @return true if the edge is on the border of the frame
+ */
+ public boolean isFrameBorderEdge(QuadEdge e) {
+ // MD debugging
+ QuadEdge[] leftTri = new QuadEdge[3];
+ getTriangleEdges(e, leftTri);
+ // System.out.println(new QuadEdgeTriangle(leftTri).toString());
+ QuadEdge[] rightTri = new QuadEdge[3];
+ getTriangleEdges(e.sym(), rightTri);
+ // System.out.println(new QuadEdgeTriangle(rightTri).toString());
+
+ // check other vertex of triangle to left of edge
+ Vertex vLeftTriOther = e.lNext().dest();
+ if (isFrameVertex(vLeftTriOther))
+ return true;
+ // check other vertex of triangle to right of edge
+ Vertex vRightTriOther = e.sym().lNext().dest();
+ if (isFrameVertex(vRightTriOther))
+ return true;
+
+ return false;
+ }
+
+ /**
+ * Tests whether a vertex is a vertex of the outer triangle.
+ *
+ * @param v
+ * the vertex to test
+ * @return true if the vertex is an outer triangle vertex
+ */
+ public boolean isFrameVertex(Vertex v) {
+ if (v.equals(frameVertex[0]))
+ return true;
+ if (v.equals(frameVertex[1]))
+ return true;
+ if (v.equals(frameVertex[2]))
+ return true;
+ return false;
+ }
+
+ private LineSegment seg = new LineSegment();
+
+ /**
+ * Tests whether a {@link Coordinate} lies on a {@link QuadEdge}, up to a
+ * tolerance determined by the subdivision tolerance.
+ *
+ * @param e
+ * a QuadEdge
+ * @param p
+ * a point
+ * @return true if the vertex lies on the edge
+ */
+ public boolean isOnEdge(QuadEdge e, Coordinate p) {
+ seg.setCoordinates(e.orig().getCoordinate(), e.dest().getCoordinate());
+ double dist = seg.distance(p);
+ // heuristic (hack?)
+ return dist < edgeCoincidenceTolerance;
+ }
+
+ /**
+ * Tests whether a {@link Vertex} is the start or end vertex of a
+ * {@link QuadEdge}, up to the subdivision tolerance distance.
+ *
+ * @param e
+ * @param v
+ * @return true if the vertex is a endpoint of the edge
+ */
+ public boolean isVertexOfEdge(QuadEdge e, Vertex v) {
+ if ((v.equals(e.orig(), tolerance)) || (v.equals(e.dest(), tolerance))) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Gets the unique {@link Vertex}es in the subdivision,
+ * including the frame vertices if desired.
+ *
+ * @param includeFrame
+ * true if the frame vertices should be included
+ * @return a collection of the subdivision vertices
+ *
+ * @see #getVertexUniqueEdges
+ */
+ public Collection getVertices(boolean includeFrame)
+ {
+ Set vertices = new HashSet();
+ for (Iterator i = quadEdges.iterator(); i.hasNext();) {
+ QuadEdge qe = (QuadEdge) i.next();
+ Vertex v = qe.orig();
+ //System.out.println(v);
+ if (includeFrame || ! isFrameVertex(v))
+ vertices.add(v);
+
+ /**
+ * Inspect the sym edge as well, since it is
+ * possible that a vertex is only at the
+ * dest of all tracked quadedges.
+ */
+ Vertex vd = qe.dest();
+ //System.out.println(vd);
+ if (includeFrame || ! isFrameVertex(vd))
+ vertices.add(vd);
+ }
+ return vertices;
+ }
+
+ /**
+ * Gets a collection of {@link QuadEdge}s whose origin
+ * vertices are a unique set which includes
+ * all vertices in the subdivision.
+ * The frame vertices can be included if required.
+ * <p>
+ * This is useful for algorithms which require traversing the
+ * subdivision starting at all vertices.
+ * Returning a quadedge for each vertex
+ * is more efficient than
+ * the alternative of finding the actual vertices
+ * using {@link #getVertices} and then locating
+ * quadedges attached to them.
+ *
+ * @param includeFrame true if the frame vertices should be included
+ * @return a collection of QuadEdge with the vertices of the subdivision as their origins
+ */
+ public List getVertexUniqueEdges(boolean includeFrame)
+ {
+ List edges = new ArrayList();
+ Set visitedVertices = new HashSet();
+ for (Iterator i = quadEdges.iterator(); i.hasNext();) {
+ QuadEdge qe = (QuadEdge) i.next();
+ Vertex v = qe.orig();
+ //System.out.println(v);
+ if (! visitedVertices.contains(v)) {
+ visitedVertices.add(v);
+ if (includeFrame || ! isFrameVertex(v)) {
+ edges.add(qe);
+ }
+ }
+
+ /**
+ * Inspect the sym edge as well, since it is
+ * possible that a vertex is only at the
+ * dest of all tracked quadedges.
+ */
+ QuadEdge qd = qe.sym();
+ Vertex vd = qd.orig();
+ //System.out.println(vd);
+ if (! visitedVertices.contains(vd)) {
+ visitedVertices.add(vd);
+ if (includeFrame || ! isFrameVertex(vd)) {
+ edges.add(qd);
+ }
+ }
+ }
+ return edges;
+ }
+
+ /**
+ * Gets all primary quadedges in the subdivision.
+ * A primary edge is a {@link QuadEdge}
+ * which occupies the 0'th position in its array of associated quadedges.
+ * These provide the unique geometric edges of the triangulation.
+ *
+ * @param includeFrame true if the frame edges are to be included
+ * @return a List of QuadEdges
+ */
+ public List getPrimaryEdges(boolean includeFrame) {
+ visitedKey++;
+
+ List edges = new ArrayList();
+ Stack edgeStack = new Stack();
+ edgeStack.push(startingEdge);
+
+ Set visitedEdges = new HashSet();
+
+ while (!edgeStack.empty()) {
+ QuadEdge edge = (QuadEdge) edgeStack.pop();
+ if (! visitedEdges.contains(edge)) {
+ QuadEdge priQE = edge.getPrimary();
+
+ if (includeFrame || ! isFrameEdge(priQE))
+ edges.add(priQE);
+
+ edgeStack.push(edge.oNext());
+ edgeStack.push(edge.sym().oNext());
+
+ visitedEdges.add(edge);
+ visitedEdges.add(edge.sym());
+ }
+ }
+ return edges;
+ }
+
+ /**
+ * A TriangleVisitor which computes and sets the
+ * circumcentre as the origin of the dual
+ * edges originating in each triangle.
+ *
+ * @author mbdavis
+ *
+ */
+ private static class TriangleCircumcentreVisitor implements TriangleVisitor
+ {
+ public TriangleCircumcentreVisitor() {
+ }
+
+ public void visit(QuadEdge[] triEdges)
+ {
+ Coordinate a = triEdges[0].orig().getCoordinate();
+ Coordinate b = triEdges[1].orig().getCoordinate();
+ Coordinate c = triEdges[2].orig().getCoordinate();
+
+ // TODO: choose the most accurate circumcentre based on the edges
+ Coordinate cc = Triangle.circumcentre(a, b, c);
+ Vertex ccVertex = new Vertex(cc);
+ // save the circumcentre as the origin for the dual edges originating in this triangle
+ for (int i = 0; i < 3; i++) {
+ triEdges[i].rot().setOrig(ccVertex);
+ }
+ }
+ }
+
+ /*****************************************************************************
+ * Visitors
+ ****************************************************************************/
+
+ public void visitTriangles(TriangleVisitor triVisitor,
+ boolean includeFrame) {
+ visitedKey++;
+
+ // visited flag is used to record visited edges of triangles
+ // setVisitedAll(false);
+ Stack edgeStack = new Stack();
+ edgeStack.push(startingEdge);
+
+ Set visitedEdges = new HashSet();
+
+ while (!edgeStack.empty()) {
+ QuadEdge edge = (QuadEdge) edgeStack.pop();
+ if (! visitedEdges.contains(edge)) {
+ QuadEdge[] triEdges = fetchTriangleToVisit(edge, edgeStack,
+ includeFrame, visitedEdges);
+ if (triEdges != null)
+ triVisitor.visit(triEdges);
+ }
+ }
+ }
+
+ /**
+ * The quadedges forming a single triangle.
+ * Only one visitor is allowed to be active at a
+ * time, so this is safe.
+ */
+ private QuadEdge[] triEdges = new QuadEdge[3];
+
+ /**
+ * Stores the edges for a visited triangle. Also pushes sym (neighbour) edges
+ * on stack to visit later.
+ *
+ * @param edge
+ * @param edgeStack
+ * @param includeFrame
+ * @return the visited triangle edges
+ * or null if the triangle should not be visited (for instance, if it is
+ * outer)
+ */
+ private QuadEdge[] fetchTriangleToVisit(QuadEdge edge, Stack edgeStack,
+ boolean includeFrame, Set visitedEdges) {
+ QuadEdge curr = edge;
+ int edgeCount = 0;
+ boolean isFrame = false;
+ do {
+ triEdges[edgeCount] = curr;
+
+ if (isFrameEdge(curr))
+ isFrame = true;
+
+ // push sym edges to visit next
+ QuadEdge sym = curr.sym();
+ if (! visitedEdges.contains(sym))
+ edgeStack.push(sym);
+
+ // mark this edge as visited
+ visitedEdges.add(curr);
+
+ edgeCount++;
+ curr = curr.lNext();
+ } while (curr != edge);
+
+ if (isFrame && !includeFrame)
+ return null;
+ return triEdges;
+ }
+
+ /**
+ * Gets a list of the triangles
+ * in the subdivision, specified as
+ * an array of the primary quadedges around the triangle.
+ *
+ * @param includeFrame
+ * true if the frame triangles should be included
+ * @return a List of QuadEdge[3] arrays
+ */
+ public List getTriangleEdges(boolean includeFrame) {
+ TriangleEdgesListVisitor visitor = new TriangleEdgesListVisitor();
+ visitTriangles(visitor, includeFrame);
+ return visitor.getTriangleEdges();
+ }
+
+ private static class TriangleEdgesListVisitor implements TriangleVisitor {
+ private List triList = new ArrayList();
+
+ public void visit(QuadEdge[] triEdges) {
+ triList.add(triEdges);
+ }
+
+ public List getTriangleEdges() {
+ return triList;
+ }
+ }
+
+ /**
+ * Gets a list of the triangles in the subdivision,
+ * specified as an array of the triangle {@link Vertex}es.
+ *
+ * @param includeFrame
+ * true if the frame triangles should be included
+ * @return a List of Vertex[3] arrays
+ */
+ public List getTriangleVertices(boolean includeFrame) {
+ TriangleVertexListVisitor visitor = new TriangleVertexListVisitor();
+ visitTriangles(visitor, includeFrame);
+ return visitor.getTriangleVertices();
+ }
+
+ private static class TriangleVertexListVisitor implements TriangleVisitor {
+ private List triList = new ArrayList();
+
+ public void visit(QuadEdge[] triEdges) {
+ triList.add(new Vertex[] { triEdges[0].orig(), triEdges[1].orig(),
+ triEdges[2].orig() });
+ }
+
+ public List getTriangleVertices() {
+ return triList;
+ }
+ }
+
+ /**
+ * Gets the coordinates for each triangle in the subdivision as an array.
+ *
+ * @param includeFrame
+ * true if the frame triangles should be included
+ * @return a list of Coordinate[4] representing each triangle
+ */
+ public List getTriangleCoordinates(boolean includeFrame) {
+ TriangleCoordinatesVisitor visitor = new TriangleCoordinatesVisitor();
+ visitTriangles(visitor, includeFrame);
+ return visitor.getTriangles();
+ }
+
+ private static class TriangleCoordinatesVisitor implements TriangleVisitor {
+ private CoordinateList coordList = new CoordinateList();
+
+ private List triCoords = new ArrayList();
+
+ public TriangleCoordinatesVisitor() {
+ }
+
+ public void visit(QuadEdge[] triEdges) {
+ coordList.clear();
+ for (int i = 0; i < 3; i++) {
+ Vertex v = triEdges[i].orig();
+ coordList.add(v.getCoordinate());
+ }
+ if (coordList.size() > 0) {
+ coordList.closeRing();
+ Coordinate[] pts = coordList.toCoordinateArray();
+ if (pts.length != 4) {
+ //checkTriangleSize(pts);
+ return;
+ }
+
+ triCoords.add(pts);
+ }
+ }
+
+ private void checkTriangleSize(Coordinate[] pts)
+ {
+ String loc = "";
+ if (pts.length >= 2)
+ loc = WKTWriter.toLineString(pts[0], pts[1]);
+ else {
+ if (pts.length >= 1)
+ loc = WKTWriter.toPoint(pts[0]);
+ }
+ // Assert.isTrue(pts.length == 4, "Too few points for visited triangle at " + loc);
+ //com.vividsolutions.jts.util.Debug.println("too few points for triangle at " + loc);
+ }
+
+ public List getTriangles() {
+ return triCoords;
+ }
+ }
+
+ /**
+ * Gets the geometry for the edges in the subdivision as a {@link MultiLineString}
+ * containing 2-point lines.
+ *
+ * @param geomFact the GeometryFactory to use
+ * @return a MultiLineString
+ */
+ public Geometry getEdges(GeometryFactory geomFact) {
+ List quadEdges = getPrimaryEdges(false);
+ LineString[] edges = new LineString[quadEdges.size()];
+ int i = 0;
+ for (Iterator it = quadEdges.iterator(); it.hasNext();) {
+ QuadEdge qe = (QuadEdge) it.next();
+ edges[i++] = geomFact.createLineString(new Coordinate[] {
+ qe.orig().getCoordinate(), qe.dest().getCoordinate() });
+ }
+ return geomFact.createMultiLineString(edges);
+ }
+
+ /**
+ * Gets the geometry for the triangles in a triangulated subdivision as a {@link GeometryCollection}
+ * of triangular {@link Polygon}s.
+ *
+ * @param geomFact the GeometryFactory to use
+ * @return a GeometryCollection of triangular Polygons
+ */
+ public Geometry getTriangles(GeometryFactory geomFact) {
+ List triPtsList = getTriangleCoordinates(false);
+ Polygon[] tris = new Polygon[triPtsList.size()];
+ int i = 0;
+ for (Iterator it = triPtsList.iterator(); it.hasNext();) {
+ Coordinate[] triPt = (Coordinate[]) it.next();
+ tris[i++] = geomFact
+ .createPolygon(geomFact.createLinearRing(triPt));
+ }
+ return geomFact.createGeometryCollection(tris);
+ }
+
+ /**
+ * Gets the cells in the Voronoi diagram for this triangulation.
+ * The cells are returned as a {@link GeometryCollection} of {@link Polygon}s
+ * <p>
+ * The userData of each polygon is set to be the {@link Coordinate}
+ * of the cell site. This allows easily associating external
+ * data associated with the sites to the cells.
+ *
+ * @param geomFact a geometry factory
+ * @return a GeometryCollection of Polygons
+ */
+ public Geometry getVoronoiDiagram(GeometryFactory geomFact)
+ {
+ List vorCells = getVoronoiCellPolygons(geomFact);
+ return geomFact.createGeometryCollection(GeometryFactory.toGeometryArray(vorCells));
+ }
+
+ /**
+ * Gets a List of {@link Polygon}s for the Voronoi cells
+ * of this triangulation.
+ * <p>
+ * The userData of each polygon is set to be the {@link Coordinate}
+ * of the cell site. This allows easily associating external
+ * data associated with the sites to the cells.
+ *
+ * @param geomFact a geometry factory
+ * @return a List of Polygons
+ */
+ public List getVoronoiCellPolygons(GeometryFactory geomFact)
+ {
+ /*
+ * Compute circumcentres of triangles as vertices for dual edges.
+ * Precomputing the circumcentres is more efficient,
+ * and more importantly ensures that the computed centres
+ * are consistent across the Voronoi cells.
+ */
+ visitTriangles(new TriangleCircumcentreVisitor(), true);
+
+ List cells = new ArrayList();
+ Collection edges = getVertexUniqueEdges(false);
+ for (Iterator i = edges.iterator(); i.hasNext(); ) {
+ QuadEdge qe = (QuadEdge) i.next();
+ cells.add(getVoronoiCellPolygon(qe, geomFact));
+ }
+ return cells;
+ }
+
+ /**
+ * Gets the Voronoi cell around a site specified
+ * by the origin of a QuadEdge.
+ * <p>
+ * The userData of the polygon is set to be the {@link Coordinate}
+ * of the site. This allows attaching external
+ * data associated with the site to this cell polygon.
+ *
+ * @param qe a quadedge originating at the cell site
+ * @param geomFact a factory for building the polygon
+ * @return a polygon indicating the cell extent
+ */
+ public Polygon getVoronoiCellPolygon(QuadEdge qe, GeometryFactory geomFact)
+ {
+ List cellPts = new ArrayList();
+ QuadEdge startQE = qe;
+ do {
+// Coordinate cc = circumcentre(qe);
+ // use previously computed circumcentre
+ Coordinate cc = qe.rot().orig().getCoordinate();
+ cellPts.add(cc);
+
+ // move to next triangle CW around vertex
+ qe = qe.oPrev();
+ } while (qe != startQE);
+
+ CoordinateList coordList = new CoordinateList();
+ coordList.addAll(cellPts, false);
+ coordList.closeRing();
+
+ if (coordList.size() < 4) {
+ System.out.println(coordList);
+ coordList.add(coordList.get(coordList.size()-1), true);
+ }
+
+ Coordinate[] pts = coordList.toCoordinateArray();
+ Polygon cellPoly = geomFact.createPolygon(geomFact.createLinearRing(pts));
+
+ Vertex v = startQE.orig();
+ cellPoly.setUserData(v.getCoordinate());
+ return cellPoly;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeTriangle.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeTriangle.java
new file mode 100644
index 0000000..e6befaa
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeTriangle.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+
+
+/**
+ * Models a triangle formed from {@link QuadEdge}s in a {@link QuadEdgeSubdivision}
+ * which forms a triangulation. The class provides methods to access the
+ * topological and geometric properties of the triangle and its neighbours in
+ * the triangulation. Triangle vertices are ordered in CCW orientation in the
+ * structure.
+ * <p>
+ * QuadEdgeTriangles support having an external data attribute attached to them.
+ * Alternatively, this class can be subclassed and attributes can
+ * be defined in the subclass. Subclasses will need to define
+ * their own <tt>BuilderVisitor</tt> class
+ * and <tt>createOn</tt> method.
+ *
+ * @author Martin Davis
+ * @version 1.0
+ */
+public class QuadEdgeTriangle
+{
+ /**
+ * Creates {@link QuadEdgeTriangle}s for all facets of a
+ * {@link QuadEdgeSubdivision} representing a triangulation.
+ * The <tt>data</tt> attributes of the {@link QuadEdge}s in the subdivision
+ * will be set to point to the triangle which contains that edge.
+ * This allows tracing the neighbour triangles of any given triangle.
+ *
+ * @param subdiv
+ * the QuadEdgeSubdivision to create the triangles on.
+ * @return a List of the created QuadEdgeTriangles
+ */
+ public static List createOn(QuadEdgeSubdivision subdiv)
+ {
+ QuadEdgeTriangleBuilderVisitor visitor = new QuadEdgeTriangleBuilderVisitor();
+ subdiv.visitTriangles(visitor, false);
+ return visitor.getTriangles();
+ }
+
+ /**
+ * Tests whether the point pt is contained in the triangle defined by 3
+ * {@link Vertex}es.
+ *
+ * @param tri
+ * an array containing at least 3 Vertexes
+ * @param pt
+ * the point to test
+ * @return true if the point is contained in the triangle
+ */
+ public static boolean contains(Vertex[] tri, Coordinate pt) {
+ Coordinate[] ring = new Coordinate[] { tri[0].getCoordinate(),
+ tri[1].getCoordinate(), tri[2].getCoordinate(), tri[0].getCoordinate() };
+ return PointLocation.isInRing(pt, ring);
+ }
+
+ /**
+ * Tests whether the point pt is contained in the triangle defined by 3
+ * {@link QuadEdge}es.
+ *
+ * @param tri
+ * an array containing at least 3 QuadEdges
+ * @param pt
+ * the point to test
+ * @return true if the point is contained in the triangle
+ */
+ public static boolean contains(QuadEdge[] tri, Coordinate pt) {
+ Coordinate[] ring = new Coordinate[] { tri[0].orig().getCoordinate(),
+ tri[1].orig().getCoordinate(), tri[2].orig().getCoordinate(),
+ tri[0].orig().getCoordinate() };
+ return PointLocation.isInRing(pt, ring);
+ }
+
+ public static Geometry toPolygon(Vertex[] v) {
+ Coordinate[] ringPts = new Coordinate[] { v[0].getCoordinate(),
+ v[1].getCoordinate(), v[2].getCoordinate(), v[0].getCoordinate() };
+ GeometryFactory fact = new GeometryFactory();
+ LinearRing ring = fact.createLinearRing(ringPts);
+ Polygon tri = fact.createPolygon(ring);
+ return tri;
+ }
+
+ public static Geometry toPolygon(QuadEdge[] e) {
+ Coordinate[] ringPts = new Coordinate[] { e[0].orig().getCoordinate(),
+ e[1].orig().getCoordinate(), e[2].orig().getCoordinate(),
+ e[0].orig().getCoordinate() };
+ GeometryFactory fact = new GeometryFactory();
+ LinearRing ring = fact.createLinearRing(ringPts);
+ Polygon tri = fact.createPolygon(ring);
+ return tri;
+ }
+
+ /**
+ * Finds the next index around the triangle. Index may be an edge or vertex
+ * index.
+ *
+ * @param index
+ * @return the next index
+ */
+ public static int nextIndex(int index) {
+ return index = (index + 1) % 3;
+ }
+
+ private QuadEdge[] edge;
+ private Object data;
+
+ /**
+ * Creates a new triangle from the given edges.
+ *
+ * @param edge an array of the edges of the triangle in CCW order
+ */
+ public QuadEdgeTriangle(QuadEdge[] edge) {
+ this.edge = (QuadEdge[]) Arrays.copyOf(edge, edge.length);
+ // link the quadedges back to this triangle
+ for (int i = 0; i < 3; i++) {
+ edge[i].setData(this);
+ }
+ }
+
+ /**
+ * Sets the external data value for this triangle.
+ *
+ * @param data an object containing external data
+ */
+ public void setData(Object data) {
+ this.data = data;
+ }
+
+ /**
+ * Gets the external data value for this triangle.
+ *
+ * @return the data object
+ */
+ public Object getData() {
+ return data;
+ }
+
+ public void kill() {
+ edge = null;
+ }
+
+ public boolean isLive() {
+ return edge != null;
+ }
+
+ public QuadEdge[] getEdges() {
+ return edge;
+ }
+
+ public QuadEdge getEdge(int i) {
+ return edge[i];
+ }
+
+ public Vertex getVertex(int i) {
+ return edge[i].orig();
+ }
+
+ /**
+ * Gets the vertices for this triangle.
+ *
+ * @return a new array containing the triangle vertices
+ */
+ public Vertex[] getVertices() {
+ Vertex[] vert = new Vertex[3];
+ for (int i = 0; i < 3; i++) {
+ vert[i] = getVertex(i);
+ }
+ return vert;
+ }
+
+ public Coordinate getCoordinate(int i) {
+ return edge[i].orig().getCoordinate();
+ }
+
+ /**
+ * Gets the index for the given edge of this triangle
+ *
+ * @param e
+ * a QuadEdge
+ * @return the index of the edge in this triangle
+ * or -1 if the edge is not an edge of this triangle
+ */
+ public int getEdgeIndex(QuadEdge e) {
+ for (int i = 0; i < 3; i++) {
+ if (edge[i] == e)
+ return i;
+ }
+ return -1;
+ }
+
+ /**
+ * Gets the index for the edge that starts at vertex v.
+ *
+ * @param v
+ * the vertex to find the edge for
+ * @return the index of the edge starting at the vertex
+ * or -1 if the vertex is not in the triangle
+ */
+ public int getEdgeIndex(Vertex v) {
+ for (int i = 0; i < 3; i++) {
+ if (edge[i].orig() == v)
+ return i;
+ }
+ return -1;
+ }
+
+ public void getEdgeSegment(int i, LineSegment seg) {
+ seg.p0 = edge[i].orig().getCoordinate();
+ int nexti = (i + 1) % 3;
+ seg.p1 = edge[nexti].orig().getCoordinate();
+ }
+
+ public Coordinate[] getCoordinates() {
+ Coordinate[] pts = new Coordinate[4];
+ for (int i = 0; i < 3; i++) {
+ pts[i] = edge[i].orig().getCoordinate();
+ }
+ pts[3] = new Coordinate(pts[0]);
+ return pts;
+ }
+
+ public boolean contains(Coordinate pt) {
+ Coordinate[] ring = getCoordinates();
+ return PointLocation.isInRing(pt, ring);
+ }
+
+ public Polygon getGeometry(GeometryFactory fact) {
+ LinearRing ring = fact.createLinearRing(getCoordinates());
+ Polygon tri = fact.createPolygon(ring);
+ return tri;
+ }
+
+ public String toString() {
+ return getGeometry(new GeometryFactory()).toString();
+ }
+
+ /**
+ * Tests whether this triangle is adjacent to the outside of the subdivision.
+ *
+ * @return true if the triangle is adjacent to the subdivision exterior
+ */
+ public boolean isBorder() {
+ for (int i = 0; i < 3; i++) {
+ if (getAdjacentTriangleAcrossEdge(i) == null)
+ return true;
+ }
+ return false;
+ }
+
+ public boolean isBorder(int i) {
+ return getAdjacentTriangleAcrossEdge(i) == null;
+ }
+
+ public QuadEdgeTriangle getAdjacentTriangleAcrossEdge(int edgeIndex) {
+ return (QuadEdgeTriangle) getEdge(edgeIndex).sym().getData();
+ }
+
+ public int getAdjacentTriangleEdgeIndex(int i) {
+ return getAdjacentTriangleAcrossEdge(i).getEdgeIndex(getEdge(i).sym());
+ }
+
+ /**
+ * Gets the triangles which are adjacent (include) to a
+ * given vertex of this triangle.
+ *
+ * @param vertexIndex the vertex to query
+ * @return a list of the vertex-adjacent triangles
+ */
+ public List getTrianglesAdjacentToVertex(int vertexIndex) {
+ // Assert: isVertex
+ List adjTris = new ArrayList();
+
+ QuadEdge start = getEdge(vertexIndex);
+ QuadEdge qe = start;
+ do {
+ QuadEdgeTriangle adjTri = (QuadEdgeTriangle) qe.getData();
+ if (adjTri != null) {
+ adjTris.add(adjTri);
+ }
+ qe = qe.oNext();
+ } while (qe != start);
+
+ return adjTris;
+
+ }
+
+ /**
+ * Gets the neighbours of this triangle. If there is no neighbour triangle,
+ * the array element is <code>null</code>
+ *
+ * @return an array containing the 3 neighbours of this triangle
+ */
+ public QuadEdgeTriangle[] getNeighbours() {
+ QuadEdgeTriangle[] neigh = new QuadEdgeTriangle[3];
+ for (int i = 0; i < 3; i++) {
+ neigh[i] = (QuadEdgeTriangle) getEdge(i).sym().getData();
+ }
+ return neigh;
+ }
+
+ private static class QuadEdgeTriangleBuilderVisitor implements TriangleVisitor {
+ private List triangles = new ArrayList();
+
+ public QuadEdgeTriangleBuilderVisitor() {
+ }
+
+ public void visit(QuadEdge[] edges) {
+ triangles.add(new QuadEdgeTriangle(edges));
+ }
+
+ public List getTriangles() {
+ return triangles;
+ }
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeUtil.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeUtil.java
new file mode 100644
index 0000000..11ccdb8
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeUtil.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Utilities for working with {@link QuadEdge}s.
+ *
+ * @author mbdavis
+ *
+ */
+public class QuadEdgeUtil
+{
+ /**
+ * Gets all edges which are incident on the origin of the given edge.
+ *
+ * @param start
+ * the edge to start at
+ * @return a List of edges which have their origin at the origin of the given
+ * edge
+ */
+ public static List findEdgesIncidentOnOrigin(QuadEdge start) {
+ List incEdge = new ArrayList();
+
+ QuadEdge qe = start;
+ do {
+ incEdge.add(qe);
+ qe = qe.oNext();
+ } while (qe != start);
+
+ return incEdge;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TraversalVisitor.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TraversalVisitor.java
new file mode 100644
index 0000000..ea78750
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TraversalVisitor.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+/**
+ * Interface for classes which process triangles visited during traversals of a
+ * {@link QuadEdgeSubdivision}
+ *
+ * @author Martin Davis
+ */
+public interface TraversalVisitor {
+ /**
+ * Visits a triangle during a traversal of a {@link QuadEdgeSubdivision}. An implementation of
+ * this method may perform processing on the current triangle. It must also decide whether a
+ * neighbouring triangle should be added to the queue so its neighbours are visited. Often it
+ * will perform processing on the neighbour triangle as well, in order to mark it as processed
+ * (visited) and/or to determine if it should be visited. Note that choosing <b>not</b> to
+ * visit the neighbouring triangle is the terminating condition for many traversal algorithms.
+ * In particular, if the neighbour triangle has already been visited, it should not be visited
+ * again.
+ *
+ * @param currTri the current triangle being processed
+ * @param edgeIndex the index of the edge in the current triangle being traversed
+ * @param neighbTri a neighbouring triangle next in line to visit
+ * @return true if the neighbour triangle should be visited
+ */
+ boolean visit(QuadEdgeTriangle currTri, int edgeIndex, QuadEdgeTriangle neighbTri);
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TrianglePredicate.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TrianglePredicate.java
new file mode 100644
index 0000000..e97f3f5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TrianglePredicate.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Triangle;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.math.DD;
+
+/**
+ * Algorithms for computing values and predicates
+ * associated with triangles.
+ * For some algorithms extended-precision
+ * implementations are provided, which are more robust
+ * (i.e. they produce correct answers in more cases).
+ * Also, some more robust formulations of
+ * some algorithms are provided, which utilize
+ * normalization to the origin.
+ *
+ * @author Martin Davis
+ *
+ */
+public class TrianglePredicate
+{
+ /**
+ * Tests if a point is inside the circle defined by
+ * the triangle with vertices a, b, c (oriented counter-clockwise).
+ * This test uses simple
+ * double-precision arithmetic, and thus may not be robust.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleNonRobust(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ boolean isInCircle =
+ (a.x * a.x + a.y * a.y) * triArea(b, c, p)
+ - (b.x * b.x + b.y * b.y) * triArea(a, c, p)
+ + (c.x * c.x + c.y * c.y) * triArea(a, b, p)
+ - (p.x * p.x + p.y * p.y) * triArea(a, b, c)
+ > 0;
+ return isInCircle;
+ }
+
+ /**
+ * Tests if a point is inside the circle defined by
+ * the triangle with vertices a, b, c (oriented counter-clockwise).
+ * This test uses simple
+ * double-precision arithmetic, and thus is not 100% robust.
+ * However, by using normalization to the origin
+ * it provides improved robustness and increased performance.
+ * <p>
+ * Based on code by J.R.Shewchuk.
+ *
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleNormalized(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ double adx = a.x - p.x;
+ double ady = a.y - p.y;
+ double bdx = b.x - p.x;
+ double bdy = b.y - p.y;
+ double cdx = c.x - p.x;
+ double cdy = c.y - p.y;
+
+ double abdet = adx * bdy - bdx * ady;
+ double bcdet = bdx * cdy - cdx * bdy;
+ double cadet = cdx * ady - adx * cdy;
+ double alift = adx * adx + ady * ady;
+ double blift = bdx * bdx + bdy * bdy;
+ double clift = cdx * cdx + cdy * cdy;
+
+ double disc = alift * bcdet + blift * cadet + clift * abdet;
+ return disc > 0;
+ }
+
+ /**
+ * Computes twice the area of the oriented triangle (a, b, c), i.e., the area is positive if the
+ * triangle is oriented counterclockwise.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ */
+ private static double triArea(Coordinate a, Coordinate b, Coordinate c) {
+ return (b.x - a.x) * (c.y - a.y)
+ - (b.y - a.y) * (c.x - a.x);
+ }
+
+ /**
+ * Tests if a point is inside the circle defined by
+ * the triangle with vertices a, b, c (oriented counter-clockwise).
+ * This method uses more robust computation.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleRobust(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p)
+ {
+ //checkRobustInCircle(a, b, c, p);
+// return isInCircleNonRobust(a, b, c, p);
+ return isInCircleNormalized(a, b, c, p);
+ }
+
+ /**
+ * Tests if a point is inside the circle defined by
+ * the triangle with vertices a, b, c (oriented counter-clockwise).
+ * The computation uses {@link DD} arithmetic for robustness.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleDDSlow(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ DD px = DD.valueOf(p.x);
+ DD py = DD.valueOf(p.y);
+ DD ax = DD.valueOf(a.x);
+ DD ay = DD.valueOf(a.y);
+ DD bx = DD.valueOf(b.x);
+ DD by = DD.valueOf(b.y);
+ DD cx = DD.valueOf(c.x);
+ DD cy = DD.valueOf(c.y);
+
+ DD aTerm = (ax.multiply(ax).add(ay.multiply(ay)))
+ .multiply(triAreaDDSlow(bx, by, cx, cy, px, py));
+ DD bTerm = (bx.multiply(bx).add(by.multiply(by)))
+ .multiply(triAreaDDSlow(ax, ay, cx, cy, px, py));
+ DD cTerm = (cx.multiply(cx).add(cy.multiply(cy)))
+ .multiply(triAreaDDSlow(ax, ay, bx, by, px, py));
+ DD pTerm = (px.multiply(px).add(py.multiply(py)))
+ .multiply(triAreaDDSlow(ax, ay, bx, by, cx, cy));
+
+ DD sum = aTerm.subtract(bTerm).add(cTerm).subtract(pTerm);
+ boolean isInCircle = sum.doubleValue() > 0;
+
+ return isInCircle;
+ }
+
+ /**
+ * Computes twice the area of the oriented triangle (a, b, c), i.e., the area
+ * is positive if the triangle is oriented counterclockwise.
+ * The computation uses {@link DD} arithmetic for robustness.
+ *
+ * @param ax the x ordinate of a vertex of the triangle
+ * @param ay the y ordinate of a vertex of the triangle
+ * @param bx the x ordinate of a vertex of the triangle
+ * @param by the y ordinate of a vertex of the triangle
+ * @param cx the x ordinate of a vertex of the triangle
+ * @param cy the y ordinate of a vertex of the triangle
+ */
+ public static DD triAreaDDSlow(DD ax, DD ay,
+ DD bx, DD by, DD cx, DD cy) {
+ return (bx.subtract(ax).multiply(cy.subtract(ay)).subtract(by.subtract(ay)
+ .multiply(cx.subtract(ax))));
+ }
+
+ public static boolean isInCircleDDFast(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ DD aTerm = (DD.sqr(a.x).selfAdd(DD.sqr(a.y)))
+ .selfMultiply(triAreaDDFast(b, c, p));
+ DD bTerm = (DD.sqr(b.x).selfAdd(DD.sqr(b.y)))
+ .selfMultiply(triAreaDDFast(a, c, p));
+ DD cTerm = (DD.sqr(c.x).selfAdd(DD.sqr(c.y)))
+ .selfMultiply(triAreaDDFast(a, b, p));
+ DD pTerm = (DD.sqr(p.x).selfAdd(DD.sqr(p.y)))
+ .selfMultiply(triAreaDDFast(a, b, c));
+
+ DD sum = aTerm.selfSubtract(bTerm).selfAdd(cTerm).selfSubtract(pTerm);
+ boolean isInCircle = sum.doubleValue() > 0;
+
+ return isInCircle;
+ }
+
+ public static DD triAreaDDFast(
+ Coordinate a, Coordinate b, Coordinate c) {
+
+ DD t1 = DD.valueOf(b.x).selfSubtract(a.x)
+ .selfMultiply(
+ DD.valueOf(c.y).selfSubtract(a.y));
+
+ DD t2 = DD.valueOf(b.y).selfSubtract(a.y)
+ .selfMultiply(
+ DD.valueOf(c.x).selfSubtract(a.x));
+
+ return t1.selfSubtract(t2);
+ }
+
+ public static boolean isInCircleDDNormalized(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ DD adx = DD.valueOf(a.x).selfSubtract(p.x);
+ DD ady = DD.valueOf(a.y).selfSubtract(p.y);
+ DD bdx = DD.valueOf(b.x).selfSubtract(p.x);
+ DD bdy = DD.valueOf(b.y).selfSubtract(p.y);
+ DD cdx = DD.valueOf(c.x).selfSubtract(p.x);
+ DD cdy = DD.valueOf(c.y).selfSubtract(p.y);
+
+ DD abdet = adx.multiply(bdy).selfSubtract(bdx.multiply(ady));
+ DD bcdet = bdx.multiply(cdy).selfSubtract(cdx.multiply(bdy));
+ DD cadet = cdx.multiply(ady).selfSubtract(adx.multiply(cdy));
+ DD alift = adx.multiply(adx).selfAdd(ady.multiply(ady));
+ DD blift = bdx.multiply(bdx).selfAdd(bdy.multiply(bdy));
+ DD clift = cdx.multiply(cdx).selfAdd(cdy.multiply(cdy));
+
+ DD sum = alift.selfMultiply(bcdet)
+ .selfAdd(blift.selfMultiply(cadet))
+ .selfAdd(clift.selfMultiply(abdet));
+
+ boolean isInCircle = sum.doubleValue() > 0;
+
+ return isInCircle;
+ }
+
+ /**
+ * Computes the inCircle test using distance from the circumcentre.
+ * Uses standard double-precision arithmetic.
+ * <p>
+ * In general this doesn't
+ * appear to be any more robust than the standard calculation. However, there
+ * is at least one case where the test point is far enough from the
+ * circumcircle that this test gives the correct answer.
+ * <pre>
+ * LINESTRING
+ * (1507029.9878 518325.7547, 1507022.1120341457 518332.8225183258,
+ * 1507029.9833 518325.7458, 1507029.9896965567 518325.744909031)
+ * </pre>
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleCC(Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ Coordinate cc = Triangle.circumcentre(a, b, c);
+ double ccRadius = a.distance(cc);
+ double pRadiusDiff = p.distance(cc) - ccRadius;
+ return pRadiusDiff <= 0;
+ }
+
+ /**
+ * Checks if the computed value for isInCircle is correct, using
+ * double-double precision arithmetic.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ */
+private static void checkRobustInCircle(Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p)
+{
+ boolean nonRobustInCircle = isInCircleNonRobust(a, b, c, p);
+ boolean isInCircleDD = TrianglePredicate.isInCircleDDSlow(a, b, c, p);
+ boolean isInCircleCC = TrianglePredicate.isInCircleCC(a, b, c, p);
+
+ Coordinate circumCentre = Triangle.circumcentre(a, b, c);
+ System.out.println("p radius diff a = "
+ + Math.abs(p.distance(circumCentre) - a.distance(circumCentre))
+ / a.distance(circumCentre));
+
+ if (nonRobustInCircle != isInCircleDD || nonRobustInCircle != isInCircleCC) {
+ System.out.println("inCircle robustness failure (double result = "
+ + nonRobustInCircle
+ + ", DD result = " + isInCircleDD
+ + ", CC result = " + isInCircleCC + ")");
+ System.out.println(WKTWriter.toLineString(new CoordinateArraySequence(
+ new Coordinate[] { a, b, c, p })));
+ System.out.println("Circumcentre = " + WKTWriter.toPoint(circumCentre)
+ + " radius = " + a.distance(circumCentre));
+ System.out.println("p radius diff a = "
+ + Math.abs(p.distance(circumCentre)/a.distance(circumCentre) - 1));
+ System.out.println("p radius diff b = "
+ + Math.abs(p.distance(circumCentre)/b.distance(circumCentre) - 1));
+ System.out.println("p radius diff c = "
+ + Math.abs(p.distance(circumCentre)/c.distance(circumCentre) - 1));
+ System.out.println();
+ }
+}
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TriangleVisitor.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TriangleVisitor.java
new file mode 100644
index 0000000..3c2bab5
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/TriangleVisitor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+/**
+ * An interface for algorithms which process the triangles in a {@link QuadEdgeSubdivision}.
+ *
+ * @author Martin Davis
+ * @version 1.0
+ */
+public interface TriangleVisitor {
+ /**
+ * Visits the {@link QuadEdge}s of a triangle.
+ *
+ * @param triEdges an array of the 3 quad edges in a triangle (in CCW order)
+ */
+ void visit(QuadEdge[] triEdges);
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/Vertex.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/Vertex.java
new file mode 100644
index 0000000..0b84987
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/Vertex.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.triangulate.quadedge;
+
+
+import org.locationtech.jts.algorithm.HCoordinate;
+import org.locationtech.jts.algorithm.NotRepresentableException;
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Models a site (node) in a {@link QuadEdgeSubdivision}.
+ * The sites can be points on a line string representing a
+ * linear site.
+ * <p>
+ * The vertex can be considered as a vector with a norm, length, inner product, cross
+ * product, etc. Additionally, point relations (e.g., is a point to the left of a line, the circle
+ * defined by this point and two others, etc.) are also defined in this class.
+ * <p>
+ * It is common to want to attach user-defined data to
+ * the vertices of a subdivision.
+ * One way to do this is to subclass <tt>Vertex</tt>
+ * to carry any desired information.
+ *
+ * @author David Skea
+ * @author Martin Davis
+ */
+public class Vertex
+{
+ public static final int LEFT = 0;
+ public static final int RIGHT = 1;
+ public static final int BEYOND = 2;
+ public static final int BEHIND = 3;
+ public static final int BETWEEN = 4;
+ public static final int ORIGIN = 5;
+ public static final int DESTINATION = 6;
+
+ private Coordinate p;
+ // private int edgeNumber = -1;
+
+ public Vertex(double _x, double _y) {
+ p = new Coordinate(_x, _y);
+ }
+
+ public Vertex(double _x, double _y, double _z) {
+ p = new Coordinate(_x, _y, _z);
+ }
+
+ public Vertex(Coordinate _p) {
+ p = new Coordinate(_p);
+ }
+
+ public double getX() {
+ return p.x;
+ }
+
+ public double getY() {
+ return p.y;
+ }
+
+ public double getZ() {
+ return p.z;
+ }
+
+ public void setZ(double _z) {
+ p.z = _z;
+ }
+
+ public Coordinate getCoordinate() {
+ return p;
+ }
+
+ public String toString() {
+ return "POINT (" + p.x + " " + p.y + ")";
+ }
+
+ public boolean equals(Vertex _x) {
+ if (p.x == _x.getX() && p.y == _x.getY()) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public boolean equals(Vertex _x, double tolerance) {
+ if (p.distance(_x.getCoordinate()) < tolerance) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public int classify(Vertex p0, Vertex p1) {
+ Vertex p2 = this;
+ Vertex a = p1.sub(p0);
+ Vertex b = p2.sub(p0);
+ double sa = a.crossProduct(b);
+ if (sa > 0.0)
+ return LEFT;
+ if (sa < 0.0)
+ return RIGHT;
+ if ((a.getX() * b.getX() < 0.0) || (a.getY() * b.getY() < 0.0))
+ return BEHIND;
+ if (a.magn() < b.magn())
+ return BEYOND;
+ if (p0.equals(p2))
+ return ORIGIN;
+ if (p1.equals(p2))
+ return DESTINATION;
+ return BETWEEN;
+ }
+
+ /**
+ * Computes the cross product k = u X v.
+ *
+ * @param v a vertex
+ * @return returns the magnitude of u X v
+ */
+ double crossProduct(Vertex v) {
+ return (p.x * v.getY() - p.y * v.getX());
+ }
+
+ /**
+ * Computes the inner or dot product
+ *
+ * @param v a vertex
+ * @return returns the dot product u.v
+ */
+ double dot(Vertex v) {
+ return (p.x * v.getX() + p.y * v.getY());
+ }
+
+ /**
+ * Computes the scalar product c(v)
+ *
+ * @param v a vertex
+ * @return returns the scaled vector
+ */
+ Vertex times(double c) {
+ return (new Vertex(c * p.x, c * p.y));
+ }
+
+ /* Vector addition */
+ Vertex sum(Vertex v) {
+ return (new Vertex(p.x + v.getX(), p.y + v.getY()));
+ }
+
+ /* and subtraction */
+ Vertex sub(Vertex v) {
+ return (new Vertex(p.x - v.getX(), p.y - v.getY()));
+ }
+
+ /* magnitude of vector */
+ double magn() {
+ return (Math.sqrt(p.x * p.x + p.y * p.y));
+ }
+
+ /* returns k X v (cross product). this is a vector perpendicular to v */
+ Vertex cross() {
+ return (new Vertex(p.y, -p.x));
+ }
+
+ /** ************************************************************* */
+ /***********************************************************************************************
+ * Geometric primitives /
+ **********************************************************************************************/
+
+ /**
+ * Tests if the vertex is inside the circle defined by
+ * the triangle with vertices a, b, c (oriented counter-clockwise).
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @return true if this vertex is in the circumcircle of (a,b,c)
+ */
+ public boolean isInCircle(Vertex a, Vertex b, Vertex c)
+ {
+ return TrianglePredicate.isInCircleRobust(a.p, b.p, c.p, this.p);
+ // non-robust - best to not use
+ //return TrianglePredicate.isInCircle(a.p, b.p, c.p, this.p);
+ }
+
+ /**
+ * Tests whether the triangle formed by this vertex and two
+ * other vertices is in CCW orientation.
+ *
+ * @param b a vertex
+ * @param c a vertex
+ * @return true if the triangle is oriented CCW
+ */
+ public final boolean isCCW(Vertex b, Vertex c)
+ {
+ /*
+ // test code used to check for robustness of triArea
+ boolean isCCW = (b.p.x - p.x) * (c.p.y - p.y)
+ - (b.p.y - p.y) * (c.p.x - p.x) > 0;
+ //boolean isCCW = triArea(this, b, c) > 0;
+ boolean isCCWRobust = CGAlgorithms.orientationIndex(p, b.p, c.p) == CGAlgorithms.COUNTERCLOCKWISE;
+ if (isCCWRobust != isCCW)
+ System.out.println("CCW failure");
+ //*/
+
+ // is equal to the signed area of the triangle
+
+ return (b.p.x - p.x) * (c.p.y - p.y)
+ - (b.p.y - p.y) * (c.p.x - p.x) > 0;
+
+ // original rolled code
+ //boolean isCCW = triArea(this, b, c) > 0;
+ //return isCCW;
+
+ }
+
+ public final boolean rightOf(QuadEdge e) {
+ return isCCW(e.dest(), e.orig());
+ }
+
+ public final boolean leftOf(QuadEdge e) {
+ return isCCW(e.orig(), e.dest());
+ }
+
+ private HCoordinate bisector(Vertex a, Vertex b) {
+ // returns the perpendicular bisector of the line segment ab
+ double dx = b.getX() - a.getX();
+ double dy = b.getY() - a.getY();
+ HCoordinate l1 = new HCoordinate(a.getX() + dx / 2.0, a.getY() + dy / 2.0, 1.0);
+ HCoordinate l2 = new HCoordinate(a.getX() - dy + dx / 2.0, a.getY() + dx + dy / 2.0, 1.0);
+ return new HCoordinate(l1, l2);
+ }
+
+ private double distance(Vertex v1, Vertex v2) {
+ return Math.sqrt(Math.pow(v2.getX() - v1.getX(), 2.0)
+ + Math.pow(v2.getY() - v1.getY(), 2.0));
+ }
+
+ /**
+ * Computes the value of the ratio of the circumradius to shortest edge. If smaller than some
+ * given tolerance B, the associated triangle is considered skinny. For an equal lateral
+ * triangle this value is 0.57735. The ratio is related to the minimum triangle angle theta by:
+ * circumRadius/shortestEdge = 1/(2sin(theta)).
+ *
+ * @param b second vertex of the triangle
+ * @param c third vertex of the triangle
+ * @return ratio of circumradius to shortest edge.
+ */
+ public double circumRadiusRatio(Vertex b, Vertex c) {
+ Vertex x = this.circleCenter(b, c);
+ double radius = distance(x, b);
+ double edgeLength = distance(this, b);
+ double el = distance(b, c);
+ if (el < edgeLength) {
+ edgeLength = el;
+ }
+ el = distance(c, this);
+ if (el < edgeLength) {
+ edgeLength = el;
+ }
+ return radius / edgeLength;
+ }
+
+ /**
+ * returns a new vertex that is mid-way between this vertex and another end point.
+ *
+ * @param a the other end point.
+ * @return the point mid-way between this and that.
+ */
+ public Vertex midPoint(Vertex a) {
+ double xm = (p.x + a.getX()) / 2.0;
+ double ym = (p.y + a.getY()) / 2.0;
+ double zm = (p.z + a.getZ()) / 2.0;
+ return new Vertex(xm, ym, zm);
+ }
+
+ /**
+ * Computes the centre of the circumcircle of this vertex and two others.
+ *
+ * @param b
+ * @param c
+ * @return the Coordinate which is the circumcircle of the 3 points.
+ */
+ public Vertex circleCenter(Vertex b, Vertex c) {
+ Vertex a = new Vertex(this.getX(), this.getY());
+ // compute the perpendicular bisector of cord ab
+ HCoordinate cab = bisector(a, b);
+ // compute the perpendicular bisector of cord bc
+ HCoordinate cbc = bisector(b, c);
+ // compute the intersection of the bisectors (circle radii)
+ HCoordinate hcc = new HCoordinate(cab, cbc);
+ Vertex cc = null;
+ try {
+ cc = new Vertex(hcc.getX(), hcc.getY());
+ } catch (NotRepresentableException nre) {
+ System.err.println("a: " + a + " b: " + b + " c: " + c);
+ System.err.println(nre);
+ }
+ return cc;
+ }
+
+ /**
+ * For this vertex enclosed in a triangle defined by three vertices v0, v1 and v2, interpolate
+ * a z value from the surrounding vertices.
+ */
+ public double interpolateZValue(Vertex v0, Vertex v1, Vertex v2) {
+ double x0 = v0.getX();
+ double y0 = v0.getY();
+ double a = v1.getX() - x0;
+ double b = v2.getX() - x0;
+ double c = v1.getY() - y0;
+ double d = v2.getY() - y0;
+ double det = a * d - b * c;
+ double dx = this.getX() - x0;
+ double dy = this.getY() - y0;
+ double t = (d * dx - b * dy) / det;
+ double u = (-c * dx + a * dy) / det;
+ double z = v0.getZ() + t * (v1.getZ() - v0.getZ()) + u * (v2.getZ() - v0.getZ());
+ return z;
+ }
+
+ /**
+ * Interpolates the Z-value (height) of a point enclosed in a triangle
+ * whose vertices all have Z values.
+ * The containing triangle must not be degenerate
+ * (in other words, the three vertices must enclose a
+ * non-zero area).
+ *
+ * @param p the point to interpolate the Z value of
+ * @param v0 a vertex of a triangle containing the p
+ * @param v1 a vertex of a triangle containing the p
+ * @param v2 a vertex of a triangle containing the p
+ * @return the interpolated Z-value (height) of the point
+ */
+ public static double interpolateZ(Coordinate p, Coordinate v0, Coordinate v1, Coordinate v2) {
+ double x0 = v0.x;
+ double y0 = v0.y;
+ double a = v1.x - x0;
+ double b = v2.x - x0;
+ double c = v1.y - y0;
+ double d = v2.y - y0;
+ double det = a * d - b * c;
+ double dx = p.x - x0;
+ double dy = p.y - y0;
+ double t = (d * dx - b * dy) / det;
+ double u = (-c * dx + a * dy) / det;
+ double z = v0.z + t * (v1.z - v0.z) + u * (v2.z - v0.z);
+ return z;
+ }
+
+ /**
+ * Computes the interpolated Z-value for a point p lying on the segment p0-p1
+ *
+ * @param p
+ * @param p0
+ * @param p1
+ * @return the interpolated Z value
+ */
+ public static double interpolateZ(Coordinate p, Coordinate p0, Coordinate p1) {
+ double segLen = p0.distance(p1);
+ double ptLen = p.distance(p0);
+ double dz = p1.z - p0.z;
+ double pz = p0.z + dz * (ptLen / segLen);
+ return pz;
+ }
+
+
+
+
+
+
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/package.html b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/package.html
new file mode 100644
index 0000000..c69a939
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/package.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+-->
+</head>
+<body bgcolor="white">
+
+Classes to implement a topological subdivision of quadeges, to support creating triangulations
+and Voronoi diagrams.
+
+</body>
+</html>
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/Assert.java b/modules/core/src/main/java/org/locationtech/jts/util/Assert.java
new file mode 100644
index 0000000..0cdc84d
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/Assert.java
@@ -0,0 +1,103 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+/**
+ * A utility for making programming assertions.
+ *
+ *@version 1.7
+ */
+public class Assert {
+
+ /**
+ * Throws an <code>AssertionFailedException</code> if the given assertion is
+ * not true.
+ *
+ *@param assertion a condition that is supposed to be true
+ *@throws AssertionFailedException if the condition is false
+ */
+ public static void isTrue(boolean assertion) {
+ isTrue(assertion, null);
+ }
+
+ /**
+ * Throws an <code>AssertionFailedException</code> with the given message if
+ * the given assertion is not true.
+ *
+ *@param assertion a condition that is supposed to be true
+ *@param message a description of the assertion
+ *@throws AssertionFailedException if the condition is false
+ */
+ public static void isTrue(boolean assertion, String message) {
+ if (!assertion) {
+ if (message == null) {
+ throw new AssertionFailedException();
+ }
+ else {
+ throw new AssertionFailedException(message);
+ }
+ }
+ }
+
+ /**
+ * Throws an <code>AssertionFailedException</code> if the given objects are
+ * not equal, according to the <code>equals</code> method.
+ *
+ *@param expectedValue the correct value
+ *@param actualValue the value being checked
+ *@throws AssertionFailedException if the two objects are not equal
+ */
+ public static void equals(Object expectedValue, Object actualValue) {
+ equals(expectedValue, actualValue, null);
+ }
+
+ /**
+ * Throws an <code>AssertionFailedException</code> with the given message if
+ * the given objects are not equal, according to the <code>equals</code>
+ * method.
+ *
+ *@param expectedValue the correct value
+ *@param actualValue the value being checked
+ *@param message a description of the assertion
+ *@throws AssertionFailedException if the two objects are not equal
+ */
+ public static void equals(Object expectedValue, Object actualValue, String message) {
+ if (!actualValue.equals(expectedValue)) {
+ throw new AssertionFailedException("Expected " + expectedValue + " but encountered "
+ + actualValue + (message != null ? ": " + message : ""));
+ }
+ }
+
+ /**
+ * Always throws an <code>AssertionFailedException</code>.
+ *
+ *@throws AssertionFailedException thrown always
+ */
+ public static void shouldNeverReachHere() {
+ shouldNeverReachHere(null);
+ }
+
+ /**
+ * Always throws an <code>AssertionFailedException</code> with the given
+ * message.
+ *
+ *@param message a description of the assertion
+ *@throws AssertionFailedException thrown always
+ */
+ public static void shouldNeverReachHere(String message) {
+ throw new AssertionFailedException("Should never reach here"
+ + (message != null ? ": " + message : ""));
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/AssertionFailedException.java b/modules/core/src/main/java/org/locationtech/jts/util/AssertionFailedException.java
new file mode 100644
index 0000000..d520e4c
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/AssertionFailedException.java
@@ -0,0 +1,42 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+/**
+ * Thrown when the application is in an inconsistent state. Indicates a problem
+ * with the code.
+ *
+ *@version 1.7
+ */
+public class AssertionFailedException extends RuntimeException {
+
+ /**
+ * Creates an <code>AssertionFailedException</code>.
+ */
+ public AssertionFailedException() {
+ super();
+ }
+
+ /**
+ * Creates a <code>AssertionFailedException</code> with the given detail
+ * message.
+ *
+ *@param message a description of the assertion
+ */
+ public AssertionFailedException(String message) {
+ super(message);
+ }
+}
+
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/CollectionUtil.java b/modules/core/src/main/java/org/locationtech/jts/util/CollectionUtil.java
new file mode 100644
index 0000000..e2f464e
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/CollectionUtil.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Utilities for processing {@link Collection}s.
+ *
+ * @version 1.7
+ */
+public class CollectionUtil
+{
+
+ public interface Function {
+ Object execute(Object obj);
+ }
+
+ /**
+ * Executes a function on each item in a {@link Collection}
+ * and returns the results in a new {@link List}
+ *
+ * @param coll the collection to process
+ * @param func the Function to execute
+ * @return a list of the transformed objects
+ */
+ public static List transform(Collection coll, Function func)
+ {
+ List result = new ArrayList();
+ for (Iterator i = coll.iterator(); i.hasNext(); ) {
+ result.add(func.execute(i.next()));
+ }
+ return result;
+ }
+
+ /**
+ * Executes a function on each item in a Collection but does
+ * not accumulate the result
+ *
+ * @param coll the collection to process
+ * @param func the Function to execute
+ */
+ public static void apply(Collection coll, Function func)
+ {
+ for (Iterator i = coll.iterator(); i.hasNext(); ) {
+ func.execute(i.next());
+ }
+ }
+
+ /**
+ * Executes a {@link Function} on each item in a Collection
+ * and collects all the entries for which the result
+ * of the function is equal to {@link Boolean} <tt>true</tt>.
+ *
+ * @param collection the collection to process
+ * @param func the Function to execute
+ * @return a list of objects for which the function was true
+ */
+ public static List select(Collection collection, Function func) {
+ List result = new ArrayList();
+ for (Iterator i = collection.iterator(); i.hasNext();) {
+ Object item = i.next();
+ if (Boolean.TRUE.equals(func.execute(item))) {
+ result.add(item);
+ }
+ }
+ return result;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/CoordinateArrayFilter.java b/modules/core/src/main/java/org/locationtech/jts/util/CoordinateArrayFilter.java
new file mode 100644
index 0000000..3f145ca
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/CoordinateArrayFilter.java
@@ -0,0 +1,53 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * A {@link CoordinateFilter} that creates an array containing every
+ * coordinate in a {@link Geometry}.
+ *
+ *@version 1.7
+ */
+public class CoordinateArrayFilter implements CoordinateFilter {
+ Coordinate[] pts = null;
+ int n = 0;
+
+ /**
+ * Constructs a <code>CoordinateArrayFilter</code>.
+ *
+ *@param size the number of points that the <code>CoordinateArrayFilter</code>
+ * will collect
+ */
+ public CoordinateArrayFilter(int size) {
+ pts = new Coordinate[size];
+ }
+
+ /**
+ * Returns the gathered <code>Coordinate</code>s.
+ *
+ *@return the <code>Coordinate</code>s collected by this <code>CoordinateArrayFilter</code>
+ */
+ public Coordinate[] getCoordinates() {
+ return pts;
+ }
+
+ public void filter(Coordinate coord) {
+ pts[n++] = coord;
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/CoordinateCountFilter.java b/modules/core/src/main/java/org/locationtech/jts/util/CoordinateCountFilter.java
new file mode 100644
index 0000000..16f2302
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/CoordinateCountFilter.java
@@ -0,0 +1,43 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+
+/**
+ * A {@link CoordinateFilter} that counts the total number of coordinates
+ * in a <code>Geometry</code>.
+ *
+ *@version 1.7
+ */
+public class CoordinateCountFilter implements CoordinateFilter {
+ private int n = 0;
+
+ public CoordinateCountFilter() { }
+
+ /**
+ * Returns the result of the filtering.
+ *
+ *@return the number of points found by this <code>CoordinateCountFilter</code>
+ */
+ public int getCount() {
+ return n;
+ }
+
+ public void filter(Coordinate coord) {
+ n++;
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/Debug.java b/modules/core/src/main/java/org/locationtech/jts/util/Debug.java
new file mode 100644
index 0000000..f74506f
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/Debug.java
@@ -0,0 +1,328 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+/**
+ *@version 1.7
+ */
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * Provides routines to simplify and localize debugging output.
+ * Debugging is controlled via a Java system property value.
+ * If the system property with the name given in
+ * DEBUG_PROPERTY_NAME (currently "jts.debug") has the value
+ * "on" or "true" debugging is enabled.
+ * Otherwise, debugging is disabled.
+ * The system property can be set by specifying the following JVM option:
+ * <pre>
+ * -Djts.debug=on
+ * </pre>
+ *
+ *
+ * @version 1.7
+ */
+public class Debug {
+
+ public static String DEBUG_PROPERTY_NAME = "jts.debug";
+ public static String DEBUG_PROPERTY_VALUE_ON = "on";
+ public static String DEBUG_PROPERTY_VALUE_TRUE = "true";
+
+ private static boolean debugOn = false;
+
+ static {
+ String debugValue = System.getProperty(DEBUG_PROPERTY_NAME);
+ if (debugValue != null) {
+ if (debugValue.equalsIgnoreCase(DEBUG_PROPERTY_VALUE_ON)
+ || debugValue.equalsIgnoreCase(DEBUG_PROPERTY_VALUE_TRUE) )
+ debugOn = true;
+ }
+ }
+
+ private static Stopwatch stopwatch = new Stopwatch();
+ private static long lastTimePrinted;
+
+ /**
+ * Prints the status of debugging to <tt>System.out</tt>
+ *
+ * @param args the cmd-line arguments (no arguments are required)
+ */
+ public static void main(String[] args)
+ {
+ System.out.println("JTS Debugging is " +
+ (debugOn ? "ON" : "OFF") );
+ }
+
+ private static final Debug debug = new Debug();
+ private static final GeometryFactory fact = new GeometryFactory();
+ private static final String DEBUG_LINE_TAG = "D! ";
+
+ private PrintStream out;
+ private Class[] printArgs;
+ private Object watchObj = null;
+ private Object[] args = new Object[1];
+
+ public static boolean isDebugging() { return debugOn; }
+
+ public static LineString toLine(Coordinate p0, Coordinate p1) {
+ return fact.createLineString(new Coordinate[] { p0, p1 });
+ }
+
+ public static LineString toLine(Coordinate p0, Coordinate p1, Coordinate p2) {
+ return fact.createLineString(new Coordinate[] { p0, p1, p2});
+ }
+
+ public static LineString toLine(Coordinate p0, Coordinate p1, Coordinate p2, Coordinate p3) {
+ return fact.createLineString(new Coordinate[] { p0, p1, p2, p3});
+ }
+
+ public static void print(String str) {
+ if (!debugOn) {
+ return;
+ }
+ debug.instancePrint(str);
+ }
+/*
+ public static void println(String str) {
+ if (! debugOn) return;
+ debug.instancePrint(str);
+ debug.println();
+ }
+*/
+ public static void print(Object obj) {
+ if (! debugOn) return;
+ debug.instancePrint(obj);
+ }
+
+ public static void print(boolean isTrue, Object obj) {
+ if (! debugOn) return;
+ if (! isTrue) return;
+ debug.instancePrint(obj);
+ }
+
+ public static void println(Object obj) {
+ if (!debugOn) {
+ return;
+ }
+ debug.instancePrint(obj);
+ debug.println();
+ }
+
+ public static void resetTime()
+ {
+ stopwatch.reset();
+ lastTimePrinted = stopwatch.getTime();
+ }
+
+ public static void printTime(String tag)
+ {
+ if (!debugOn) {
+ return;
+ }
+ long time = stopwatch.getTime();
+ long elapsedTime = time - lastTimePrinted;
+ debug.instancePrint(
+ formatField(Stopwatch.getTimeString(time), 10)
+ + " (" + formatField(Stopwatch.getTimeString(elapsedTime), 10) + " ) "
+ + tag);
+ debug.println();
+ lastTimePrinted = time;
+ }
+
+ private static String formatField(String s, int fieldLen)
+ {
+ int nPad = fieldLen - s.length();
+ if (nPad <= 0) return s;
+ String padStr = spaces(nPad) + s;
+ return padStr.substring(padStr.length() - fieldLen);
+ }
+
+ private static String spaces(int n)
+ {
+ char[] ch = new char[n];
+ for (int i = 0; i < n; i++) {
+ ch[i] = ' ';
+ }
+ return new String(ch);
+ }
+
+ public static boolean equals(Coordinate c1, Coordinate c2, double tolerance)
+ {
+ return c1.distance(c2) <= tolerance;
+ }
+ /**
+ * Adds an object to be watched.
+ * A watched object can be printed out at any time.
+ *
+ * Currently only supports one watched object at a time.
+ * @param obj
+ */
+ public static void addWatch(Object obj) {
+ debug.instanceAddWatch(obj);
+ }
+
+ public static void printWatch() {
+ debug.instancePrintWatch();
+ }
+
+ public static void printIfWatch(Object obj) {
+ debug.instancePrintIfWatch(obj);
+ }
+
+ public static void breakIf(boolean cond)
+ {
+ if (cond) doBreak();
+ }
+
+ public static void breakIfEqual(Object o1, Object o2)
+ {
+ if (o1.equals(o2)) doBreak();
+ }
+
+ public static void breakIfEqual(Coordinate p0, Coordinate p1, double tolerance)
+ {
+ if (p0.distance(p1) <= tolerance) doBreak();
+ }
+
+ private static void doBreak()
+ {
+ // Put breakpoint on following statement to break here
+ return;
+ }
+
+ public static boolean hasSegment(Geometry geom, Coordinate p0, Coordinate p1)
+ {
+ SegmentFindingFilter filter = new SegmentFindingFilter(p0, p1);
+ geom.apply(filter);
+ return filter.hasSegment();
+ }
+
+ private static class SegmentFindingFilter
+ implements CoordinateSequenceFilter
+ {
+ private Coordinate p0, p1;
+ private boolean hasSegment = false;
+
+ public SegmentFindingFilter(Coordinate p0, Coordinate p1)
+ {
+ this.p0 = p0;
+ this.p1 = p1;
+ }
+
+ public boolean hasSegment() { return hasSegment; }
+
+ public void filter(CoordinateSequence seq, int i)
+ {
+ if (i == 0) return;
+ hasSegment = p0.equals2D(seq.getCoordinate(i-1))
+ && p1.equals2D(seq.getCoordinate(i));
+ }
+
+ public boolean isDone()
+ {
+ return hasSegment;
+ }
+
+ public boolean isGeometryChanged()
+ {
+ return false;
+ }
+ }
+
+ private Debug() {
+ out = System.out;
+ printArgs = new Class[1];
+ try {
+ printArgs[0] = Class.forName("java.io.PrintStream");
+ }
+ catch (Exception ex) {
+ // ignore this exception - it will fail later anyway
+ }
+ }
+
+ public void instancePrintWatch() {
+ if (watchObj == null) return;
+ instancePrint(watchObj);
+ }
+
+ public void instancePrintIfWatch(Object obj) {
+ if (obj != watchObj) return;
+ if (watchObj == null) return;
+ instancePrint(watchObj);
+ }
+
+ public void instancePrint(Object obj)
+ {
+ if (obj instanceof Collection) {
+ instancePrint(((Collection) obj).iterator());
+ }
+ else if (obj instanceof Iterator) {
+ instancePrint((Iterator) obj);
+ }
+ else {
+ instancePrintObject(obj);
+ }
+ }
+
+ public void instancePrint(Iterator it)
+ {
+ for (; it.hasNext(); ) {
+ Object obj = it.next();
+ instancePrintObject(obj);
+ }
+ }
+ public void instancePrintObject(Object obj) {
+ //if (true) throw new RuntimeException("DEBUG TRAP!");
+ Method printMethod = null;
+ try {
+ Class cls = obj.getClass();
+ try {
+ printMethod = cls.getMethod("print", printArgs);
+ args[0] = out;
+ out.print(DEBUG_LINE_TAG);
+ printMethod.invoke(obj, args);
+ }
+ catch (NoSuchMethodException ex) {
+ instancePrint(obj.toString());
+ }
+ }
+ catch (Exception ex) {
+ ex.printStackTrace(out);
+ }
+ }
+
+ public void println() {
+ out.println();
+ }
+
+ private void instanceAddWatch(Object obj) {
+ watchObj = obj;
+ }
+
+ private void instancePrint(String str) {
+ out.print(DEBUG_LINE_TAG);
+ out.print(str);
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/GeometricShapeFactory.java b/modules/core/src/main/java/org/locationtech/jts/util/GeometricShapeFactory.java
new file mode 100644
index 0000000..f14dd26
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/GeometricShapeFactory.java
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.AffineTransformation;
+
+/**
+ * Computes various kinds of common geometric shapes.
+ * Provides various ways of specifying the location and extent
+ * and rotations of the generated shapes,
+ * as well as number of line segments used to form them.
+ * <p>
+ * <b>Example of usage:</b>
+ * <pre>
+ * GeometricShapeFactory gsf = new GeometricShapeFactory();
+ * gsf.setSize(100);
+ * gsf.setNumPoints(100);
+ * gsf.setBase(new Coordinate(100, 100));
+ * gsf.setRotation(0.5);
+ * Polygon rect = gsf.createRectangle();
+ * </pre>
+ *
+ * @version 1.7
+ */
+public class GeometricShapeFactory
+{
+ protected GeometryFactory geomFact;
+ protected PrecisionModel precModel = null;
+ protected Dimensions dim = new Dimensions();
+ protected int nPts = 100;
+
+ /**
+ * Default is no rotation.
+ */
+ protected double rotationAngle = 0.0;
+
+ /**
+ * Create a shape factory which will create shapes using the default
+ * {@link GeometryFactory}.
+ */
+ public GeometricShapeFactory()
+ {
+ this(new GeometryFactory());
+ }
+
+ /**
+ * Create a shape factory which will create shapes using the given
+ * {@link GeometryFactory}.
+ *
+ * @param geomFact the factory to use
+ */
+ public GeometricShapeFactory(GeometryFactory geomFact)
+ {
+ this.geomFact = geomFact;
+ precModel = geomFact.getPrecisionModel();
+ }
+
+ public void setEnvelope(Envelope env)
+ {
+ dim.setEnvelope(env);
+ }
+
+ /**
+ * Sets the location of the shape by specifying the base coordinate
+ * (which in most cases is the
+ * lower left point of the envelope containing the shape).
+ *
+ * @param base the base coordinate of the shape
+ */
+ public void setBase(Coordinate base) { dim.setBase(base); }
+ /**
+ * Sets the location of the shape by specifying the centre of
+ * the shape's bounding box
+ *
+ * @param centre the centre coordinate of the shape
+ */
+ public void setCentre(Coordinate centre) { dim.setCentre(centre); }
+
+ /**
+ * Sets the total number of points in the created {@link Geometry}.
+ * The created geometry will have no more than this number of points,
+ * unless more are needed to create a valid geometry.
+ */
+ public void setNumPoints(int nPts) { this.nPts = nPts; }
+
+ /**
+ * Sets the size of the extent of the shape in both x and y directions.
+ *
+ * @param size the size of the shape's extent
+ */
+ public void setSize(double size) { dim.setSize(size); }
+
+ /**
+ * Sets the width of the shape.
+ *
+ * @param width the width of the shape
+ */
+ public void setWidth(double width) { dim.setWidth(width); }
+
+ /**
+ * Sets the height of the shape.
+ *
+ * @param height the height of the shape
+ */
+ public void setHeight(double height) { dim.setHeight(height); }
+
+ /**
+ * Sets the rotation angle to use for the shape.
+ * The rotation is applied relative to the centre of the shape.
+ *
+ * @param radians the rotation angle in radians.
+ */
+ public void setRotation(double radians)
+ {
+ rotationAngle = radians;
+ }
+
+ protected Geometry rotate(Geometry geom)
+ {
+ if (rotationAngle != 0.0) {
+ AffineTransformation trans = AffineTransformation.rotationInstance(rotationAngle,
+ dim.getCentre().x, dim.getCentre().y);
+ geom.apply(trans);
+ }
+ return geom;
+ }
+
+ /**
+ * Creates a rectangular {@link Polygon}.
+ *
+ * @return a rectangular Polygon
+ *
+ */
+ public Polygon createRectangle()
+ {
+ int i;
+ int ipt = 0;
+ int nSide = nPts / 4;
+ if (nSide < 1) nSide = 1;
+ double XsegLen = dim.getEnvelope().getWidth() / nSide;
+ double YsegLen = dim.getEnvelope().getHeight() / nSide;
+
+ Coordinate[] pts = new Coordinate[4 * nSide + 1];
+ Envelope env = dim.getEnvelope();
+
+ //double maxx = env.getMinX() + nSide * XsegLen;
+ //double maxy = env.getMinY() + nSide * XsegLen;
+
+ for (i = 0; i < nSide; i++) {
+ double x = env.getMinX() + i * XsegLen;
+ double y = env.getMinY();
+ pts[ipt++] = coord(x, y);
+ }
+ for (i = 0; i < nSide; i++) {
+ double x = env.getMaxX();
+ double y = env.getMinY() + i * YsegLen;
+ pts[ipt++] = coord(x, y);
+ }
+ for (i = 0; i < nSide; i++) {
+ double x = env.getMaxX() - i * XsegLen;
+ double y = env.getMaxY();
+ pts[ipt++] = coord(x, y);
+ }
+ for (i = 0; i < nSide; i++) {
+ double x = env.getMinX();
+ double y = env.getMaxY() - i * YsegLen;
+ pts[ipt++] = coord(x, y);
+ }
+ pts[ipt++] = new Coordinate(pts[0]);
+
+ LinearRing ring = geomFact.createLinearRing(pts);
+ Polygon poly = geomFact.createPolygon(ring);
+ return (Polygon) rotate(poly);
+ }
+
+//* @deprecated use {@link createEllipse} instead
+ /**
+ * Creates a circular or elliptical {@link Polygon}.
+ *
+ * @return a circle or ellipse
+ */
+ public Polygon createCircle()
+ {
+ return createEllipse();
+ }
+
+ /**
+ * Creates an elliptical {@link Polygon}.
+ * If the supplied envelope is square the
+ * result will be a circle.
+ *
+ * @return an ellipse or circle
+ */
+ public Polygon createEllipse()
+ {
+
+ Envelope env = dim.getEnvelope();
+ double xRadius = env.getWidth() / 2.0;
+ double yRadius = env.getHeight() / 2.0;
+
+ double centreX = env.getMinX() + xRadius;
+ double centreY = env.getMinY() + yRadius;
+
+ Coordinate[] pts = new Coordinate[nPts + 1];
+ int iPt = 0;
+ for (int i = 0; i < nPts; i++) {
+ double ang = i * (2 * Math.PI / nPts);
+ double x = xRadius * Math.cos(ang) + centreX;
+ double y = yRadius * Math.sin(ang) + centreY;
+ pts[iPt++] = coord(x, y);
+ }
+ pts[iPt] = new Coordinate(pts[0]);
+
+ LinearRing ring = geomFact.createLinearRing(pts);
+ Polygon poly = geomFact.createPolygon(ring);
+ return (Polygon) rotate(poly);
+ }
+ /**
+ * Creates a squircular {@link Polygon}.
+ *
+ * @return a squircle
+ */
+ public Polygon createSquircle()
+ /**
+ * Creates a squircular {@link Polygon}.
+ *
+ * @return a squircle
+ */
+ {
+ return createSupercircle(4);
+ }
+
+ /**
+ * Creates a supercircular {@link Polygon}
+ * of a given positive power.
+ *
+ * @return a supercircle
+ */
+ public Polygon createSupercircle(double power)
+ {
+ double recipPow = 1.0 / power;
+
+ double radius = dim.getMinSize() / 2;
+ Coordinate centre = dim.getCentre();
+
+ double r4 = Math.pow(radius, power);
+ double y0 = radius;
+
+ double xyInt = Math.pow(r4 / 2, recipPow);
+
+ int nSegsInOct = nPts / 8;
+ int totPts = nSegsInOct * 8 + 1;
+ Coordinate[] pts = new Coordinate[totPts];
+ double xInc = xyInt / nSegsInOct;
+
+ for (int i = 0; i <= nSegsInOct; i++) {
+ double x = 0.0;
+ double y = y0;
+ if (i != 0) {
+ x = xInc * i;
+ double x4 = Math.pow(x, power);
+ y = Math.pow(r4 - x4, recipPow);
+ }
+ pts[i] = coordTrans(x, y, centre);
+ pts[2 * nSegsInOct - i] = coordTrans(y, x, centre);
+
+ pts[2 * nSegsInOct + i] = coordTrans(y, -x, centre);
+ pts[4 * nSegsInOct - i] = coordTrans(x, -y, centre);
+
+ pts[4 * nSegsInOct + i] = coordTrans(-x, -y, centre);
+ pts[6 * nSegsInOct - i] = coordTrans(-y, -x, centre);
+
+ pts[6 * nSegsInOct + i] = coordTrans(-y, x, centre);
+ pts[8 * nSegsInOct - i] = coordTrans(-x, y, centre);
+ }
+ pts[pts.length-1] = new Coordinate(pts[0]);
+
+ LinearRing ring = geomFact.createLinearRing(pts);
+ Polygon poly = geomFact.createPolygon(ring);
+ return (Polygon) rotate(poly);
+ }
+
+ /**
+ * Creates an elliptical arc, as a {@link LineString}.
+ * The arc is always created in a counter-clockwise direction.
+ * This can easily be reversed if required by using
+ * {#link LineString.reverse()}
+ *
+ * @param startAng start angle in radians
+ * @param angExtent size of angle in radians
+ * @return an elliptical arc
+ */
+ public LineString createArc(
+ double startAng,
+ double angExtent)
+ {
+ Envelope env = dim.getEnvelope();
+ double xRadius = env.getWidth() / 2.0;
+ double yRadius = env.getHeight() / 2.0;
+
+ double centreX = env.getMinX() + xRadius;
+ double centreY = env.getMinY() + yRadius;
+
+ double angSize = angExtent;
+ if (angSize <= 0.0 || angSize > 2 * Math.PI)
+ angSize = 2 * Math.PI;
+ double angInc = angSize / (nPts - 1);
+
+ Coordinate[] pts = new Coordinate[nPts];
+ int iPt = 0;
+ for (int i = 0; i < nPts; i++) {
+ double ang = startAng + i * angInc;
+ double x = xRadius * Math.cos(ang) + centreX;
+ double y = yRadius * Math.sin(ang) + centreY;
+ pts[iPt++] = coord(x, y);
+ }
+ LineString line = geomFact.createLineString(pts);
+ return (LineString) rotate(line);
+ }
+
+ /**
+ * Creates an elliptical arc polygon.
+ * The polygon is formed from the specified arc of an ellipse
+ * and the two radii connecting the endpoints to the centre of the ellipse.
+ *
+ * @param startAng start angle in radians
+ * @param angExtent size of angle in radians
+ * @return an elliptical arc polygon
+ */
+ public Polygon createArcPolygon(double startAng, double angExtent) {
+ Envelope env = dim.getEnvelope();
+ double xRadius = env.getWidth() / 2.0;
+ double yRadius = env.getHeight() / 2.0;
+
+ double centreX = env.getMinX() + xRadius;
+ double centreY = env.getMinY() + yRadius;
+
+ double angSize = angExtent;
+ if (angSize <= 0.0 || angSize > 2 * Math.PI)
+ angSize = 2 * Math.PI;
+ double angInc = angSize / (nPts - 1);
+ // double check = angInc * nPts;
+ // double checkEndAng = startAng + check;
+
+ Coordinate[] pts = new Coordinate[nPts + 2];
+
+ int iPt = 0;
+ pts[iPt++] = coord(centreX, centreY);
+ for (int i = 0; i < nPts; i++) {
+ double ang = startAng + angInc * i;
+
+ double x = xRadius * Math.cos(ang) + centreX;
+ double y = yRadius * Math.sin(ang) + centreY;
+ pts[iPt++] = coord(x, y);
+ }
+ pts[iPt++] = coord(centreX, centreY);
+ LinearRing ring = geomFact.createLinearRing(pts);
+ Polygon poly = geomFact.createPolygon(ring);
+ return (Polygon) rotate(poly);
+ }
+
+ protected Coordinate coord(double x, double y)
+ {
+ Coordinate pt = new Coordinate(x, y);
+ precModel.makePrecise(pt);
+ return pt;
+ }
+
+ protected Coordinate coordTrans(double x, double y, Coordinate trans)
+ {
+ return coord(x + trans.x, y + trans.y);
+ }
+
+ static protected class Dimensions
+ {
+ public Coordinate base;
+ public Coordinate centre;
+ public double width;
+ public double height;
+
+ public void setBase(Coordinate base) { this.base = base; }
+ public Coordinate getBase() { return base; }
+
+ public void setCentre(Coordinate centre) { this.centre = centre; }
+ public Coordinate getCentre()
+ {
+ if (centre == null) {
+ centre = new Coordinate(base.x + width/2, base.y + height/2);
+ }
+ return centre;
+ }
+
+ public void setSize(double size)
+ {
+ height = size;
+ width = size;
+ }
+
+ public double getMinSize()
+ {
+ return Math.min(width, height);
+ }
+ public void setWidth(double width) { this.width = width; }
+ public double getWidth() { return width; }
+ public double getHeight() { return height; }
+
+ public void setHeight(double height) { this.height = height; }
+
+ public void setEnvelope(Envelope env)
+ {
+ this.width = env.getWidth();
+ this.height = env.getHeight();
+ this.base = new Coordinate(env.getMinX(), env.getMinY());
+ this.centre = new Coordinate(env.centre());
+ }
+
+ public Envelope getEnvelope() {
+ if (base != null) {
+ return new Envelope(base.x, base.x + width, base.y, base.y + height);
+ }
+ if (centre != null) {
+ return new Envelope(centre.x - width/2, centre.x + width/2,
+ centre.y - height/2, centre.y + height/2);
+ }
+ return new Envelope(0, width, 0, height);
+ }
+
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/Memory.java b/modules/core/src/main/java/org/locationtech/jts/util/Memory.java
new file mode 100644
index 0000000..5b0cdb9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/Memory.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+/**
+ * Utility functions to report JVM memory usage.
+ *
+ * @author mbdavis
+ *
+ */
+public class Memory
+{
+ public static long used()
+ {
+ Runtime runtime = Runtime.getRuntime ();
+ return runtime.totalMemory() - runtime.freeMemory();
+ }
+
+ public static String usedString()
+ {
+ return format(used());
+ }
+
+ public static long free()
+ {
+ Runtime runtime = Runtime.getRuntime ();
+ return runtime.freeMemory();
+ }
+
+ public static String freeString()
+ {
+ return format(free());
+ }
+
+ public static long total()
+ {
+ Runtime runtime = Runtime.getRuntime ();
+ return runtime.totalMemory();
+ }
+
+ public static String totalString()
+ {
+ return format(total());
+ }
+
+ public static String usedTotalString()
+ {
+ return "Used: " + usedString()
+ + " Total: " + totalString();
+ }
+
+ public static String allString()
+ {
+ return "Used: " + usedString()
+ + " Free: " + freeString()
+ + " Total: " + totalString();
+ }
+
+ public static final double KB = 1024;
+ public static final double MB = 1048576;
+ public static final double GB = 1073741824;
+
+ public static String format(long mem)
+ {
+ if (mem < 2 * KB)
+ return mem + " bytes";
+ if (mem < 2 * MB)
+ return round(mem / KB) + " KB";
+ if (mem < 2 * GB)
+ return round(mem / MB) + " MB";
+ return round(mem / GB) + " GB";
+ }
+
+ public static double round(double d)
+ {
+ return Math.ceil(d * 100) / 100;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/NumberUtil.java b/modules/core/src/main/java/org/locationtech/jts/util/NumberUtil.java
new file mode 100644
index 0000000..1a0d861
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/NumberUtil.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.util;
+
+public class NumberUtil
+{
+
+ public static boolean equalsWithTolerance(double x1, double x2, double tolerance)
+ {
+ return Math.abs(x1 - x2) <= tolerance;
+ }
+
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/ObjectCounter.java b/modules/core/src/main/java/org/locationtech/jts/util/ObjectCounter.java
new file mode 100644
index 0000000..53db312
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/ObjectCounter.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Counts occurrences of objects.
+ *
+ * @author Martin Davis
+ *
+ */
+public class ObjectCounter
+{
+
+ private Map counts = new HashMap();
+
+ public ObjectCounter() {
+ }
+
+ public void add(Object o)
+ {
+ Counter counter = (Counter) counts.get(o);
+ if (counter == null)
+ counts.put(o, new Counter(1));
+ else
+ counter.increment();
+ }
+
+ // TODO: add remove(Object o)
+
+ public int count(Object o)
+ {
+ Counter counter = (Counter) counts.get(o);
+ if (counter == null)
+ return 0;
+ else
+ return counter.count();
+
+ }
+ private static class Counter
+ {
+ int count = 0;
+
+ public Counter()
+ {
+
+ }
+
+ public Counter(int count)
+ {
+ this.count = count;
+ }
+
+ public int count()
+ {
+ return count;
+ }
+
+ public void increment()
+ {
+ count++;
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/PriorityQueue.java b/modules/core/src/main/java/org/locationtech/jts/util/PriorityQueue.java
new file mode 100644
index 0000000..1377931
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/PriorityQueue.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+import java.util.ArrayList;
+
+/**
+ * A priority queue over a set of {@link Comparable} objects.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PriorityQueue
+{
+ private int size; // Number of elements in queue
+ private ArrayList items; // The queue binary heap array
+
+ /**
+ * Creates a new empty priority queue
+ */
+ public PriorityQueue() {
+ size = 0;
+ items = new ArrayList();
+ // create space for sentinel
+ items.add(null);
+ }
+
+ /**
+ * Insert into the priority queue.
+ * Duplicates are allowed.
+ * @param x the item to insert.
+ */
+ public void add(Comparable x)
+ {
+ // increase the size of the items heap to create a hole for the new item
+ items.add(null);
+
+ // Insert item at end of heap and then re-establish ordering
+ size += 1;
+ int hole = size;
+ // set the item as a sentinel at the base of the heap
+ items.set(0, x);
+
+ // move the item up from the hole position to its correct place
+ for (; x.compareTo(items.get(hole / 2)) < 0; hole /= 2) {
+ items.set(hole, items.get(hole / 2));
+ }
+ // insert the new item in the correct place
+ items.set(hole, x);
+ }
+
+ /**
+ * Establish heap from an arbitrary arrangement of items.
+ */
+ /*
+ private void buildHeap( ) {
+ for( int i = currentSize / 2; i > 0; i-- )
+ reorder( i );
+ }
+ */
+
+ /**
+ * Test if the priority queue is logically empty.
+ * @return true if empty, false otherwise.
+ */
+ public boolean isEmpty() {
+ return size == 0;
+ }
+
+ /**
+ * Returns size.
+ * @return current size.
+ */
+ public int size() {
+ return size;
+ }
+
+ /**
+ * Make the priority queue logically empty.
+ */
+ public void clear() {
+ size = 0;
+ items.clear();
+ }
+
+ /**
+ * Remove the smallest item from the priority queue.
+ * @return the smallest item, or null if empty
+ */
+ public Object poll()
+ {
+ if (isEmpty())
+ return null;
+ Object minItem = items.get(1);
+ items.set(1, items.get(size));
+ size -= 1;
+ reorder(1);
+
+ return minItem;
+ }
+
+ /**
+ * Internal method to percolate down in the heap.
+ *
+ * @param hole the index at which the percolate begins.
+ */
+ private void reorder(int hole)
+ {
+ int child;
+ Object tmp = items.get(hole);
+
+ for (; hole * 2 <= size; hole = child) {
+ child = hole * 2;
+ if (child != size
+ && ((Comparable) items.get(child + 1)).compareTo(items.get(child)) < 0)
+ child++;
+ if (((Comparable) items.get(child)).compareTo(tmp) < 0)
+ items.set(hole, items.get(child));
+ else
+ break;
+ }
+ items.set(hole, tmp);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/Stopwatch.java b/modules/core/src/main/java/org/locationtech/jts/util/Stopwatch.java
new file mode 100644
index 0000000..76c03fb
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/Stopwatch.java
@@ -0,0 +1,87 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+/**
+ * Implements a timer function which can compute
+ * elapsed time as well as split times.
+ *
+ * @version 1.7
+ */
+public class Stopwatch {
+
+ private long startTimestamp;
+ private long totalTime = 0;
+ private boolean isRunning = false;
+
+ public Stopwatch()
+ {
+ start();
+ }
+
+ public void start()
+ {
+ if (isRunning) return;
+ startTimestamp = System.currentTimeMillis();
+ isRunning = true;
+ }
+
+ public long stop()
+ {
+ if (isRunning) {
+ updateTotalTime();
+ isRunning = false;
+ }
+ return totalTime;
+ }
+
+ public void reset()
+ {
+ totalTime = 0;
+ startTimestamp = System.currentTimeMillis();
+ }
+
+ public long split()
+ {
+ if (isRunning)
+ updateTotalTime();
+ return totalTime;
+ }
+
+ private void updateTotalTime()
+ {
+ long endTimestamp = System.currentTimeMillis();
+ long elapsedTime = endTimestamp - startTimestamp;
+ startTimestamp = endTimestamp;
+ totalTime += elapsedTime;
+ }
+
+ public long getTime()
+ {
+ updateTotalTime();
+ return totalTime;
+ }
+
+ public String getTimeString()
+ {
+ long totalTime = getTime();
+ return getTimeString(totalTime);
+ }
+
+ public static String getTimeString(long timeMillis) {
+ String totalTimeStr = timeMillis < 10000
+ ? timeMillis + " ms"
+ : (double) timeMillis / 1000.0 + " s";
+ return totalTimeStr;
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/StringUtil.java b/modules/core/src/main/java/org/locationtech/jts/util/StringUtil.java
new file mode 100644
index 0000000..f8bd20b
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/StringUtil.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.PrintStream;
+import java.io.StringReader;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+
+/**
+ * Utility methods for working with {@link String}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public class StringUtil
+{
+ /**
+ * Mimics the the Java SE {@link String#split(String)} method.
+ *
+ * @param s the string to split.
+ * @param separator the separator to use.
+ * @return the array of split strings.
+ */
+ public static String[] split(String s, String separator)
+ {
+ int separatorlen = separator.length();
+ ArrayList tokenList = new ArrayList();
+ String tmpString = "" + s;
+ int pos = tmpString.indexOf(separator);
+ while (pos >= 0) {
+ String token = tmpString.substring(0, pos);
+ tokenList.add(token);
+ tmpString = tmpString.substring(pos + separatorlen);
+ pos = tmpString.indexOf(separator);
+ }
+ if (tmpString.length() > 0)
+ tokenList.add(tmpString);
+ String[] res = new String[tokenList.size()];
+ for (int i = 0; i < res.length; i++) {
+ res[i] = (String) tokenList.get(i);
+ }
+ return res;
+ }
+
+ public final static String NEWLINE = System.getProperty("line.separator");
+
+ /**
+ * Returns an throwable's stack trace
+ */
+ public static String getStackTrace(Throwable t) {
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(os);
+ t.printStackTrace(ps);
+ return os.toString();
+ }
+
+ public static String getStackTrace(Throwable t, int depth) {
+ String stackTrace = "";
+ StringReader stringReader = new StringReader(getStackTrace(t));
+ LineNumberReader lineNumberReader = new LineNumberReader(stringReader);
+ for (int i = 0; i < depth; i++) {
+ try {
+ stackTrace += lineNumberReader.readLine() + NEWLINE;
+ } catch (IOException e) {
+ Assert.shouldNeverReachHere();
+ }
+ }
+ return stackTrace;
+ }
+
+ private static NumberFormat SIMPLE_ORDINATE_FORMAT = new DecimalFormat("0.#");
+
+ public static String toString(double d)
+ {
+ return SIMPLE_ORDINATE_FORMAT.format(d);
+ }
+
+ public static String spaces(int n)
+ {
+ return chars(' ', n);
+ }
+
+ public static String chars(char c, int n)
+ {
+ char[] ch = new char[n];
+ for (int i = 0; i < n; i++) {
+ ch[i] = c;
+ }
+ return new String(ch);
+ }
+}
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/UniqueCoordinateArrayFilter.java b/modules/core/src/main/java/org/locationtech/jts/util/UniqueCoordinateArrayFilter.java
new file mode 100644
index 0000000..3e01ad9
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/UniqueCoordinateArrayFilter.java
@@ -0,0 +1,69 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.util;
+
+import java.util.ArrayList;
+import java.util.TreeSet;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+
+
+/**
+ * A {@link CoordinateFilter} that builds a set of <code>Coordinate</code>s.
+ * The set of coordinates contains no duplicate points.
+ * It preserves the order of the input points.
+ *
+ *@version 1.7
+ */
+public class UniqueCoordinateArrayFilter implements CoordinateFilter
+{
+ /**
+ * Convenience method which allows running the filter over an array of {@link Coordinate}s.
+ *
+ * @param coords an array of coordinates
+ * @return an array of the unique coordinates
+ */
+ public static Coordinate[] filterCoordinates(Coordinate[] coords)
+ {
+ UniqueCoordinateArrayFilter filter = new UniqueCoordinateArrayFilter();
+ for (int i = 0; i < coords.length; i++) {
+ filter.filter(coords[i]);
+ }
+ return filter.getCoordinates();
+ }
+
+ TreeSet treeSet = new TreeSet();
+ ArrayList list = new ArrayList();
+
+ public UniqueCoordinateArrayFilter() { }
+
+ /**
+ * Returns the gathered <code>Coordinate</code>s.
+ *
+ *@return the <code>Coordinate</code>s collected by this <code>CoordinateArrayFilter</code>
+ */
+ public Coordinate[] getCoordinates() {
+ Coordinate[] coordinates = new Coordinate[list.size()];
+ return (Coordinate[]) list.toArray(coordinates);
+ }
+
+ public void filter(Coordinate coord) {
+ if (!treeSet.contains(coord)) {
+ list.add(coord);
+ treeSet.add(coord);
+ }
+ }
+}
+
diff --git a/modules/core/src/main/java/org/locationtech/jts/util/package.html b/modules/core/src/main/java/org/locationtech/jts/util/package.html
new file mode 100644
index 0000000..e44abbc
--- /dev/null
+++ b/modules/core/src/main/java/org/locationtech/jts/util/package.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+Contains support classes for the Java Topology Suite.
+</body>
+</html>
diff --git a/modules/core/src/main/javadoc/overview.html b/modules/core/src/main/javadoc/overview.html
new file mode 100644
index 0000000..b65efcd
--- /dev/null
+++ b/modules/core/src/main/javadoc/overview.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+ <HEAD>
+ <TITLE>JTS Topology Suite</TITLE>
+ </HEAD>
+ <BODY>
+ The JTS Topology Suite (JTS) is an open source Java software library that provides an object model for planar geometry together with a set of fundamental geometric functions.
+ JTS conforms to the Simple Features Specification for SQL published by the Open GIS Consortium.
+ JTS is designed to be used as a core component of vector-based geomatics software such as geographical information systems.
+ It can also be used as a general-purpose library providing algorithms in computational geometry.
+ </BODY>
+</HTML>
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/AbstractPointInRingTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/AbstractPointInRingTest.java
new file mode 100644
index 0000000..86e9e3d
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/AbstractPointInRingTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Location;
+
+import test.jts.GeometryTestCase;
+
+/**
+ * Tests PointInRing algorithms
+ *
+ * @version 1.7
+ */
+public abstract class AbstractPointInRingTest extends GeometryTestCase {
+
+
+ public AbstractPointInRingTest(String name) { super(name); }
+
+ public void testBox() throws Exception
+ {
+ runPtInRing(Location.INTERIOR, new Coordinate(10, 10),
+"POLYGON ((0 0, 0 20, 20 20, 20 0, 0 0))");
+ }
+
+ public void testComplexRing() throws Exception
+ {
+ runPtInRing(Location.INTERIOR, new Coordinate(0, 0),
+"POLYGON ((-40 80, -40 -80, 20 0, 20 -100, 40 40, 80 -80, 100 80, 140 -20, 120 140, 40 180, 60 40, 0 120, -20 -20, -40 80))");
+ }
+
+ public static final String comb =
+ "POLYGON ((0 0, 0 10, 4 5, 6 10, 7 5, 9 10, 10 5, 13 5, 15 10, 16 3, 17 10, 18 3, 25 10, 30 10, 30 0, 15 0, 14 5, 13 0, 9 0, 8 5, 6 0, 0 0))";
+
+ public void testComb() throws Exception
+ {
+ runPtInRing(Location.BOUNDARY, new Coordinate(0, 0), comb);
+ runPtInRing(Location.BOUNDARY, new Coordinate(0, 1), comb);
+ // at vertex
+ runPtInRing(Location.BOUNDARY, new Coordinate(4, 5), comb);
+ runPtInRing(Location.BOUNDARY, new Coordinate(8, 5), comb);
+
+ // on horizontal segment
+ runPtInRing(Location.BOUNDARY, new Coordinate(11, 5), comb);
+ // on vertical segment
+ runPtInRing(Location.BOUNDARY, new Coordinate(30, 5), comb);
+ // on angled segment
+ runPtInRing(Location.BOUNDARY, new Coordinate(22, 7), comb);
+
+
+
+ runPtInRing(Location.INTERIOR, new Coordinate(1, 5), comb);
+ runPtInRing(Location.INTERIOR, new Coordinate(5, 5), comb);
+ runPtInRing(Location.INTERIOR, new Coordinate(1, 7), comb);
+
+
+
+ runPtInRing(Location.EXTERIOR, new Coordinate(12, 10), comb);
+ runPtInRing(Location.EXTERIOR, new Coordinate(16, 5), comb);
+ runPtInRing(Location.EXTERIOR, new Coordinate(35, 5), comb);
+ }
+
+ public static final String repeatedPts =
+ "POLYGON ((0 0, 0 10, 2 5, 2 5, 2 5, 2 5, 2 5, 3 10, 6 10, 8 5, 8 5, 8 5, 8 5, 10 10, 10 5, 10 5, 10 5, 10 5, 10 0, 0 0))";
+
+ /**
+ * Tests that repeated points are handled correctly
+ * @throws Exception
+ */
+ public void testRepeatedPts() throws Exception
+ {
+ runPtInRing(Location.BOUNDARY, new Coordinate(0, 0), repeatedPts);
+ runPtInRing(Location.BOUNDARY, new Coordinate(0, 1), repeatedPts);
+
+ // at vertex
+ runPtInRing(Location.BOUNDARY, new Coordinate(2, 5), repeatedPts);
+ runPtInRing(Location.BOUNDARY, new Coordinate(8, 5), repeatedPts);
+ runPtInRing(Location.BOUNDARY, new Coordinate(10, 5), repeatedPts);
+
+ runPtInRing(Location.INTERIOR, new Coordinate(1, 5), repeatedPts);
+ runPtInRing(Location.INTERIOR, new Coordinate(3, 5), repeatedPts);
+
+ }
+
+ /**
+ * Cases generated from RayCrossingCounterStressTest.
+ *
+ * @throws Exception
+ */
+ public void testRobustStressTriangles() throws Exception {
+ runPtInRing(Location.EXTERIOR, new Coordinate(25.374625374625374, 128.35564435564436), "POLYGON ((0.0 0.0, 0.0 172.0, 100.0 0.0, 0.0 0.0))");
+ runPtInRing(Location.INTERIOR, new Coordinate(97.96039603960396, 782.0), "POLYGON ((642.0 815.0, 69.0 764.0, 394.0 966.0, 642.0 815.0))");
+ }
+
+ public void testRobustTriangle() throws Exception {
+ runPtInRing(Location.EXTERIOR, new Coordinate(3.166572116932842, 48.5390194687463), "POLYGON ((2.152214146946829 50.470470727186765, 18.381941666723034 19.567250592139274, 2.390837642830135 49.228045261718165, 2.152214146946829 50.470470727186765))");
+ }
+
+ abstract protected void runPtInRing(int expectedLoc, Coordinate pt, String wkt)
+ throws Exception;
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/AngleTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/AngleTest.java
new file mode 100644
index 0000000..10bfdd6
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/AngleTest.java
@@ -0,0 +1,105 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * @version 1.7
+ */
+public class AngleTest extends TestCase {
+
+ private static final double TOLERANCE = 1E-5;
+
+ public static void main(String args[]) {
+ TestRunner.run(AngleTest.class);
+ }
+
+ public AngleTest(String name) { super(name); }
+
+ public void testAngle() throws Exception
+ {
+ assertEquals(Angle.angle(new Coordinate(10,0)), 0.0, TOLERANCE);
+ assertEquals(Angle.angle(new Coordinate(10,10)), Math.PI/4, TOLERANCE);
+ assertEquals(Angle.angle(new Coordinate(0,10)), Math.PI/2, TOLERANCE);
+ assertEquals(Angle.angle(new Coordinate(-10,10)), 0.75*Math.PI, TOLERANCE);
+ assertEquals(Angle.angle(new Coordinate(-10,0)), Math.PI, TOLERANCE);
+ assertEquals(Angle.angle(new Coordinate(-10,-0.1)), -3.131592986903128, TOLERANCE);
+ assertEquals(Angle.angle(new Coordinate(-10,-10)), -0.75*Math.PI, TOLERANCE);
+ }
+
+ public void testIsAcute() throws Exception
+ {
+ assertEquals(Angle.isAcute(new Coordinate(10,0), new Coordinate(0,0), new Coordinate(5,10)), true);
+ assertEquals(Angle.isAcute(new Coordinate(10,0), new Coordinate(0,0), new Coordinate(5,-10)), true);
+ // angle of 0
+ assertEquals(Angle.isAcute(new Coordinate(10,0), new Coordinate(0,0), new Coordinate(10,0)), true);
+
+ assertEquals(Angle.isAcute(new Coordinate(10,0), new Coordinate(0,0), new Coordinate(-5,10)), false);
+ assertEquals(Angle.isAcute(new Coordinate(10,0), new Coordinate(0,0), new Coordinate(-5,-10)), false);
+
+
+ }
+
+ public void testNormalizePositive() throws Exception
+ {
+ assertEquals(Angle.normalizePositive(0.0), 0.0, TOLERANCE);
+
+ assertEquals(Angle.normalizePositive(-0.5*Math.PI), 1.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(-Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(-1.5*Math.PI), .5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(-2*Math.PI), 0.0, TOLERANCE);
+ assertEquals(Angle.normalizePositive(-2.5*Math.PI), 1.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(-3*Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(-4 * Math.PI), 0.0, TOLERANCE);
+
+ assertEquals(Angle.normalizePositive(0.5*Math.PI), 0.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(1.5*Math.PI), 1.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(2*Math.PI), 0.0, TOLERANCE);
+ assertEquals(Angle.normalizePositive(2.5*Math.PI), 0.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(3*Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalizePositive(4 * Math.PI), 0.0, TOLERANCE);
+
+ }
+
+ public void testNormalize() throws Exception
+ {
+ assertEquals(Angle.normalize(0.0), 0.0, TOLERANCE);
+
+ assertEquals(Angle.normalize(-0.5*Math.PI), -0.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(-Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(-1.5*Math.PI), .5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(-2*Math.PI), 0.0, TOLERANCE);
+ assertEquals(Angle.normalize(-2.5*Math.PI), -0.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(-3*Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(-4 * Math.PI), 0.0, TOLERANCE);
+
+ assertEquals(Angle.normalize(0.5*Math.PI), 0.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(1.5*Math.PI), -0.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(2*Math.PI), 0.0, TOLERANCE);
+ assertEquals(Angle.normalize(2.5*Math.PI), 0.5*Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(3*Math.PI), Math.PI, TOLERANCE);
+ assertEquals(Angle.normalize(4 * Math.PI), 0.0, TOLERANCE);
+
+
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/AreaTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/AreaTest.java
new file mode 100644
index 0000000..e52d43b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/AreaTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.LinearRing;
+
+import junit.textui.TestRunner;
+import test.jts.GeometryTestCase;
+
+public class AreaTest extends GeometryTestCase {
+ public static void main(String args[]) {
+ TestRunner.run(AreaTest.class);
+ }
+
+ public AreaTest(String name) { super(name); }
+
+ public void testArea() {
+ checkAreaOfRing("LINEARRING (100 200, 200 200, 200 100, 100 100, 100 200)", 10000.0);
+ }
+
+ public void testAreaSignedCW() {
+ checkAreaOfRingSigned("LINEARRING (100 200, 200 200, 200 100, 100 100, 100 200)", 10000.0);
+ }
+
+ public void testAreaSignedCCW() {
+ checkAreaOfRingSigned("LINEARRING (100 200, 100 100, 200 100, 200 200, 100 200)", -10000.0);
+ }
+
+ void checkAreaOfRing(String wkt, double expectedArea) {
+ LinearRing ring = (LinearRing) read(wkt);
+
+ Coordinate[] ringPts = ring.getCoordinates();
+ double actual1 = Area.ofRing(ringPts);
+ assertEquals(actual1, expectedArea);
+
+ CoordinateSequence ringSeq = ring.getCoordinateSequence();
+ double actual2 = Area.ofRing(ringSeq);
+ assertEquals(actual2, expectedArea);
+ }
+
+ void checkAreaOfRingSigned(String wkt, double expectedArea) {
+ LinearRing ring = (LinearRing) read(wkt);
+
+ Coordinate[] ringPts = ring.getCoordinates();
+ double actual1 = Area.ofRingSigned(ringPts);
+ assertEquals(actual1, expectedArea);
+
+ CoordinateSequence ringSeq = ring.getCoordinateSequence();
+ double actual2 = Area.ofRingSigned(ringSeq);
+ assertEquals(actual2, expectedArea);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/CGAlgorithmsDDTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/CGAlgorithmsDDTest.java
new file mode 100644
index 0000000..ff89416
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/CGAlgorithmsDDTest.java
@@ -0,0 +1,23 @@
+package org.locationtech.jts.algorithm;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+public class CGAlgorithmsDDTest
+extends TestCase {
+ public static void main(String args[]) {
+ TestRunner.run(CGAlgorithmsDDTest.class);
+ }
+
+ public CGAlgorithmsDDTest(String name) { super(name); }
+
+ public void testSignOfDet2x2() {
+ checkSignOfDet2x2(1, 1, 2, 2, 0);
+ checkSignOfDet2x2(1, 1, 2, 3, 1);
+ checkSignOfDet2x2(1, 1, 3, 2, -1);
+ }
+
+ private void checkSignOfDet2x2(double x1, double y1, double x2, double y2, int sign) {
+ assertEquals(sign, CGAlgorithmsDD.signOfDet2x2(x1, y1, x2, y2));
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/CentroidTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/CentroidTest.java
new file mode 100644
index 0000000..86b48a1
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/CentroidTest.java
@@ -0,0 +1,50 @@
+package org.locationtech.jts.algorithm;
+
+import junit.framework.TestCase;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+
+public class CentroidTest extends TestCase {
+
+ private static final double TOLERANCE = 1e-10;
+
+ public CentroidTest(String name) {
+ super(name);
+ }
+
+ /** Compute the centroid of a geometry as an area-weighted average of the centroids
+ * of its components.
+ *
+ * @param g a polygonal geometry
+ * @return Coordinate of the geometry's centroid
+ */
+ private static Coordinate areaWeightedCentroid(Geometry g) {
+ double totalArea = g.getArea();
+ double cx = 0;
+ double cy = 0;
+
+ for(int i = 0; i < g.getNumGeometries(); i++) {
+ Geometry component = g.getGeometryN(i);
+ double areaFraction = component.getArea() / totalArea;
+
+ Coordinate componentCentroid = component.getCentroid().getCoordinate();
+
+ cx += areaFraction * componentCentroid.x;
+ cy += areaFraction * componentCentroid.y;
+ }
+
+ return new Coordinate(cx, cy);
+ }
+
+ public void testCentroidMultiPolygon() throws Exception {
+ // Verify that the computed centroid of a MultiPolygon is equivalent to the
+ // area-weighted average of its components.
+ Geometry g = new WKTReader().read(
+ "MULTIPOLYGON ((( -92.661322 36.58994900000003, -92.66132199999993 36.58994900000005, -92.66132199999993 36.589949000000004, -92.661322 36.589949, -92.661322 36.58994900000003)), (( -92.65560500000008 36.58708800000005, -92.65560499999992 36.58708800000005, -92.65560499998745 36.587087999992576, -92.655605 36.587088, -92.65560500000008 36.58708800000005 )), (( -92.65512450000065 36.586800000000466, -92.65512449999994 36.58680000000004, -92.65512449998666 36.5867999999905, [...]
+ );
+
+ assertTrue(areaWeightedCentroid(g).equals2D(g.getCentroid().getCoordinate(), TOLERANCE));
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/ConvexHullTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/ConvexHullTest.java
new file mode 100644
index 0000000..94e9fb8
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/ConvexHullTest.java
@@ -0,0 +1,146 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+
+import java.util.Stack;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * Test for {@link ConvexHull}.
+ *
+ * @version 1.7
+ */
+public class ConvexHullTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1000);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(suite());
+ }
+
+ public ConvexHullTest(String name) { super(name); }
+
+ public static Test suite() { return new TestSuite(ConvexHullTest.class); }
+
+ public void testManyIdenticalPoints() throws Exception {
+ Coordinate[] pts = new Coordinate[100];
+ for (int i = 0; i < 99; i++)
+ pts[i] = new Coordinate(0,0);
+ pts[99] = new Coordinate(1,1);
+ ConvexHull ch = new ConvexHull(pts, geometryFactory);
+ Geometry actualGeometry = ch.getConvexHull();
+ Geometry expectedGeometry = reader.read("LINESTRING (0 0, 1 1)");
+ assertTrue(expectedGeometry.equalsExact(actualGeometry));
+ }
+
+ public void testAllIdenticalPoints() throws Exception {
+ Coordinate[] pts = new Coordinate[100];
+ for (int i = 0; i < 100; i++)
+ pts[i] = new Coordinate(0,0);
+ ConvexHull ch = new ConvexHull(pts, geometryFactory);
+ Geometry actualGeometry = ch.getConvexHull();
+ Geometry expectedGeometry = reader.read("POINT (0 0)");
+ assertTrue(expectedGeometry.equalsExact(actualGeometry));
+ }
+
+ public void test1() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ LineString lineString = (LineString) reader.read("LINESTRING (30 220, 240 220, 240 220)");
+ LineString convexHull = (LineString) reader.read("LINESTRING (30 220, 240 220)");
+ assertTrue(convexHull.equalsExact(lineString.convexHull()));
+ }
+
+ public void test2() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ Geometry geometry = reader.read("MULTIPOINT (130 240, 130 240, 130 240, 570 240, 570 240, 570 240, 650 240)");
+ LineString convexHull = (LineString) reader.read("LINESTRING (130 240, 650 240)");
+ assertTrue(convexHull.equalsExact(geometry.convexHull()));
+ }
+
+ public void test3() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ Geometry geometry = reader.read("MULTIPOINT (0 0, 0 0, 10 0)");
+ LineString convexHull = (LineString) reader.read("LINESTRING (0 0, 10 0)");
+ assertTrue(convexHull.equalsExact(geometry.convexHull()));
+ }
+
+ public void test4() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ Geometry geometry = reader.read("MULTIPOINT (0 0, 10 0, 10 0)");
+ LineString convexHull = (LineString) reader.read("LINESTRING (0 0, 10 0)");
+ assertTrue(convexHull.equalsExact(geometry.convexHull()));
+ }
+
+ public void test5() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ Geometry geometry = reader.read("MULTIPOINT (0 0, 5 0, 10 0)");
+ LineString convexHull = (LineString) reader.read("LINESTRING (0 0, 10 0)");
+ assertTrue(convexHull.equalsExact(geometry.convexHull()));
+ }
+
+ public void test6() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ Geometry actualGeometry = reader.read("MULTIPOINT (0 0, 5 1, 10 0)").convexHull();
+ Geometry expectedGeometry = reader.read("POLYGON ((0 0, 5 1, 10 0, 0 0))");
+ assertEquals(expectedGeometry.toString(), actualGeometry.toString());
+ }
+
+ public void testToArray() throws Exception {
+ ConvexHullEx convexHull = new ConvexHullEx(geometryFactory.createGeometryCollection(null));
+ Stack stack = new Stack();
+ stack.push(new Coordinate(0, 0));
+ stack.push(new Coordinate(1, 1));
+ stack.push(new Coordinate(2, 2));
+ Object[] array1 = convexHull.toCoordinateArray(stack);
+ assertEquals(3, array1.length);
+ assertEquals(new Coordinate(0, 0), array1[0]);
+ assertEquals(new Coordinate(1, 1), array1[1]);
+ assertEquals(new Coordinate(2, 2), array1[2]);
+ assertTrue(!array1[0].equals(array1[1]));
+ }
+
+ private static class ConvexHullEx extends ConvexHull {
+ public ConvexHullEx(Geometry geometry) {
+ super(geometry);
+ }
+ protected Coordinate[] toCoordinateArray(Stack stack) {
+ return super.toCoordinateArray(stack);
+ }
+ }
+
+ public void test7() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ Geometry geometry = reader.read("MULTIPOINT (0 0, 0 0, 5 0, 5 0, 10 0, 10 0)");
+ LineString convexHull = (LineString) reader.read("LINESTRING (0 0, 10 0)");
+ assertTrue(convexHull.equalsExact(geometry.convexHull()));
+ }
+
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/DistanceTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/DistanceTest.java
new file mode 100644
index 0000000..2f39cac
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/DistanceTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+import junit.textui.TestRunner;
+import test.jts.GeometryTestCase;
+
+public class DistanceTest extends GeometryTestCase {
+ public static void main(String args[]) {
+ TestRunner.run(DistanceTest.class);
+ }
+
+ public DistanceTest(String name) { super(name); }
+
+ public void testDistancePointLinePerpendicular() {
+ assertEquals(0.5, Distance.pointToLinePerpendicular(
+ new Coordinate(0.5, 0.5), new Coordinate(0,0), new Coordinate(1,0)), 0.000001);
+ assertEquals(0.5, Distance.pointToLinePerpendicular(
+ new Coordinate(3.5, 0.5), new Coordinate(0,0), new Coordinate(1,0)), 0.000001);
+ assertEquals(0.707106, Distance.pointToLinePerpendicular(
+ new Coordinate(1,0), new Coordinate(0,0), new Coordinate(1,1)), 0.000001);
+ }
+
+ public void testDistancePointLine() {
+ assertEquals(0.5, Distance.pointToSegment(
+ new Coordinate(0.5, 0.5), new Coordinate(0,0), new Coordinate(1,0)), 0.000001);
+ assertEquals(1.0, Distance.pointToSegment(
+ new Coordinate(2, 0), new Coordinate(0,0), new Coordinate(1,0)), 0.000001);
+ }
+
+ public void testDistanceLineLineDisjointCollinear() {
+ assertEquals(1.999699, Distance.segmentToSegment(
+ new Coordinate(0,0), new Coordinate(9.9, 1.4),
+ new Coordinate(11.88, 1.68), new Coordinate(21.78, 3.08)), 0.000001);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/InteriorPointTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/InteriorPointTest.java
new file mode 100644
index 0000000..1419157
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/InteriorPointTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.util.Stopwatch;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import test.jts.TestFiles;
+
+
+public class InteriorPointTest extends TestCase
+{
+ public static void main(String args[])
+ {
+ TestRunner.run(InteriorPointTest.class);
+ }
+
+ WKTReader rdr = new WKTReader();
+
+ public InteriorPointTest(String name)
+ {
+ super(name);
+ }
+
+ public void testAll() throws Exception
+ {
+ checkInteriorPointFile(TestFiles.getResourceFilePath("world.wkt"));
+ checkInteriorPointFile(TestFiles.getResourceFilePath("africa.wkt"));
+ //checkInteriorPointFile("../../../../../data/africa.wkt");
+ }
+
+
+ void checkInteriorPointFile(String file) throws Exception
+ {
+ WKTFileReader fileRdr = new WKTFileReader(new FileReader(file), rdr);
+ checkInteriorPointFile(fileRdr);
+ }
+
+ void checkInteriorPointResource(String resource) throws Exception
+ {
+ InputStream is = this.getClass().getResourceAsStream(resource);
+ WKTFileReader fileRdr = new WKTFileReader(new InputStreamReader(is), rdr);
+ checkInteriorPointFile(fileRdr);
+ }
+
+ private void checkInteriorPointFile(WKTFileReader fileRdr) throws IOException, ParseException
+ {
+ List polys = fileRdr.read();
+ checkInteriorPoint(polys);
+ }
+
+ void checkInteriorPoint(List geoms)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (Iterator i = geoms.iterator(); i.hasNext();) {
+ Geometry g = (Geometry) i.next();
+ checkInteriorPoint(g);
+ System.out.print(".");
+ }
+ //System.out.println();
+ //System.out.println(" " + sw.getTimeString());
+ }
+
+ private void checkInteriorPoint(Geometry g)
+ {
+ Point ip = g.getInteriorPoint();
+ assertTrue(g.contains(ip));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/IsCCWTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/IsCCWTest.java
new file mode 100644
index 0000000..0ff1c6e
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/IsCCWTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests CGAlgorithms.isCCW
+ * @version 1.7
+ */
+public class IsCCWTest extends TestCase {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(IsCCWTest.class);
+ }
+
+ public IsCCWTest(String name) { super(name); }
+
+ public void testCCW() throws Exception
+ {
+ Coordinate[] pts = getCoordinates("POLYGON ((60 180, 140 240, 140 240, 140 240, 200 180, 120 120, 60 180))");
+ assertEquals(Orientation.isCCW(pts), false);
+
+ Coordinate[] pts2 = getCoordinates("POLYGON ((60 180, 140 120, 100 180, 140 240, 60 180))");
+ assertEquals(Orientation.isCCW(pts2), true);
+ // same pts list with duplicate top point - check that isCCW still works
+ Coordinate[] pts2x = getCoordinates("POLYGON ((60 180, 140 120, 100 180, 140 240, 140 240, 60 180))");
+ assertEquals(Orientation.isCCW(pts2x), true);
+ }
+
+ private Coordinate[] getCoordinates(String wkt)
+ throws ParseException
+ {
+ Geometry geom = reader.read(wkt);
+ return geom.getCoordinates();
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/LengthTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/LengthTest.java
new file mode 100644
index 0000000..1aee8c7
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/LengthTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.LineString;
+
+import junit.textui.TestRunner;
+import test.jts.GeometryTestCase;
+
+public class LengthTest extends GeometryTestCase {
+ public static void main(String args[]) {
+ TestRunner.run(LengthTest.class);
+ }
+
+ public LengthTest(String name) { super(name); }
+
+ public void testArea() {
+ checkLengthOfLine("LINESTRING (100 200, 200 200, 200 100, 100 100, 100 200)", 400.0);
+ }
+
+ void checkLengthOfLine(String wkt, double expectedLen) {
+ LineString ring = (LineString) read(wkt);
+
+ CoordinateSequence pts = ring.getCoordinateSequence();
+ double actual = Length.ofLine(pts);
+ assertEquals(actual, expectedLen);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/LocatePointInRingTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/LocatePointInRingTest.java
new file mode 100644
index 0000000..7a0e637
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/LocatePointInRingTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.textui.TestRunner;
+
+/**
+ * Tests PointInRing algorithms
+ *
+ * @version 1.7
+ */
+public class LocatePointInRingTest extends AbstractPointInRingTest {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(LocatePointInRingTest.class);
+ }
+
+ public LocatePointInRingTest(String name) { super(name); }
+
+ protected void runPtInRing(int expectedLoc, Coordinate pt, String wkt)
+ throws Exception
+ {
+ Geometry geom = reader.read(wkt);
+ assertEquals(expectedLoc, PointLocation.locateInRing(pt, geom.getCoordinates()));
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/MinimumBoundingCircleTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/MinimumBoundingCircleTest.java
new file mode 100644
index 0000000..bc4e22c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/MinimumBoundingCircleTest.java
@@ -0,0 +1,117 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * @version 1.7
+ */
+public class MinimumBoundingCircleTest extends TestCase {
+
+ private PrecisionModel precisionModel = new PrecisionModel(1);
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(MinimumBoundingCircleTest.class);
+ }
+
+ public MinimumBoundingCircleTest(String name) { super(name); }
+
+ public void testEmptyPoint() throws Exception {
+ doMinimumBoundingCircleTest("POINT EMPTY", "MULTIPOINT EMPTY");
+ }
+
+ public void testPoint() throws Exception {
+ doMinimumBoundingCircleTest("POINT (10 10)", "POINT (10 10)", new Coordinate(10, 10), 0);
+ }
+
+ public void testPoints2() throws Exception {
+ doMinimumBoundingCircleTest("MULTIPOINT ((10 10), (20 20))", "MULTIPOINT ((10 10), (20 20))", new Coordinate(15, 15), 7.0710678118654755);
+ }
+
+ public void testPointsInLine() throws Exception {
+ doMinimumBoundingCircleTest("MULTIPOINT ((10 10), (20 20), (30 30))", "MULTIPOINT ((10 10), (30 30))",
+ new Coordinate(20, 20), 14.142135623730951);
+ }
+
+ public void testPoints3() throws Exception {
+ doMinimumBoundingCircleTest("MULTIPOINT ((10 10), (20 20), (10 20))", "MULTIPOINT ((10 10), (20 20), (10 20))",
+ new Coordinate(15, 15), 7.0710678118654755);
+ }
+
+ public void testObtuseTriangle() throws Exception {
+ doMinimumBoundingCircleTest("POLYGON ((100 100, 200 100, 150 90, 100 100))", "MULTIPOINT ((100 100), (200 100))",
+ new Coordinate(150, 100), 50);
+ }
+
+ public void testTriangleWithMiddlePoint() throws Exception {
+ doMinimumBoundingCircleTest("MULTIPOINT ((10 10), (20 20), (10 20), (15 19))", "MULTIPOINT ((10 10), (20 20), (10 20))",
+ new Coordinate(15, 15), 7.0710678118654755);
+ }
+
+ public void testQuadrilateral() throws Exception {
+ doMinimumBoundingCircleTest("POLYGON ((26426 65078, 26531 65242, 26096 65427, 26075 65136, 26426 65078))", "MULTIPOINT ((26531 65242), (26075 65136), (26096 65427))",
+ new Coordinate(26284.84180271327, 65267.114509082545), 247.4360455914027 );
+ }
+
+ static final double TOLERANCE = 1.0e-5;
+
+ private void doMinimumBoundingCircleTest(String wkt, String expectedWKT) throws ParseException
+ {
+ doMinimumBoundingCircleTest(wkt, expectedWKT, null, -1);
+ }
+
+ private void doMinimumBoundingCircleTest(String wkt, String expectedWKT,
+ Coordinate expectedCentre, double expectedRadius)
+ throws ParseException
+ {
+ MinimumBoundingCircle mbc = new MinimumBoundingCircle(reader.read(wkt));
+ Coordinate[] exPts = mbc.getExtremalPoints();
+ Geometry actual = geometryFactory.createMultiPoint(exPts);
+ double actualRadius = mbc.getRadius();
+ Coordinate actualCentre = mbc.getCentre();
+ //System.out.println(
+ // " Centre = " + actualCentre
+ // + " Radius = " + actualRadius);
+
+ Geometry expected = reader.read(expectedWKT);
+ boolean isEqual = actual.equals(expected);
+ // need this hack because apparently equals does not work for MULTIPOINT EMPTY
+ if (actual.isEmpty() && expected.isEmpty())
+ isEqual = true;
+ if (!isEqual) {
+ System.out.println("Actual = " + actual + ", Expected = " + expected);
+ }
+ assertTrue(isEqual);
+
+ if (expectedCentre != null) {
+ assertTrue(expectedCentre.distance(actualCentre) < TOLERANCE);
+ }
+ if (expectedRadius >= 0) {
+ assertTrue(Math.abs(expectedRadius - actualRadius) < TOLERANCE);
+ }
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/MinimumDiameterTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/MinimumDiameterTest.java
new file mode 100644
index 0000000..57acad0
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/MinimumDiameterTest.java
@@ -0,0 +1,69 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * @version 1.7
+ */
+public class MinimumDiameterTest extends TestCase {
+
+ private PrecisionModel precisionModel = new PrecisionModel(1);
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(MinimumDiameterTest.class);
+ }
+
+ public MinimumDiameterTest(String name) { super(name); }
+
+ public void testMinimumDiameter1() throws Exception {
+ doMinimumDiameterTest(true, "POINT (0 240)", new Coordinate(0, 240), new Coordinate(0, 240));
+ }
+ public void testMinimumDiameter2() throws Exception {
+ doMinimumDiameterTest(true, "LINESTRING (0 240, 220 240)", new Coordinate(0, 240), new Coordinate(0, 240));
+ }
+ public void testMinimumDiameter3() throws Exception {
+ doMinimumDiameterTest(true, "POLYGON ((0 240, 220 240, 220 0, 0 0, 0 240))", new Coordinate(220, 240), new Coordinate(0, 240));
+ }
+ public void testMinimumDiameter4() throws Exception {
+ doMinimumDiameterTest(true, "POLYGON ((0 240, 220 240, 220 0, 0 0, 0 240))", new Coordinate(220, 240), new Coordinate(0, 240));
+ }
+ public void testMinimumDiameter5() throws Exception {
+ doMinimumDiameterTest(true, "POLYGON ((0 240, 160 140, 220 0, 0 0, 0 240))", new Coordinate(185.86206896551724, 79.65517241379311), new Coordinate(0, 0));
+ }
+ public void testMinimumDiameter6() throws Exception {
+ doMinimumDiameterTest(false, "LINESTRING ( 39 119, 162 197, 135 70, 95 35, 33 66, 111 82, 97 131, 48 160, -4 182, 57 195, 94 202, 90 174, 75 134, 47 114, 0 100, 59 81, 123 60, 136 43, 163 75, 145 114, 93 136, 92 159, 105 175 )", new Coordinate(64.46262341325811, 196.41184767277855), new Coordinate(95, 35));
+ }
+
+ private void doMinimumDiameterTest(boolean convex, String wkt, Coordinate c0, Coordinate c1) throws ParseException {
+ Coordinate[] minimumDiameter = new MinimumDiameter(new WKTReader().read(wkt), convex).getDiameter().getCoordinates();
+ double tolerance = 1E-10;
+ assertEquals(c0.x, minimumDiameter[0].x, tolerance);
+ assertEquals(c0.y, minimumDiameter[0].y, tolerance);
+ assertEquals(c1.x, minimumDiameter[1].x, tolerance);
+ assertEquals(c1.y, minimumDiameter[1].y, tolerance);
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustCGAlgorithms.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustCGAlgorithms.java
new file mode 100644
index 0000000..2bd056b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustCGAlgorithms.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * Non-robust versions of various fundamental Computational Geometric algorithms,
+ * <b>FOR TESTING PURPOSES ONLY!</b>.
+ * The non-robustness is due to rounding error in floating point computation.
+ *
+ * @version 1.7
+ */
+public class NonRobustCGAlgorithms
+{
+
+ /**
+ * Computes whether a ring defined by an array of {@link Coordinate} is
+ * oriented counter-clockwise.
+ * <p>
+ * This will handle coordinate lists which contain repeated points.
+ *
+ * @param ring an array of coordinates forming a ring
+ * @return <code>true</code> if the ring is oriented counter-clockwise.
+ * @throws IllegalArgumentException if the ring is degenerate (does not contain 3 different points)
+ */
+ public static boolean isPointInRing(Coordinate p, Coordinate[] ring)
+ {
+ int i, i1; // point index; i1 = i-1 mod n
+ double xInt; // x intersection of e with ray
+ int crossings = 0; // number of edge/ray crossings
+ double x1,y1,x2,y2;
+ int nPts = ring.length;
+
+ /* For each line edge l = (i-1, i), see if it crosses ray from test point in positive x direction. */
+ for (i = 1; i < nPts; i++ ) {
+ i1 = i - 1;
+ Coordinate p1 = ring[i];
+ Coordinate p2 = ring[i1];
+ x1 = p1.x - p.x;
+ y1 = p1.y - p.y;
+ x2 = p2.x - p.x;
+ y2 = p2.y - p.y;
+
+ if( ( ( y1 > 0 ) && ( y2 <= 0 ) ) ||
+ ( ( y2 > 0 ) && ( y1 <= 0 ) ) ) {
+ /* e straddles x axis, so compute intersection. */
+ xInt = (x1 * y2 - x2 * y1) / (y2 - y1);
+ //xsave = xInt;
+ /* crosses ray if strictly positive intersection. */
+ if (0.0 < xInt)
+ crossings++;
+ }
+ }
+ /* p is inside if an odd number of crossings. */
+ if( (crossings % 2) == 1 )
+ return true;
+ else
+ return false;
+ }
+
+ /**
+ * Computes whether a ring defined by an array of {@link Coordinate} is
+ * oriented counter-clockwise.
+ * <p>
+ * This will handle coordinate lists which contain repeated points.
+ *
+ * @param ring an array of coordinates forming a ring
+ * @return <code>true</code> if the ring is oriented counter-clockwise.
+ * @throws IllegalArgumentException if the ring is degenerate (does not contain 3 different points)
+ */
+ public static boolean isCCW(Coordinate[] ring)
+ {
+ // # of points without closing endpoint
+ int nPts = ring.length - 1;
+
+ // check that this is a valid ring - if not, simply return a dummy value
+ if (nPts < 4) return false;
+
+ // algorithm to check if a Ring is stored in CCW order
+ // find highest point
+ Coordinate hip = ring[0];
+ int hii = 0;
+ for (int i = 1; i <= nPts; i++) {
+ Coordinate p = ring[i];
+ if (p.y > hip.y) {
+ hip = p;
+ hii = i;
+ }
+ }
+
+ // find different point before highest point
+ int iPrev = hii;
+ do {
+ iPrev = (iPrev - 1) % nPts;
+ } while (ring[iPrev].equals(hip) && iPrev != hii);
+
+ // find different point after highest point
+ int iNext = hii;
+ do {
+ iNext = (iNext + 1) % nPts;
+ } while (ring[iNext].equals(hip) && iNext != hii);
+
+ Coordinate prev = ring[iPrev];
+ Coordinate next = ring[iNext];
+
+ if (prev.equals(hip) || next.equals(hip) || prev.equals(next))
+ throw new IllegalArgumentException("degenerate ring (does not contain 3 different points)");
+
+ // translate so that hip is at the origin.
+ // This will not affect the area calculation, and will avoid
+ // finite-accuracy errors (i.e very small vectors with very large coordinates)
+ // This also simplifies the discriminant calculation.
+ double prev2x = prev.x - hip.x;
+ double prev2y = prev.y - hip.y;
+ double next2x = next.x - hip.x;
+ double next2y = next.y - hip.y;
+ // compute cross-product of vectors hip->next and hip->prev
+ // (e.g. area of parallelogram they enclose)
+ double disc = next2x * prev2y - next2y * prev2x;
+ /* If disc is exactly 0, lines are collinear. There are two possible cases:
+ (1) the lines lie along the x axis in opposite directions
+ (2) the line lie on top of one another
+ (2) should never happen, so we're going to ignore it!
+ (Might want to assert this)
+ (1) is handled by checking if next is left of prev ==> CCW
+ */
+ if (disc == 0.0) {
+ // poly is CCW if prev x is right of next x
+ return (prev.x > next.x);
+ }
+ else {
+ // if area is positive, points are ordered CCW
+ return (disc > 0.0);
+ }
+ }
+
+ /**
+ * Returns the index of the orientation of the point <code>q</code> relative to
+ * a vector specified by <code>p1-p2</code>.
+ * The orientation of a point relative to a directed line segment indicates
+ * which way you turn to get to q after travelling from p1 to p2.
+ *
+ * @param p1
+ * the origin point of the vector
+ * @param p2
+ * the final point of the vector
+ * @param q
+ * the point to compute the direction to
+ *
+ * @return 1 if q is counter-clockwise (left) from p1-p2
+ * @return -1 if q is clockwise (right) from p1-p2
+ * @return 0 if q is collinear with p1-p2
+ */
+ public static int orientationIndex(Coordinate p1, Coordinate p2, Coordinate q)
+ {
+ double dx1 = p2.x - p1.x;
+ double dy1 = p2.y - p1.y;
+ double dx2 = q.x - p2.x;
+ double dy2 = q.y - p2.y;
+ double det = dx1*dy2 - dx2*dy1;
+ if (det > 0.0) return 1;
+ if (det < 0.0) return -1;
+ return 0;
+ }
+
+ /**
+ * Computes the distance from a line segment AB to a line segment CD
+ *
+ * Note: NON-ROBUST!
+ *
+ * @param A
+ * a point of one line
+ * @param B
+ * the second point of (must be different to A)
+ * @param C
+ * one point of the line
+ * @param D
+ * another point of the line (must be different to A)
+ */
+ public static double distanceLineLine(Coordinate A, Coordinate B,
+ Coordinate C, Coordinate D)
+ {
+ // check for zero-length segments
+ if (A.equals(B))
+ return Distance.pointToSegment(A, C, D);
+ if (C.equals(D))
+ return Distance.pointToSegment(D, A, B);
+
+ // AB and CD are line segments
+ /*
+ * from comp.graphics.algo
+ *
+ * Solving the above for r and s yields (Ay-Cy)(Dx-Cx)-(Ax-Cx)(Dy-Cy) r =
+ * ----------------------------- (eqn 1) (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx)
+ *
+ * (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay) s = ----------------------------- (eqn 2)
+ * (Bx-Ax)(Dy-Cy)-(By-Ay)(Dx-Cx) Let P be the position vector of the
+ * intersection point, then P=A+r(B-A) or Px=Ax+r(Bx-Ax) Py=Ay+r(By-Ay) By
+ * examining the values of r & s, you can also determine some other limiting
+ * conditions: If 0<=r<=1 & 0<=s<=1, intersection exists r<0 or r>1 or s<0
+ * or s>1 line segments do not intersect If the denominator in eqn 1 is
+ * zero, AB & CD are parallel If the numerator in eqn 1 is also zero, AB &
+ * CD are collinear.
+ */
+ double r_top = (A.y - C.y) * (D.x - C.x) - (A.x - C.x) * (D.y - C.y);
+ double r_bot = (B.x - A.x) * (D.y - C.y) - (B.y - A.y) * (D.x - C.x);
+
+ double s_top = (A.y - C.y) * (B.x - A.x) - (A.x - C.x) * (B.y - A.y);
+ double s_bot = (B.x - A.x) * (D.y - C.y) - (B.y - A.y) * (D.x - C.x);
+
+ if ((r_bot == 0) || (s_bot == 0)) {
+ return Math
+ .min(
+ Distance.pointToSegment(A, C, D),
+ Math.min(
+ Distance.pointToSegment(B, C, D),
+ Math.min(Distance.pointToSegment(C, A, B),
+ Distance.pointToSegment(D, A, B))));
+
+ }
+ double s = s_top / s_bot;
+ double r = r_top / r_bot;
+
+ if ((r < 0) || (r > 1) || (s < 0) || (s > 1)) {
+ // no intersection
+ return Math
+ .min(
+ Distance.pointToSegment(A, C, D),
+ Math.min(
+ Distance.pointToSegment(B, C, D),
+ Math.min(Distance.pointToSegment(C, A, B),
+ Distance.pointToSegment(D, A, B))));
+ }
+ return 0.0; // intersection exists
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustLineIntersector.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustLineIntersector.java
new file mode 100644
index 0000000..7a33fe7
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustLineIntersector.java
@@ -0,0 +1,297 @@
+
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ *@version 1.7
+ */
+
+
+/**
+ * A non-robust version of {@link LineIntersector}.
+ *
+ * @version 1.7
+ */
+public class NonRobustLineIntersector
+ extends LineIntersector
+{
+ /**
+ * @return true if both numbers are positive or if both numbers are negative.
+ * Returns false if both numbers are zero.
+ */
+ public static boolean isSameSignAndNonZero(double a, double b) {
+ if (a == 0 || b == 0) {
+ return false;
+ }
+ return (a < 0 && b < 0) || (a > 0 && b > 0);
+ }
+
+
+ public NonRobustLineIntersector() {
+ }
+
+ public void computeIntersection(
+ Coordinate p,
+ Coordinate p1,
+ Coordinate p2) {
+ double a1;
+ double b1;
+ double c1;
+ /*
+ * Coefficients of line eqns.
+ */
+ double r;
+ /*
+ * 'Sign' values
+ */
+ isProper = false;
+
+ /*
+ * Compute a1, b1, c1, where line joining points 1 and 2
+ * is "a1 x + b1 y + c1 = 0".
+ */
+ a1 = p2.y - p1.y;
+ b1 = p1.x - p2.x;
+ c1 = p2.x * p1.y - p1.x * p2.y;
+
+ /*
+ * Compute r3 and r4.
+ */
+ r = a1 * p.x + b1 * p.y + c1;
+
+ // if r != 0 the point does not lie on the line
+ if (r != 0) {
+ result = NO_INTERSECTION;
+ return;
+ }
+
+ // Point lies on line - check to see whether it lies in line segment.
+
+ double dist = rParameter(p1, p2, p);
+ if (dist < 0.0 || dist > 1.0) {
+ result = NO_INTERSECTION;
+ return;
+ }
+
+ isProper = true;
+ if (p.equals(p1) || p.equals(p2)) {
+ isProper = false;
+ }
+ result = POINT_INTERSECTION;
+ }
+
+ protected int computeIntersect(
+ Coordinate p1,
+ Coordinate p2,
+ Coordinate p3,
+ Coordinate p4) {
+ double a1;
+ double b1;
+ double c1;
+ /*
+ * Coefficients of line eqns.
+ */
+ double a2;
+ /*
+ * Coefficients of line eqns.
+ */
+ double b2;
+ /*
+ * Coefficients of line eqns.
+ */
+ double c2;
+ double r1;
+ double r2;
+ double r3;
+ double r4;
+ /*
+ * 'Sign' values
+ */
+ //double denom, offset, num; /* Intermediate values */
+
+ isProper = false;
+
+ /*
+ * Compute a1, b1, c1, where line joining points 1 and 2
+ * is "a1 x + b1 y + c1 = 0".
+ */
+ a1 = p2.y - p1.y;
+ b1 = p1.x - p2.x;
+ c1 = p2.x * p1.y - p1.x * p2.y;
+
+ /*
+ * Compute r3 and r4.
+ */
+ r3 = a1 * p3.x + b1 * p3.y + c1;
+ r4 = a1 * p4.x + b1 * p4.y + c1;
+
+ /*
+ * Check signs of r3 and r4. If both point 3 and point 4 lie on
+ * same side of line 1, the line segments do not intersect.
+ */
+ if (r3 != 0 &&
+ r4 != 0 &&
+ isSameSignAndNonZero(r3, r4)) {
+ return NO_INTERSECTION;
+ }
+
+ /*
+ * Compute a2, b2, c2
+ */
+ a2 = p4.y - p3.y;
+ b2 = p3.x - p4.x;
+ c2 = p4.x * p3.y - p3.x * p4.y;
+
+ /*
+ * Compute r1 and r2
+ */
+ r1 = a2 * p1.x + b2 * p1.y + c2;
+ r2 = a2 * p2.x + b2 * p2.y + c2;
+
+ /*
+ * Check signs of r1 and r2. If both point 1 and point 2 lie
+ * on same side of second line segment, the line segments do
+ * not intersect.
+ */
+ if (r1 != 0 &&
+ r2 != 0 &&
+ isSameSignAndNonZero(r1, r2)) {
+ return NO_INTERSECTION;
+ }
+
+ /**
+ * Line segments intersect: compute intersection point.
+ */
+ double denom = a1 * b2 - a2 * b1;
+ if (denom == 0) {
+ return computeCollinearIntersection(p1, p2, p3, p4);
+ }
+ double numX = b1 * c2 - b2 * c1;
+ pa.x = numX / denom;
+ /*
+ * TESTING ONLY
+ * double valX = (( num < 0 ? num - offset : num + offset ) / denom);
+ * double valXInt = (int) (( num < 0 ? num - offset : num + offset ) / denom);
+ * if (valXInt != pa.x) // TESTING ONLY
+ * System.out.println(val + " - int: " + valInt + ", floor: " + pa.x);
+ */
+ double numY = a2 * c1 - a1 * c2;
+ pa.y = numY / denom;
+
+ // check if this is a proper intersection BEFORE truncating values,
+ // to avoid spurious equality comparisons with endpoints
+ isProper = true;
+ if (pa.equals(p1) || pa.equals(p2) || pa.equals(p3) || pa.equals(p4)) {
+ isProper = false;
+ }
+
+ // truncate computed point to precision grid
+ // TESTING - don't force coord to be precise
+ if (precisionModel != null) {
+ precisionModel.makePrecise(pa);
+ }
+ return POINT_INTERSECTION;
+ }
+
+
+ /*
+ * p1-p2 and p3-p4 are assumed to be collinear (although
+ * not necessarily intersecting). Returns:
+ * DONT_INTERSECT : the two segments do not intersect
+ * COLLINEAR : the segments intersect, in the
+ * line segment pa-pb. pa-pb is in
+ * the same direction as p1-p2
+ * DO_INTERSECT : the inputLines intersect in a single point
+ * only, pa
+ */
+ private int computeCollinearIntersection(
+ Coordinate p1,
+ Coordinate p2,
+ Coordinate p3,
+ Coordinate p4) {
+ double r1;
+ double r2;
+ double r3;
+ double r4;
+ Coordinate q3;
+ Coordinate q4;
+ double t3;
+ double t4;
+ r1 = 0;
+ r2 = 1;
+ r3 = rParameter(p1, p2, p3);
+ r4 = rParameter(p1, p2, p4);
+ // make sure p3-p4 is in same direction as p1-p2
+ if (r3 < r4) {
+ q3 = p3;
+ t3 = r3;
+ q4 = p4;
+ t4 = r4;
+ }
+ else {
+ q3 = p4;
+ t3 = r4;
+ q4 = p3;
+ t4 = r3;
+ }
+ // check for no intersection
+ if (t3 > r2 || t4 < r1) {
+ return NO_INTERSECTION;
+ }
+
+ // check for single point intersection
+ if (q4 == p1) {
+ pa.setCoordinate(p1);
+ return POINT_INTERSECTION;
+ }
+ if (q3 == p2) {
+ pa.setCoordinate(p2);
+ return POINT_INTERSECTION;
+ }
+
+ // intersection MUST be a segment - compute endpoints
+ pa.setCoordinate(p1);
+ if (t3 > r1) {
+ pa.setCoordinate(q3);
+ }
+ pb.setCoordinate(p2);
+ if (t4 < r2) {
+ pb.setCoordinate(q4);
+ }
+ return COLLINEAR_INTERSECTION;
+ }
+
+ /**
+ * RParameter computes the parameter for the point p
+ * in the parameterized equation
+ * of the line from p1 to p2.
+ * This is equal to the 'distance' of p along p1-p2
+ */
+ private double rParameter(Coordinate p1, Coordinate p2, Coordinate p) {
+ double r;
+ // compute maximum delta, for numerical stability
+ // also handle case of p1-p2 being vertical or horizontal
+ double dx = Math.abs(p2.x - p1.x);
+ double dy = Math.abs(p2.y - p1.y);
+ if (dx > dy) {
+ r = (p.x - p1.x) / (p2.x - p1.x);
+ }
+ else {
+ r = (p.y - p1.y) / (p2.y - p1.y);
+ }
+ return r;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustLineIntersectorTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustLineIntersectorTest.java
new file mode 100644
index 0000000..28fc2f2
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustLineIntersectorTest.java
@@ -0,0 +1,52 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+
+import junit.framework.TestCase;
+
+
+
+
+/**
+ * @version 1.7
+ */
+public class NonRobustLineIntersectorTest extends TestCase {
+
+ private NonRobustLineIntersector li = new NonRobustLineIntersector();
+
+ public NonRobustLineIntersectorTest(String Name_) {
+ super(Name_);
+ }//public NonRobustLineIntersectorTest(String Name_)
+
+ public static void main(String[] args) {
+ String[] testCaseName = {NonRobustLineIntersectorTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }//public static void main(String[] args)
+
+ public void testNegativeZero() {
+ //MD suggests we ignore this issue for now.
+// li.computeIntersection(new Coordinate(220, 260), new Coordinate(220, 0),
+// new Coordinate(220, 0), new Coordinate(100, 0));
+// assertEquals((new Coordinate(220, 0)).toString(), li.getIntersection(0).toString());
+ }
+
+ public void testGetIntersectionNum() {
+ //MD: NonRobustLineIntersector may have different semantics for
+ //getIntersectionNumber
+// li.computeIntersection(new Coordinate(220, 0), new Coordinate(110, 0),
+// new Coordinate(0, 0), new Coordinate(110, 0));
+// assertEquals(1, li.getIntersectionNum());
+ }
+
+}//public class NonRobustLineIntersectorTest extends TestCase
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustRayCrossingCounter.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustRayCrossingCounter.java
new file mode 100644
index 0000000..f28d75d
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/NonRobustRayCrossingCounter.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygonal;
+
+/**
+ * Counts the number of segments crossed by a horizontal ray extending to the right
+ * from a given point, in an incremental fashion.
+ * This can be used to determine whether a point lies in a {@link Polygonal} geometry.
+ * The class determines the situation where the point lies exactly on a segment.
+ * When being used for Point-In-Polygon determination, this case allows short-circuiting
+ * the evaluation.
+ * <p>
+ * This class handles polygonal geometries with any number of shells and holes.
+ * The orientation of the shell and hole rings is unimportant.
+ * In order to compute a correct location for a given polygonal geometry,
+ * it is essential that <b>all</b> segments are counted which
+ * <ul>
+ * <li>touch the ray
+ * <li>lie in in any ring which may contain the point
+ * </ul>
+ * The only exception is when the point-on-segment situation is detected, in which
+ * case no further processing is required.
+ * The implication of the above rule is that segments
+ * which can be a priori determined to <i>not</i> touch the ray
+ * (i.e. by a test of their bounding box or Y-extent)
+ * do not need to be counted. This allows for optimization by indexing.
+ *
+ * This version is non-robust, since it uses relies on double-precision arithmetic.
+ *
+ * @author Martin Davis
+ *
+ * @see RayCrossingCounter
+ *
+ */
+public class NonRobustRayCrossingCounter
+{
+ /**
+ * Determines the {@link Location} of a point in a ring.
+ * This method is an exemplar of how to use this class.
+ *
+ * @param p the point to test
+ * @param ring an array of Coordinates forming a ring
+ * @return the location of the point in the ring
+ */
+ public static int locatePointInRing(Coordinate p, Coordinate[] ring)
+ {
+ NonRobustRayCrossingCounter counter = new NonRobustRayCrossingCounter(p);
+
+ for (int i = 1; i < ring.length; i++) {
+ Coordinate p1 = ring[i];
+ Coordinate p2 = ring[i-1];
+ counter.countSegment(p1, p2);
+ if (counter.isOnSegment())
+ return counter.getLocation();
+ }
+ return counter.getLocation();
+ }
+
+ /**
+ * Determines the {@link Location} of a point in a ring.
+ *
+ * @param p
+ * the point to test
+ * @param ring
+ * a coordinate sequence forming a ring
+ * @return the location of the point in the ring
+ */
+ public static int locatePointInRing(Coordinate p, CoordinateSequence ring) {
+ NonRobustRayCrossingCounter counter = new NonRobustRayCrossingCounter(p);
+
+ Coordinate p1 = new Coordinate();
+ Coordinate p2 = new Coordinate();
+ for (int i = 1; i < ring.size(); i++) {
+ ring.getCoordinate(i, p1);
+ ring.getCoordinate(i - 1, p2);
+ counter.countSegment(p1, p2);
+ if (counter.isOnSegment())
+ return counter.getLocation();
+ }
+ return counter.getLocation();
+ }
+
+ private Coordinate p;
+ private int crossingCount = 0;
+ // true if the test point lies on an input segment
+ private boolean isPointOnSegment = false;
+
+ public NonRobustRayCrossingCounter(Coordinate p)
+ {
+ this.p = p;
+ }
+
+ /**
+ * Counts a segment
+ *
+ * @param p1 an endpoint of the segment
+ * @param p2 another endpoint of the segment
+ */
+ public void countSegment(Coordinate p1, Coordinate p2) {
+ /**
+ * For each segment, check if it crosses
+ * a horizontal ray running from the test point in the positive x direction.
+ */
+
+ // check if the segment is strictly to the left of the test point
+ if (p1.x < p.x && p2.x < p.x)
+ return;
+
+ // check if the point is equal to the current ring vertex
+ if (p.x == p2.x && p.y == p2.y) {
+ isPointOnSegment = true;
+ return;
+ }
+ /**
+ * For horizontal segments, check if the point is on the segment.
+ * Otherwise, horizontal segments are not counted.
+ */
+ if (p1.y == p.y && p2.y == p.y) {
+ double minx = p1.x;
+ double maxx = p2.x;
+ if (minx > maxx) {
+ minx = p2.x;
+ maxx = p1.x;
+ }
+ if (p.x >= minx && p.x <= maxx) {
+ isPointOnSegment = true;
+ }
+ return;
+ }
+ /**
+ * Evaluate all non-horizontal segments which cross a horizontal ray to the
+ * right of the test pt. To avoid double-counting shared vertices, we use the
+ * convention that
+ * <ul>
+ * <li>an upward edge includes its starting endpoint, and excludes its
+ * final endpoint
+ * <li>a downward edge excludes its starting endpoint, and includes its
+ * final endpoint
+ * </ul>
+ */
+ if (((p1.y > p.y) && (p2.y <= p.y))
+ || ((p2.y > p.y) && (p1.y <= p.y))) {
+ // translate the segment so that the test point lies on the origin
+ double x1 = p1.x - p.x;
+ double y1 = p1.y - p.y;
+ double x2 = p2.x - p.x;
+ double y2 = p2.y - p.y;
+
+ /**
+ * The translated segment straddles the x-axis. Compute the sign of the
+ * ordinate of intersection with the x-axis. (y2 != y1, so denominator
+ * will never be 0.0)
+ */
+ // double xIntSign = RobustDeterminant.signOfDet2x2(x1, y1, x2, y2) / (y2
+ // - y1);
+ // MD - faster & more robust computation?
+ double xIntSign = RobustDeterminant.signOfDet2x2(x1, y1, x2, y2);
+ if (xIntSign == 0.0) {
+ isPointOnSegment = true;
+ return;
+ }
+ if (y2 < y1)
+ xIntSign = -xIntSign;
+ // xsave = xInt;
+
+ //System.out.println("xIntSign(" + x1 + ", " + y1 + ", " + x2 + ", " + y2 + " = " + xIntSign);
+ // The segment crosses the ray if the sign is strictly positive.
+ if (xIntSign > 0.0) {
+ crossingCount++;
+ }
+ }
+ }
+
+/**
+ * Reports whether the point lies exactly on one of the supplied segments.
+ * This method may be called at any time as segments are processed.
+ * If the result of this method is <tt>true</tt>,
+ * no further segments need be supplied, since the result
+ * will never change again.
+ *
+ * @return true if the point lies exactly on a segment
+ */
+ public boolean isOnSegment() { return isPointOnSegment; }
+
+ /**
+ * Gets the {@link Location} of the point relative to
+ * the ring, polygon
+ * or multipolygon from which the processed segments were provided.
+ * <p>
+ * This method only determines the correct location
+ * if <b>all</b> relevant segments must have been processed.
+ *
+ * @return the Location of the point
+ */
+ public int getLocation()
+ {
+ if (isPointOnSegment)
+ return Location.BOUNDARY;
+
+ // The point is in the interior of the ring if the number of X-crossings is
+ // odd.
+ if ((crossingCount % 2) == 1) {
+ return Location.INTERIOR;
+ }
+ return Location.EXTERIOR;
+ }
+
+ /**
+ * Tests whether the point lies in or on
+ * the ring, polygon
+ * or multipolygon from which the processed segments were provided.
+ * <p>
+ * This method only determines the correct location
+ * if <b>all</b> relevant segments must have been processed.
+ *
+ * @return true if the point lies in or on the supplied polygon
+ */
+ public boolean isPointInPolygon()
+ {
+ return getLocation() != Location.EXTERIOR;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/OrientationIndexFailureTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/OrientationIndexFailureTest.java
new file mode 100644
index 0000000..aebb8ee
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/OrientationIndexFailureTest.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests failure cases of CGAlgorithms.computeOrientation
+ * @version 1.7
+ */
+public class OrientationIndexFailureTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(OrientationIndexFailureTest.class);
+ }
+
+ public OrientationIndexFailureTest(String name) { super(name); }
+
+ /**
+ * This is included to confirm this test is operating correctly
+ * @throws Exception
+ */
+ public void testSanity() throws Exception
+ {
+ assertTrue(OrientationIndexTest.isAllOrientationsEqual(
+ OrientationIndexTest.getCoordinates("LINESTRING ( 0 0, 0 1, 1 1)")));
+ }
+
+ public void testBadCCW() throws Exception
+ {
+ // this case fails because subtraction of small from large loses precision
+ Coordinate[] pts = {
+ new Coordinate(1.4540766091864998, -7.989685402102996),
+ new Coordinate(23.131039116367354, -7.004368924503866),
+ new Coordinate(1.4540766091865, -7.989685402102996),
+ };
+ checkOrientation(pts);
+ }
+
+ public void testBadCCW2() throws Exception
+ {
+ // this case fails because subtraction of small from large loses precision
+ Coordinate[] pts = {
+ new Coordinate(219.3649559090992, 140.84159161824724),
+ new Coordinate(168.9018919682399, -5.713787599646864),
+ new Coordinate(186.80814046338352, 46.28973405831556),
+ };
+ checkOrientation(pts);
+ }
+
+ public void testBadCCW3() throws Exception
+ {
+ // this case fails because subtraction of small from large loses precision
+ Coordinate[] pts = {
+ new Coordinate(279.56857838488514, -186.3790522565901),
+ new Coordinate(-20.43142161511487, 13.620947743409914),
+ new Coordinate(0, 0)
+ };
+ checkOrientation(pts);
+ }
+
+ public void testBadCCW4() throws Exception
+ {
+ // from JTS list - 5/15/2012 strange case for the GeometryNoder
+ Coordinate[] pts = {
+ new Coordinate(-26.2, 188.7),
+ new Coordinate(37.0, 290.7),
+ new Coordinate(21.2, 265.2)
+ };
+ checkOrientation(pts);
+ }
+
+ public void testBadCCW5() throws Exception
+ {
+ // from JTS list - 6/15/2012 another case from Tomas Fa
+ Coordinate[] pts = {
+ new Coordinate(-5.9, 163.1),
+ new Coordinate(76.1, 250.7),
+ new Coordinate(14.6, 185)
+ //new Coordinate(96.6, 272.6)
+ };
+ checkOrientation(pts);
+ }
+
+ public void testBadCCW7() throws Exception
+ {
+ // from JTS list - 6/26/2012 another case from Tomas Fa
+ Coordinate[] pts = {
+ new Coordinate(-0.9575, 0.4511),
+ new Coordinate(-0.9295, 0.3291),
+ new Coordinate(-0.8945, 0.1766)
+ };
+ checkDD(pts, true);
+ checkShewchuk(pts, false);
+ checkOriginalJTS(pts, false);
+ }
+
+ public void testBadCCW7_2() throws Exception
+ {
+ // from JTS list - 6/26/2012 another case from Tomas Fa
+ // scale to integers - all methods work on this
+ Coordinate[] pts = {
+ new Coordinate(-9575, 4511),
+ new Coordinate(-9295, 3291),
+ new Coordinate(-8945, 1766)
+ };
+ checkDD(pts, true);
+ checkShewchuk(pts, true);
+ checkOriginalJTS(pts, true);
+ }
+
+
+ public void testBadCCW6() throws Exception
+ {
+ // from JTS Convex Hull "Almost collinear" unit test
+ Coordinate[] pts = {
+ new Coordinate(-140.8859438214298, 140.88594382142983),
+ new Coordinate(-57.309236848216706, 57.30923684821671),
+ new Coordinate(-190.9188309203678, 190.91883092036784)
+ };
+ checkOrientation(pts);
+ }
+
+ /**
+ * Shorthand method for most common case,
+ * where the high-precision methods work but JTS Robust algorithm fails.
+ * @param pts
+ */
+ void checkOrientation(Coordinate[] pts)
+ {
+ // this should succeed
+ checkDD(pts, true);
+ checkShewchuk(pts, true);
+
+ // this is expected to fail
+ checkOriginalJTS(pts, false);
+ }
+
+ private void checkShewchuk(Coordinate[] pts, boolean expected)
+ {
+ assertTrue("Shewchuk", expected == isAllOrientationsEqualSD(pts));
+ }
+
+ private void checkOriginalJTS(Coordinate[] pts, boolean expected)
+ {
+ assertTrue("JTS RobustDeterminant FAIL", expected == isAllOrientationsEqualRD(pts));
+ }
+
+ private void checkDD(Coordinate[] pts, boolean expected)
+ {
+ assertTrue("DD", expected == isAllOrientationsEqualDD(pts));
+ }
+
+ public static boolean isAllOrientationsEqual(
+ double p0x, double p0y,
+ double p1x, double p1y,
+ double p2x, double p2y)
+ {
+ Coordinate[] pts = {
+ new Coordinate(p0x, p0y),
+ new Coordinate(p1x, p1y),
+ new Coordinate(p2x, p2y)
+ };
+ if (! isAllOrientationsEqualDD(pts))
+ throw new IllegalStateException("High-precision orientation computation FAILED");
+ return OrientationIndexTest.isAllOrientationsEqual(pts);
+ }
+
+ public static boolean isAllOrientationsEqualDD(Coordinate[] pts)
+ {
+ int orient0 = CGAlgorithmsDD.orientationIndex(pts[0], pts[1], pts[2]);
+ int orient1 = CGAlgorithmsDD.orientationIndex(pts[1], pts[2], pts[0]);
+ int orient2 = CGAlgorithmsDD.orientationIndex(pts[2], pts[0], pts[1]);
+ return orient0 == orient1 && orient0 == orient2;
+ }
+
+ public static boolean isAllOrientationsEqualSD(Coordinate[] pts)
+ {
+ int orient0 = ShewchuksDeterminant.orientationIndex(pts[0], pts[1], pts[2]);
+ int orient1 = ShewchuksDeterminant.orientationIndex(pts[1], pts[2], pts[0]);
+ int orient2 = ShewchuksDeterminant.orientationIndex(pts[2], pts[0], pts[1]);
+ return orient0 == orient1 && orient0 == orient2;
+ }
+
+ public static boolean isAllOrientationsEqualRD(Coordinate[] pts)
+ {
+ int[] orient = new int[3];
+ orient[0] = RobustDeterminant.orientationIndex(pts[0], pts[1], pts[2]);
+ orient[1] = RobustDeterminant.orientationIndex(pts[1], pts[2], pts[0]);
+ orient[2] = RobustDeterminant.orientationIndex(pts[2], pts[0], pts[1]);
+ return orient[0] == orient[1] && orient[0] == orient[2];
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/OrientationIndexTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/OrientationIndexTest.java
new file mode 100644
index 0000000..d8d61e7
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/OrientationIndexTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests CGAlgorithms.computeOrientation
+ * @version 1.7
+ */
+public class OrientationIndexTest
+ extends TestCase
+{
+
+ private static WKTReader reader = new WKTReader();
+ //private CGAlgorithms rcga = new CGAlgorithms();
+
+ public static void main(String args[]) {
+ TestRunner.run(OrientationIndexTest.class);
+ }
+
+ public OrientationIndexTest(String name) { super(name); }
+
+ public void testCCW() throws Exception
+ {
+ assertTrue(isAllOrientationsEqual(getCoordinates("LINESTRING ( 0 0, 0 1, 1 1)")));
+ }
+
+ public void testCCW2() throws Exception
+ {
+ // experimental case - can't make it fail
+ Coordinate[] pts2 = {
+ new Coordinate(1.0000000000004998, -7.989685402102996),
+ new Coordinate(10.0, -7.004368924503866),
+ new Coordinate(1.0000000000005, -7.989685402102996),
+ };
+ assertTrue(isAllOrientationsEqual(pts2));
+ }
+
+ public void testOrientationIndexRobust() throws Exception
+ {
+ Coordinate p0 = new Coordinate(219.3649559090992, 140.84159161824724);
+ Coordinate p1 = new Coordinate(168.9018919682399, -5.713787599646864);
+ Coordinate p = new Coordinate(186.80814046338352, 46.28973405831556);
+ int orient = Orientation.index(p0, p1, p);
+ int orientInv = Orientation.index(p1, p0, p);
+ assert(orient != orientInv);
+ }
+ /**
+ * Tests whether the orientations around a triangle of points
+ * are all equal (as is expected if the orientation predicate is correct)
+ *
+ * @param pts an array of three points
+ * @return true if all the orientations around the triangle are equal
+ */
+ public static boolean isAllOrientationsEqual(Coordinate[] pts)
+ {
+ int[] orient = new int[3];
+ orient[0] = Orientation.index(pts[0], pts[1], pts[2]);
+ orient[1] = Orientation.index(pts[1], pts[2], pts[0]);
+ orient[2] = Orientation.index(pts[2], pts[0], pts[1]);
+ return orient[0] == orient[1] && orient[0] == orient[2];
+ }
+
+ public static boolean isAllOrientationsEqual(
+ double p0x, double p0y,
+ double p1x, double p1y,
+ double p2x, double p2y)
+ {
+ Coordinate[] pts = {
+ new Coordinate(p0x, p0y),
+ new Coordinate(p1x, p1y),
+ new Coordinate(p2x, p2y)
+ };
+ return isAllOrientationsEqual(pts);
+ }
+
+ public static Coordinate[] getCoordinates(String wkt)
+ throws ParseException
+ {
+ Geometry geom = reader.read(wkt);
+ return geom.getCoordinates();
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/PerturbedGridPolygonBuilder.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/PerturbedGridPolygonBuilder.java
new file mode 100644
index 0000000..434e096
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/PerturbedGridPolygonBuilder.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+
+import java.util.Random;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+
+
+
+public class PerturbedGridPolygonBuilder
+{
+ private GeometryFactory geomFactory;
+ private double gridWidth = 1000;
+ private int numLines = 10;
+ private double lineWidth = 20;
+
+ private long seed = 0;
+ private Random rand;
+
+ private Geometry grid;
+
+ public PerturbedGridPolygonBuilder(GeometryFactory geomFactory)
+ {
+ this.geomFactory = geomFactory;
+ seed = System.currentTimeMillis();
+ }
+
+ public void setSeed(long seed)
+ {
+ this.seed = seed;
+ }
+
+ public void setNumLines(int numLines)
+ {
+ this.numLines = numLines;
+ }
+
+ public void setLineWidth(double lineWidth)
+ {
+ this.lineWidth = lineWidth;
+ }
+
+ public Geometry getGeometry()
+ {
+ if (grid == null)
+ grid = buildGrid();
+ return grid;
+ }
+
+ private Geometry buildGrid()
+ {
+ LineString[] lines = new LineString[numLines * 2];
+ int index = 0;
+
+ for (int i = 0; i < numLines; i++) {
+ Coordinate p0 = new Coordinate(getRandOrdinate(), 0);
+ Coordinate p1 = new Coordinate(getRandOrdinate(), gridWidth);
+ LineString line = geomFactory.createLineString(
+ new Coordinate[] { p0, p1 });
+ lines[index++] = line;
+ }
+
+ for (int i = 0; i < numLines; i++) {
+ Coordinate p0 = new Coordinate(0, getRandOrdinate());
+ Coordinate p1 = new Coordinate(gridWidth, getRandOrdinate());
+ LineString line = geomFactory.createLineString(
+ new Coordinate[] { p0, p1 });
+ lines[index++] = line;
+ }
+
+ MultiLineString ml = geomFactory.createMultiLineString(lines);
+ Geometry grid = ml.buffer(lineWidth);
+ //System.out.println(grid);
+ return grid;
+
+ }
+
+ private double getRand()
+ {
+ if (rand == null) {
+ //System.out.println("Seed = " + seed);
+ rand = new Random(seed);
+ }
+ return rand.nextDouble();
+ }
+
+
+ private double getRandOrdinate()
+ {
+ double randNum = getRand();
+ double ord = geomFactory.getPrecisionModel().makePrecise(randNum * gridWidth);
+ return ord;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/PointInRingTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/PointInRingTest.java
new file mode 100644
index 0000000..ca5bdcd
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/PointInRingTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.textui.TestRunner;
+
+/**
+ * Tests PointInRing algorithms
+ *
+ * @version 1.7
+ */
+public class PointInRingTest extends AbstractPointInRingTest {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(PointInRingTest.class);
+ }
+
+ public PointInRingTest(String name) { super(name); }
+
+
+ protected void runPtInRing(int expectedLoc, Coordinate pt, String wkt)
+ throws Exception
+ {
+ // isPointInRing is not defined for pts on boundary
+ if (expectedLoc == Location.BOUNDARY)
+ return;
+
+ Geometry geom = reader.read(wkt);
+ boolean expected = expectedLoc == Location.INTERIOR;
+ assertEquals(expected, PointLocation.isInRing(pt, geom.getCoordinates()));
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/PointLocationOnLineTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/PointLocationOnLineTest.java
new file mode 100644
index 0000000..5eede0c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/PointLocationOnLineTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import test.jts.GeometryTestCase;
+
+/**
+ * Tests {@link PointLocation#isOnLine(Coordinate, Coordinate[])}.
+ *
+ * @version 1.15
+ */
+public class PointLocationOnLineTest extends GeometryTestCase {
+ public static void main(String args[]) {
+ TestRunner.run(PointLocationOnLineTest.class);
+ }
+
+ public PointLocationOnLineTest(String name) {
+ super(name);
+ }
+
+ public void testOnVertex() throws Exception {
+ checkOnLine(20, 20, "LINESTRING (0 00, 20 20, 30 30)", true);
+ }
+
+ public void testOnSegment() throws Exception {
+ checkOnLine(10, 10, "LINESTRING (0 0, 20 20, 0 40)", true);
+ checkOnLine(10, 30, "LINESTRING (0 0, 20 20, 0 40)", true);
+ }
+
+ public void testNotOnLine() throws Exception {
+ checkOnLine(0, 100, "LINESTRING (10 10, 20 10, 30 10)", false);
+ }
+
+ void checkOnLine(double x, double y, String wktLine, boolean expected) {
+ LineString line = (LineString) read(wktLine);
+ assertTrue(expected == PointLocation.isOnLine(new Coordinate(x,y), line.getCoordinates()));
+
+ assertTrue(expected == PointLocation.isOnLine(new Coordinate(x,y), line.getCoordinateSequence()));
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/PointLocatorTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/PointLocatorTest.java
new file mode 100644
index 0000000..deeeb64
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/PointLocatorTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests PointInRing algorithms
+ *
+ * @version 1.7
+ */
+public class PointLocatorTest extends TestCase {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(PointLocatorTest.class);
+ }
+
+ public PointLocatorTest(String name) { super(name); }
+
+ public void testBox() throws Exception
+ {
+ runPtLocator(Location.INTERIOR, new Coordinate(10, 10),
+"POLYGON ((0 0, 0 20, 20 20, 20 0, 0 0))");
+ }
+
+ public void testComplexRing() throws Exception
+ {
+ runPtLocator(Location.INTERIOR, new Coordinate(0, 0),
+"POLYGON ((-40 80, -40 -80, 20 0, 20 -100, 40 40, 80 -80, 100 80, 140 -20, 120 140, 40 180, 60 40, 0 120, -20 -20, -40 80))");
+ }
+
+ public void testPointLocatorLinearRingLineString() throws Exception
+ {
+ runPtLocator(Location.BOUNDARY, new Coordinate(0, 0),
+ "GEOMETRYCOLLECTION( LINESTRING(0 0, 10 10), LINEARRING(10 10, 10 20, 20 10, 10 10))");
+ }
+
+ public void testPointLocatorPointInsideLinearRing() throws Exception
+ {
+ runPtLocator(Location.EXTERIOR, new Coordinate(11, 11),
+ "LINEARRING(10 10, 10 20, 20 10, 10 10)");
+ }
+
+ private void runPtLocator(int expected, Coordinate pt, String wkt)
+ throws Exception
+ {
+ Geometry geom = reader.read(wkt);
+ PointLocator pointLocator = new PointLocator();
+ int loc = pointLocator.locate(pt, geom);
+ assertEquals(expected, loc);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/RayCrossingCounterTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/RayCrossingCounterTest.java
new file mode 100644
index 0000000..750d84d
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/RayCrossingCounterTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.textui.TestRunner;
+
+/**
+ * Tests PointInRing algorithms
+ *
+ * @version 1.7
+ */
+public class RayCrossingCounterTest extends AbstractPointInRingTest {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(RayCrossingCounterTest.class);
+ }
+
+ public RayCrossingCounterTest(String name) { super(name); }
+
+ protected void runPtInRing(int expectedLoc, Coordinate pt, String wkt)
+ throws Exception
+ {
+ Geometry geom = reader.read(wkt);
+ assertEquals(expectedLoc, RayCrossingCounter.locatePointInRing(pt, geom.getCoordinates()));
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/RectangleLineIntersectorTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/RectangleLineIntersectorTest.java
new file mode 100644
index 0000000..da9965a
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/RectangleLineIntersectorTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+public class RectangleLineIntersectorTest
+extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(RectangleLineIntersectorTest.class);
+ }
+
+ public RectangleLineIntersectorTest(String name) { super(name); }
+
+ public void test300Points() {
+ RectangleLineIntersectorValidator test = new RectangleLineIntersectorValidator();
+ test.init(300);
+ assertTrue(test.validate());
+ }
+}
+
+/**
+ * Tests optimized RectangleLineIntersector against
+ * a brute force approach (which is assumed to be correct).
+ *
+ * @author Martin Davis
+ *
+ */
+class RectangleLineIntersectorValidator
+{
+ private GeometryFactory geomFact = new GeometryFactory();
+
+ private double baseX = 0;
+ private double baseY = 0;
+ private double rectSize = 100;
+ private Envelope rectEnv;
+ private Coordinate[] pts;
+ private boolean isValid = true;
+
+ public RectangleLineIntersectorValidator()
+ {
+
+ }
+
+ public void init(int nPts)
+ {
+ rectEnv = createRectangle();
+ pts = createTestPoints(nPts);
+
+ }
+
+ public boolean validate()
+ {
+ run(true, true);
+ return isValid;
+ }
+
+ public void run(boolean useSegInt, boolean useSideInt)
+ {
+ RectangleLineIntersector rectSegIntersector = new RectangleLineIntersector(rectEnv);
+ SimpleRectangleIntersector rectSideIntersector = new SimpleRectangleIntersector(rectEnv);
+
+ for (int i = 0; i < pts.length; i++) {
+ for (int j = 0; j < pts.length; j++) {
+ if (i == j) continue;
+
+ boolean segResult = false;
+ if (useSegInt)
+ segResult = rectSegIntersector.intersects(pts[i], pts[j]);
+ boolean sideResult = false;
+ if (useSideInt)
+ sideResult = rectSideIntersector.intersects(pts[i], pts[j]);
+
+ if (useSegInt && useSideInt)
+ {
+ if (segResult != sideResult)
+ isValid = false;
+ }
+ }
+ }
+ }
+
+ private Coordinate[] createTestPoints(int nPts)
+ {
+ Point pt = geomFact.createPoint(new Coordinate(baseX, baseY));
+ Geometry circle = pt.buffer(2 * rectSize, nPts/4);
+ return circle.getCoordinates();
+ }
+
+ private Envelope createRectangle()
+ {
+ Envelope rectEnv = new Envelope(
+ new Coordinate(baseX, baseY),
+ new Coordinate(baseX + rectSize, baseY + rectSize));
+ return rectEnv;
+ }
+
+}
+
+class SimpleRectangleIntersector
+{
+ // for intersection testing, don't need to set precision model
+ private LineIntersector li = new RobustLineIntersector();
+
+ private Envelope rectEnv;
+ /**
+ * The corners of the rectangle, in the order:
+ * 10
+ * 23
+ */
+ private Coordinate[] corner = new Coordinate[4];
+
+ public SimpleRectangleIntersector(Envelope rectEnv)
+ {
+ this.rectEnv = rectEnv;
+ initCorners(rectEnv);
+ }
+
+ private void initCorners(Envelope rectEnv)
+ {
+ corner[0] = new Coordinate(rectEnv.getMaxX(), rectEnv.getMaxY());
+ corner[1] = new Coordinate(rectEnv.getMinX(), rectEnv.getMaxY());
+ corner[2] = new Coordinate(rectEnv.getMinX(), rectEnv.getMinY());
+ corner[3] = new Coordinate(rectEnv.getMaxX(), rectEnv.getMinY());
+ }
+
+ public boolean intersects(Coordinate p0, Coordinate p1)
+ {
+ Envelope segEnv = new Envelope(p0, p1);
+ if (! rectEnv.intersects(segEnv))
+ return false;
+
+ li.computeIntersection(p0, p1, corner[0], corner[1]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[1], corner[2]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[2], corner[3]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[3], corner[0]);
+ if (li.hasIntersection()) return true;
+
+ return false;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/RobustLineIntersectionTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/RobustLineIntersectionTest.java
new file mode 100644
index 0000000..29d87fc
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/RobustLineIntersectionTest.java
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests robustness and correctness of RobustLineIntersector
+ * in some tricky cases.
+ * Failure modes can include exceptions thrown, or incorrect
+ * results returned.
+ *
+ * @author Owner
+ *
+ */
+public class RobustLineIntersectionTest
+extends TestCase
+{
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(RobustLineIntersectionTest.class);
+ }
+
+ public RobustLineIntersectionTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Following cases were failures when using the CentralEndpointIntersector heuristic.
+ * This is because one segment lies at a significant angle to the other,
+ * with only one endpoint is close to the other segment.
+ * The CE heuristic chose the wrong endpoint to return.
+ * The fix is to use a new heuristic which out of the 4 endpoints
+ * chooses the one which is closest to the other segment.
+ * This works in all known failure cases.
+ *
+ * @throws ParseException
+ */
+ public void testCentralEndpointHeuristicFailure()
+ throws ParseException
+ {
+ checkIntersection(
+ "LINESTRING (163.81867067 -211.31840378, 165.9174252 -214.1665075)",
+ "LINESTRING (2.84139601 -57.95412726, 469.59990601 -502.63851732)",
+ 1,
+ "POINT (163.81867067 -211.31840378)",
+ 0);
+ }
+
+ public void testCentralEndpointHeuristicFailure2()
+ throws ParseException
+ {
+ checkIntersection(
+ "LINESTRING (-58.00593335955 -1.43739086465, -513.86101637525 -457.29247388035)",
+ "LINESTRING (-215.22279674875 -158.65425425385, -218.1208801283 -160.68343590235)",
+ 1,
+ "POINT ( -215.22279674875 -158.65425425385 )",
+ 0);
+ }
+
+ /**
+ * Tests a case where intersection point is rounded,
+ * and it is computed as a nearest endpoint.
+ * Exposed a bug due to aliasing of endpoint.
+ *
+ * MD 8 Mar 2013
+ *
+ * @throws ParseException
+ */
+ public void testRoundedPointsNotAltered()
+ throws ParseException
+ {
+ checkInputNotAltered(
+ "LINESTRING (-58.00593335955 -1.43739086465, -513.86101637525 -457.29247388035)",
+ "LINESTRING (-215.22279674875 -158.65425425385, -218.1208801283 -160.68343590235)",
+ 100000 );
+ }
+
+
+ /**
+ * Test from Tomas Fa - JTS list 6/13/2012
+ *
+ * Fails using original JTS DeVillers determine orientation test.
+ * Succeeds using DD and Shewchuk orientation
+ *
+ * @throws ParseException
+ */
+ public void testTomasFa_1()
+ throws ParseException
+ {
+ checkIntersectionNone(
+ "LINESTRING (-42.0 163.2, 21.2 265.2)",
+ "LINESTRING (-26.2 188.7, 37.0 290.7)");
+ }
+
+ /**
+ * Test from Tomas Fa - JTS list 6/13/2012
+ *
+ * Fails using original JTS DeVillers determine orientation test.
+ * Succeeds using DD and Shewchuk orientation
+ *
+ * @throws ParseException
+ */
+ public void testTomasFa_2()
+ throws ParseException
+ {
+ checkIntersectionNone(
+ "LINESTRING (-5.9 163.1, 76.1 250.7)",
+ "LINESTRING (14.6 185.0, 96.6 272.6)");
+ }
+
+ /**
+ * Test involving two non-almost-parallel lines.
+ * Does not seem to cause problems with basic line intersection algorithm.
+ *
+ * @throws ParseException
+ */
+ public void testLeduc_1()
+ throws ParseException
+ {
+ checkIntersection(
+ "LINESTRING (305690.0434123494 254176.46578338774, 305601.9999843455 254243.19999846347)",
+ "LINESTRING (305689.6153764265 254177.33102743194, 305692.4999844298 254171.4999983967)",
+ 1,
+ "POINT (305690.0434123494 254176.46578338774)",
+ 0);
+ }
+
+ /**
+ * Test from strk which is bad in GEOS (2009-04-14).
+ *
+ * @throws ParseException
+ */
+ public void testGEOS_1()
+ throws ParseException
+ {
+ checkIntersection(
+ "LINESTRING (588750.7429703881 4518950.493668233, 588748.2060409798 4518933.9452804085)",
+ "LINESTRING (588745.824857241 4518940.742239175, 588748.2060437313 4518933.9452791475)",
+ 1,
+ "POINT (588748.2060416829 4518933.945284994)",
+ 0);
+ }
+
+ /**
+ * Test from strk which is bad in GEOS (2009-04-14).
+ *
+ * @throws ParseException
+ */
+ public void testGEOS_2()
+ throws ParseException
+ {
+ checkIntersection(
+ "LINESTRING (588743.626135934 4518924.610969561, 588732.2822865889 4518925.4314047815)",
+ "LINESTRING (588739.1191384895 4518927.235700594, 588731.7854614238 4518924.578370095)",
+ 1,
+ "POINT (588733.8306132929 4518925.319423238)",
+ 0);
+ }
+
+ /**
+ * This used to be a failure case (exception), but apparently works now.
+ * Possibly normalization has fixed this?
+ *
+ * @throws ParseException
+ */
+ public void testDaveSkeaCase()
+ throws ParseException
+ {
+ checkIntersection(
+ "LINESTRING ( 2089426.5233462777 1180182.3877339689, 2085646.6891757075 1195618.7333999649 )",
+ "LINESTRING ( 1889281.8148903656 1997547.0560044837, 2259977.3672235999 483675.17050843034 )",
+ 1,
+ new Coordinate[] {
+ new Coordinate(2087536.6062609926, 1187900.560566967),
+ }, 0);
+ }
+
+ /**
+ * Outside envelope using HCoordinate method.
+ *
+ * @throws ParseException
+ */
+ public void testCmp5CaseWKT()
+ throws ParseException
+ {
+ checkIntersection(
+ "LINESTRING (4348433.262114629 5552595.478385733, 4348440.849387404 5552599.272022122 )",
+ "LINESTRING (4348433.26211463 5552595.47838573, 4348440.8493874 5552599.27202212 )",
+ 1,
+ new Coordinate[] {
+ new Coordinate(4348440.8493874, 5552599.27202212),
+ },
+ 0);
+ }
+
+ /**
+ * Result of this test should be the same as the WKT one!
+ * @throws ParseException
+ */
+ public void testCmp5CaseRaw()
+ throws ParseException
+ {
+ checkIntersection(
+ new Coordinate[] {
+ new Coordinate(4348433.262114629, 5552595.478385733),
+ new Coordinate(4348440.849387404, 5552599.272022122),
+
+ new Coordinate(4348433.26211463, 5552595.47838573),
+ new Coordinate(4348440.8493874, 5552599.27202212)
+ }, 1,
+ new Coordinate[] {
+ new Coordinate(4348440.8493874, 5552599.27202212),
+ },
+ 0);
+ }
+
+ void checkIntersectionNone(String wkt1, String wkt2)
+ throws ParseException
+ {
+ LineString l1 = (LineString) reader.read(wkt1);
+ LineString l2 = (LineString) reader.read(wkt2);
+ Coordinate[] pt = new Coordinate[] {
+ l1.getCoordinateN(0), l1.getCoordinateN(1),
+ l2.getCoordinateN(0), l2.getCoordinateN(1)
+ };
+ checkIntersection(pt, 0, null, 0);
+ }
+
+ void checkIntersection(String wkt1, String wkt2,
+ int expectedIntersectionNum,
+ Coordinate[] intPt,
+ double distanceTolerance)
+ throws ParseException
+ {
+ LineString l1 = (LineString) reader.read(wkt1);
+ LineString l2 = (LineString) reader.read(wkt2);
+ Coordinate[] pt = new Coordinate[] {
+ l1.getCoordinateN(0), l1.getCoordinateN(1),
+ l2.getCoordinateN(0), l2.getCoordinateN(1)
+ };
+ checkIntersection(pt, expectedIntersectionNum, intPt, distanceTolerance);
+ }
+
+ void checkIntersection(String wkt1, String wkt2,
+ int expectedIntersectionNum,
+ String expectedWKT,
+ double distanceTolerance)
+ throws ParseException
+ {
+ LineString l1 = (LineString) reader.read(wkt1);
+ LineString l2 = (LineString) reader.read(wkt2);
+ Coordinate[] pt = new Coordinate[] {
+ l1.getCoordinateN(0), l1.getCoordinateN(1),
+ l2.getCoordinateN(0), l2.getCoordinateN(1)
+ };
+ Geometry g = reader.read(expectedWKT);
+ Coordinate[] intPt = g.getCoordinates();
+ checkIntersection(pt, expectedIntersectionNum, intPt, distanceTolerance);
+ }
+
+ /**
+ * Check that intersection of segment defined by points in pt array
+ * is equal to the expectedIntPt value (up to the given distanceTolerance).
+ *
+ * @param pt
+ * @param expectedIntersectionNum
+ * @param expectedIntPt the expected intersection points (maybe null if not tested)
+ * @param distanceTolerance tolerance to use for equality test
+ */
+ void checkIntersection(Coordinate[] pt,
+ int expectedIntersectionNum,
+ Coordinate[] expectedIntPt,
+ double distanceTolerance)
+ {
+ LineIntersector li = new RobustLineIntersector();
+ li.computeIntersection(pt[0], pt[1], pt[2], pt[3]);
+
+ int intNum = li.getIntersectionNum();
+ assertEquals("Number of intersections not as expected", expectedIntersectionNum, intNum);
+
+ if (expectedIntPt != null) {
+ assertEquals("Wrong number of expected int pts provided", intNum, expectedIntPt.length);
+ // test that both points are represented here
+ boolean isIntPointsCorrect = true;
+ if (intNum == 1) {
+ checkIntPoints(expectedIntPt[0], li.getIntersection(0), distanceTolerance);
+ }
+ else if (intNum == 2) {
+ checkIntPoints(expectedIntPt[1], li.getIntersection(0), distanceTolerance);
+ checkIntPoints(expectedIntPt[1], li.getIntersection(0), distanceTolerance);
+
+ if (! (equals(expectedIntPt[0],li.getIntersection(0), distanceTolerance)
+ || equals(expectedIntPt[0],li.getIntersection(1), distanceTolerance) )) {
+ checkIntPoints(expectedIntPt[0], li.getIntersection(0), distanceTolerance);
+ checkIntPoints(expectedIntPt[0], li.getIntersection(1), distanceTolerance);
+ }
+ else if (! (equals(expectedIntPt[1],li.getIntersection(0), distanceTolerance)
+ || equals(expectedIntPt[1],li.getIntersection(1), distanceTolerance) )) {
+ checkIntPoints(expectedIntPt[1], li.getIntersection(0), distanceTolerance);
+ checkIntPoints(expectedIntPt[1], li.getIntersection(1), distanceTolerance);
+ }
+ }
+ }
+ }
+
+ void checkIntPoints(Coordinate expectedPt, Coordinate actualPt, double distanceTolerance)
+ {
+ boolean isEqual = equals(expectedPt, actualPt, distanceTolerance);
+ assertTrue("Int Pts not equal - "
+ + "expected " + WKTWriter.toPoint(expectedPt) + " VS "
+ + "actual " + WKTWriter.toPoint(actualPt), isEqual);
+ }
+
+ public static boolean equals(Coordinate p0, Coordinate p1, double distanceTolerance)
+ {
+ return p0.distance(p1) <= distanceTolerance;
+ }
+
+ void checkInputNotAltered(String wkt1, String wkt2, int scaleFactor) throws ParseException
+ {
+ LineString l1 = (LineString) reader.read(wkt1);
+ LineString l2 = (LineString) reader.read(wkt2);
+ Coordinate[] pt = new Coordinate[] { l1.getCoordinateN(0),
+ l1.getCoordinateN(1), l2.getCoordinateN(0), l2.getCoordinateN(1) };
+ checkInputNotAltered(pt, scaleFactor);
+ }
+
+ public void checkInputNotAltered(Coordinate[] pt, int scaleFactor)
+ {
+ // save input points
+ Coordinate[] savePt = new Coordinate[4];
+ for (int i = 0; i < 4; i++) {
+ savePt[i] = new Coordinate(pt[i]);
+ }
+
+ LineIntersector li = new RobustLineIntersector();
+ li.setPrecisionModel(new PrecisionModel(scaleFactor));
+ li.computeIntersection(pt[0], pt[1], pt[2], pt[3]);
+
+ // check that input points are unchanged
+ for (int i = 0; i < 4; i++) {
+ assertEquals("Input point " + i + " was altered - ", savePt[i], pt[i]);
+ }
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/RobustLineIntersectorTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/RobustLineIntersectorTest.java
new file mode 100644
index 0000000..fd61d55
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/RobustLineIntersectorTest.java
@@ -0,0 +1,161 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * Basic functionality tests for RobustLineIntersector.
+ *
+ * @version 1.7
+ */
+public class RobustLineIntersectorTest extends TestCase {
+
+ RobustLineIntersector i = new RobustLineIntersector();
+
+ public RobustLineIntersectorTest(String Name_) {
+ super(Name_);
+ }//public RobustLineIntersectorTest(String Name_)
+
+ public static void main(String[] args) {
+ String[] testCaseName = {RobustLineIntersectorTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }//public static void main(String[] args)
+
+ public void test2Lines() {
+ RobustLineIntersector i = new RobustLineIntersector();
+ Coordinate p1 = new Coordinate(10, 10);
+ Coordinate p2 = new Coordinate(20, 20);
+ Coordinate q1 = new Coordinate(20, 10);
+ Coordinate q2 = new Coordinate(10, 20);
+ Coordinate x = new Coordinate(15, 15);
+ i.computeIntersection(p1, p2, q1, q2);
+ assertEquals(RobustLineIntersector.POINT_INTERSECTION, i.getIntersectionNum());
+ assertEquals(1, i.getIntersectionNum());
+ assertEquals(x, i.getIntersection(0));
+ assertTrue(i.isProper());
+ assertTrue(i.hasIntersection());
+ }
+
+ public void testCollinear1() {
+ RobustLineIntersector i = new RobustLineIntersector();
+ Coordinate p1 = new Coordinate(10, 10);
+ Coordinate p2 = new Coordinate(20, 10);
+ Coordinate q1 = new Coordinate(22, 10);
+ Coordinate q2 = new Coordinate(30, 10);
+ i.computeIntersection(p1, p2, q1, q2);
+ assertEquals(RobustLineIntersector.NO_INTERSECTION, i.getIntersectionNum());
+ assertTrue(!i.isProper());
+ assertTrue(!i.hasIntersection());
+ }
+
+ public void testCollinear2() {
+ RobustLineIntersector i = new RobustLineIntersector();
+ Coordinate p1 = new Coordinate(10, 10);
+ Coordinate p2 = new Coordinate(20, 10);
+ Coordinate q1 = new Coordinate(20, 10);
+ Coordinate q2 = new Coordinate(30, 10);
+ i.computeIntersection(p1, p2, q1, q2);
+ assertEquals(RobustLineIntersector.POINT_INTERSECTION, i.getIntersectionNum());
+ assertTrue(!i.isProper());
+ assertTrue(i.hasIntersection());
+ }
+
+ public void testCollinear3() {
+ RobustLineIntersector i = new RobustLineIntersector();
+ Coordinate p1 = new Coordinate(10, 10);
+ Coordinate p2 = new Coordinate(20, 10);
+ Coordinate q1 = new Coordinate(15, 10);
+ Coordinate q2 = new Coordinate(30, 10);
+ i.computeIntersection(p1, p2, q1, q2);
+ assertEquals(RobustLineIntersector.COLLINEAR_INTERSECTION, i.getIntersectionNum());
+ assertTrue(!i.isProper());
+ assertTrue(i.hasIntersection());
+ }
+
+ public void testCollinear4() {
+ RobustLineIntersector i = new RobustLineIntersector();
+ Coordinate p1 = new Coordinate(30, 10);
+ Coordinate p2 = new Coordinate(20, 10);
+ Coordinate q1 = new Coordinate(10, 10);
+ Coordinate q2 = new Coordinate(30, 10);
+ i.computeIntersection(p1, p2, q1, q2);
+ assertEquals(RobustLineIntersector.COLLINEAR_INTERSECTION, i.getIntersectionNum());
+ assertTrue(i.hasIntersection());
+ }
+
+ public void testEndpointIntersection() {
+ i.computeIntersection(new Coordinate(100, 100), new Coordinate(10, 100),
+ new Coordinate(100, 10), new Coordinate(100, 100));
+ assertTrue(i.hasIntersection());
+ assertEquals(1, i.getIntersectionNum());
+ }
+
+ public void testEndpointIntersection2() {
+ i.computeIntersection(new Coordinate(190, 50), new Coordinate(120, 100),
+ new Coordinate(120, 100), new Coordinate(50, 150));
+ assertTrue(i.hasIntersection());
+ assertEquals(1, i.getIntersectionNum());
+ assertEquals(new Coordinate(120, 100), i.getIntersection(1));
+ }
+
+ public void testOverlap() {
+ i.computeIntersection(new Coordinate(180, 200), new Coordinate(160, 180),
+ new Coordinate(220, 240), new Coordinate(140, 160));
+ assertTrue(i.hasIntersection());
+ assertEquals(2, i.getIntersectionNum());
+ }
+
+ public void testIsProper1() {
+ i.computeIntersection(new Coordinate(30, 10), new Coordinate(30, 30),
+ new Coordinate(10, 10), new Coordinate(90, 11));
+ assertTrue(i.hasIntersection());
+ assertEquals(1, i.getIntersectionNum());
+ assertTrue(i.isProper());
+ }
+
+ public void testIsProper2() {
+ i.computeIntersection(new Coordinate(10, 30), new Coordinate(10, 0),
+ new Coordinate(11, 90), new Coordinate(10, 10));
+ assertTrue(i.hasIntersection());
+ assertEquals(1, i.getIntersectionNum());
+ assertTrue(! i.isProper());
+ }
+
+ public void testIsCCW() {
+ assertEquals(1, Orientation.index(new Coordinate(-123456789, -40), new Coordinate(0, 0), new Coordinate(381039468754763d, 123456789)));
+ }
+
+ public void testIsCCW2() {
+ assertEquals(0, Orientation.index(new Coordinate(10, 10), new Coordinate(20, 20), new Coordinate(0, 0)));
+ }
+
+ public void testA() {
+ Coordinate p1 = new Coordinate(-123456789, -40);
+ Coordinate p2 = new Coordinate(381039468754763d, 123456789);
+ Coordinate q = new Coordinate(0, 0);
+ LineString l = new GeometryFactory().createLineString(new Coordinate[] {p1, p2});
+ Point p = new GeometryFactory().createPoint(q);
+ assertEquals(false, l.intersects(p));
+ assertEquals(false, PointLocation.isOnLine(q, new Coordinate[] {p1, p2}));
+ assertEquals(-1, Orientation.index(p1, p2, q));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/ShewchuksDeterminant.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/ShewchuksDeterminant.java
new file mode 100644
index 0000000..74eb1dc
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/ShewchuksDeterminant.java
@@ -0,0 +1,798 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+
+/**
+ * This implementation is a port of Shewchuks original implementation in c
+ * which is placed in the public domain:
+ *
+ * [...]
+ * Placed in the public domain by
+ * Jonathan Richard Shewchuk
+ * School of Computer Science
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, Pennsylvania 15213-3891
+ * jrs at cs.cmu.edu
+ * [...]
+ *
+ * See http://www.cs.cmu.edu/~quake/robust.html for information about the original implementation
+ *
+ * The strategy used during porting has been to resemble the original as much as possible in order to
+ * be able to proofread the result. This strategy has not been followed in the following cases:
+ *
+ * - function "exactinit" has been replaced by a static block, in order to ensure that the code is only
+ * executed once.
+ *
+ * - The main part of the so called "tail" functions has been removed in favor to "head" functions. This means
+ * that all calls to such a main functions has been replaced with on call to the head function and one call
+ * to the tail function. The rationale for this is that the corresponding source macros has multiple output parameters
+ * which is not supported in Java. Using objects to pass the results to the caller was not considered for performance
+ * reasons. It is assumed that the extra allocations of memory would affect performance negatively.
+ *
+ * - The porting of the two_two_diff methods and the other methods involved was tricky since the original macros
+ * had lots of output parameters. These methods has the highest probability of bugs as a result of the porting
+ * operation. Each original function(macro) has been replaced with one method for each output parameter. They are
+ * named as *__x0, *__x2 etc. where the postfix is named after the original output parameter in the SOURCE CODE.
+ * The rational for the naming has been to facilitate proofreading. Each of these methods has an annotation above
+ * it that shows the original macro.
+ *
+ * - One bug has been found in the original source. The use of the prefix incrementation operator in
+ * fast_expansion_sum_zeroelim caused the code to access memory outside of the array boundary. This is not
+ * allowed in Java which is the reason why this bug was discovered. It is unclear if the code worked correctly
+ * as a compiled c-program. It has been confirmed by valgrind that this actually happens in the original code.
+ * The author of the original code has been contacted, and we are waiting for an answer. All occurrences of the
+ * prefix incrementation operator in that function have been replaced with the postfix version. This change looks
+ * reasonable by a quick look at the code, but this needs to be more thoroughly analyzed.
+ *
+ * - Function orientationIndex is new and its contract is copied from
+ * com.vividsolutions.jts.algorithm.CGAlgorithms.orientationIndex so that the current implementation of that method
+ * can be easily replaced.
+ *
+ * Some relevant comments in the original code has been kept untouched in its entirety. For more in-depth information
+ * refer to the original source.
+ */
+
+/*****************************************************************************/
+/* */
+/* Routines for Arbitrary Precision Floating-point Arithmetic */
+/* and Fast Robust Geometric Predicates */
+/* (predicates.c) */
+/* */
+/* May 18, 1996 */
+/* */
+/* Placed in the public domain by */
+/* Jonathan Richard Shewchuk */
+/* School of Computer Science */
+/* Carnegie Mellon University */
+/* 5000 Forbes Avenue */
+/* Pittsburgh, Pennsylvania 15213-3891 */
+/* jrs at cs.cmu.edu */
+/* */
+/* This file contains C implementation of algorithms for exact addition */
+/* and multiplication of floating-point numbers, and predicates for */
+/* robustly performing the orientation and incircle tests used in */
+/* computational geometry. The algorithms and underlying theory are */
+/* described in Jonathan Richard Shewchuk. "Adaptive Precision Floating- */
+/* Point Arithmetic and Fast Robust Geometric Predicates." Technical */
+/* Report CMU-CS-96-140, School of Computer Science, Carnegie Mellon */
+/* University, Pittsburgh, Pennsylvania, May 1996. (Submitted to */
+/* Discrete & Computational Geometry.) */
+/* */
+/* This file, the paper listed above, and other information are available */
+/* from the Web page http://www.cs.cmu.edu/~quake/robust.html . */
+/* */
+/*****************************************************************************/
+
+/*****************************************************************************/
+/* */
+/* Using this code: */
+/* */
+/* First, read the short or long version of the paper (from the Web page */
+/* above). */
+/* */
+/* Be sure to call exactinit() once, before calling any of the arithmetic */
+/* functions or geometric predicates. Also be sure to turn on the */
+/* optimizer when compiling this file. */
+/* */
+/* */
+/* Several geometric predicates are defined. Their parameters are all */
+/* points. Each point is an array of two or three floating-point */
+/* numbers. The geometric predicates, described in the papers, are */
+/* */
+/* orient2d(pa, pb, pc) */
+/* orient2dfast(pa, pb, pc) */
+/* orient3d(pa, pb, pc, pd) */
+/* orient3dfast(pa, pb, pc, pd) */
+/* incircle(pa, pb, pc, pd) */
+/* incirclefast(pa, pb, pc, pd) */
+/* insphere(pa, pb, pc, pd, pe) */
+/* inspherefast(pa, pb, pc, pd, pe) */
+/* */
+/* Those with suffix "fast" are approximate, non-robust versions. Those */
+/* without the suffix are adaptive precision, robust versions. There */
+/* are also versions with the suffices "exact" and "slow", which are */
+/* non-adaptive, exact arithmetic versions, which I use only for timings */
+/* in my arithmetic papers. */
+/* */
+/* */
+/* An expansion is represented by an array of floating-point numbers, */
+/* sorted from smallest to largest magnitude (possibly with interspersed */
+/* zeros). The length of each expansion is stored as a separate integer, */
+/* and each arithmetic function returns an integer which is the length */
+/* of the expansion it created. */
+/* */
+/* Several arithmetic functions are defined. Their parameters are */
+/* */
+/* e, f Input expansions */
+/* elen, flen Lengths of input expansions (must be >= 1) */
+/* h Output expansion */
+/* b Input scalar */
+/* */
+/* The arithmetic functions are */
+/* */
+/* grow_expansion(elen, e, b, h) */
+/* grow_expansion_zeroelim(elen, e, b, h) */
+/* expansion_sum(elen, e, flen, f, h) */
+/* expansion_sum_zeroelim1(elen, e, flen, f, h) */
+/* expansion_sum_zeroelim2(elen, e, flen, f, h) */
+/* fast_expansion_sum(elen, e, flen, f, h) */
+/* fast_expansion_sum_zeroelim(elen, e, flen, f, h) */
+/* linear_expansion_sum(elen, e, flen, f, h) */
+/* linear_expansion_sum_zeroelim(elen, e, flen, f, h) */
+/* scale_expansion(elen, e, b, h) */
+/* scale_expansion_zeroelim(elen, e, b, h) */
+/* compress(elen, e, h) */
+/* */
+/* All of these are described in the long version of the paper; some are */
+/* described in the short version. All return an integer that is the */
+/* length of h. Those with suffix _zeroelim perform zero elimination, */
+/* and are recommended over their counterparts. The procedure */
+/* fast_expansion_sum_zeroelim() (or linear_expansion_sum_zeroelim() on */
+/* processors that do not use the round-to-even tiebreaking rule) is */
+/* recommended over expansion_sum_zeroelim(). Each procedure has a */
+/* little note next to it (in the code below) that tells you whether or */
+/* not the output expansion may be the same array as one of the input */
+/* expansions. */
+/* */
+/* */
+/* If you look around below, you'll also find macros for a bunch of */
+/* simple unrolled arithmetic operations, and procedures for printing */
+/* expansions (commented out because they don't work with all C */
+/* compilers) and for generating random floating-point numbers whose */
+/* significand bits are all random. Most of the macros have undocumented */
+/* requirements that certain of their parameters should not be the same */
+/* variable; for safety, better to make sure all the parameters are */
+/* distinct variables. Feel free to send email to jrs at cs.cmu.edu if you */
+/* have questions. */
+/* */
+/*****************************************************************************/
+
+public class ShewchuksDeterminant
+{
+
+ /**
+ * Implements a filter for computing the orientation index of three coordinates.
+ * <p>
+ * If the orientation can be computed safely using standard DP
+ * arithmetic, this routine returns the orientation index.
+ * Otherwise, a value i > 1 is returned.
+ * In this case the orientation index must
+ * be computed using some other method.
+ *
+ * @param pa a coordinate
+ * @param pb a coordinate
+ * @param pc a coordinate
+ * @return the orientation index if it can be computed safely, or
+ * i > 1 if the orientation index cannot be computed safely
+ */
+ public static int orientationIndexFilter(Coordinate pa, Coordinate pb, Coordinate pc)
+ {
+ double detsum;
+
+ double detleft = (pa.x - pc.x) * (pb.y - pc.y);
+ double detright = (pa.y - pc.y) * (pb.x - pc.x);
+ double det = detleft - detright;
+
+ if (detleft > 0.0) {
+ if (detright <= 0.0) {
+ return signum(det);
+ }
+ else {
+ detsum = detleft + detright;
+ }
+ }
+ else if (detleft < 0.0) {
+ if (detright >= 0.0) {
+ return signum(det);
+ }
+ else {
+ detsum = -detleft - detright;
+ }
+ }
+ else {
+ return signum(det);
+ }
+
+ double ERR_BOUND = 1e-15;
+ double errbound = ERR_BOUND * detsum;
+ //double errbound = ccwerrboundA * detsum;
+ if ((det >= errbound) || (-det >= errbound)) {
+ return signum(det);
+ }
+
+ return 2;
+ }
+
+ private static int signum(double x)
+ {
+ if (x > 0) return 1;
+ if (x < 0) return -1;
+ return 0;
+ }
+
+ /**
+ * Returns the index of the direction of the point <code>q</code> relative to
+ * a vector specified by <code>p1-p2</code>.
+ *
+ * @param p1
+ * the origin point of the vector
+ * @param p2
+ * the final point of the vector
+ * @param q
+ * the point to compute the direction to
+ *
+ * @return 1 if q is counter-clockwise (left) from p1-p2;
+ * -1 if q is clockwise (right) from p1-p2;
+ * 0 if q is collinear with p1-p2
+ */
+ public static int orientationIndex(Coordinate p1, Coordinate p2, Coordinate q)
+ {
+ double orientation = orient2d(p1, p2, q);
+ if (orientation > 0.0) return 1;
+ if (orientation < 0.0) return -1;
+ return 0;
+ }
+
+ private static double orient2d(Coordinate pa, Coordinate pb, Coordinate pc)
+ {
+ double detsum;
+
+ double detleft = (pa.x - pc.x) * (pb.y - pc.y);
+ double detright = (pa.y - pc.y) * (pb.x - pc.x);
+ double det = detleft - detright;
+
+ if (detleft > 0.0) {
+ if (detright <= 0.0) {
+ return det;
+ }
+ else {
+ detsum = detleft + detright;
+ }
+ }
+ else if (detleft < 0.0) {
+ if (detright >= 0.0) {
+ return det;
+ }
+ else {
+ detsum = -detleft - detright;
+ }
+ }
+ else {
+ return det;
+ }
+
+ double errbound = ccwerrboundA * detsum;
+ if ((det >= errbound) || (-det >= errbound)) {
+ return det;
+ }
+
+ return orient2dadapt(pa, pb, pc, detsum);
+ }
+
+ /*****************************************************************************/
+ /* */
+ /* orient2d() Adaptive exact 2D orientation test. Robust. */
+ /* */
+ /* Return a positive value if the points pa, pb, and pc occur */
+ /* in counterclockwise order; a negative value if they occur */
+ /* in clockwise order; and zero if they are collinear. The */
+ /* result is also a rough approximation of twice the signed */
+ /* area of the triangle defined by the three points. */
+ /* */
+ /* The last three use exact arithmetic to ensure a correct answer. The */
+ /* result returned is the determinant of a matrix. In orient2d() only, */
+ /* this determinant is computed adaptively, in the sense that exact */
+ /* arithmetic is used only to the degree it is needed to ensure that the */
+ /* returned value has the correct sign. Hence, orient2d() is usually quite */
+ /* fast, but will run more slowly when the input points are collinear or */
+ /* nearly so. */
+ /* */
+ /*****************************************************************************/
+
+ private static double orient2dadapt(Coordinate pa, Coordinate pb,
+ Coordinate pc, double detsum)
+ {
+
+ double acx = pa.x - pc.x;
+ double bcx = pb.x - pc.x;
+ double acy = pa.y - pc.y;
+ double bcy = pb.y - pc.y;
+
+ double detleft = Two_Product_Head(acx, bcy);
+ double detlefttail = Two_Product_Tail(acx, bcy, detleft);
+
+ double detright = Two_Product_Head(acy, bcx);
+ double detrighttail = Two_Product_Tail(acy, bcx, detright);
+
+ double B[] = new double[4];
+ B[2] = Two_Two_Diff__x2(detleft, detlefttail, detright, detrighttail);
+ B[1] = Two_Two_Diff__x1(detleft, detlefttail, detright, detrighttail);
+ B[0] = Two_Two_Diff__x0(detleft, detlefttail, detright, detrighttail);
+ B[3] = Two_Two_Diff__x3(detleft, detlefttail, detright, detrighttail);
+
+ double det = B[0] + B[1] + B[2] + B[3];
+ //det = estimate(4, B);
+ double errbound = ccwerrboundB * detsum;
+ if ((det >= errbound) || (-det >= errbound)) {
+ return det;
+ }
+
+ double acxtail = Two_Diff_Tail(pa.x, pc.x, acx);
+ double bcxtail = Two_Diff_Tail(pb.x, pc.x, bcx);
+ double acytail = Two_Diff_Tail(pa.y, pc.y, acy);
+ double bcytail = Two_Diff_Tail(pb.y, pc.y, bcy);
+
+ if ((acxtail == 0.0) && (acytail == 0.0) && (bcxtail == 0.0)
+ && (bcytail == 0.0)) {
+ return det;
+ }
+
+ errbound = ccwerrboundC * detsum + resulterrbound * Absolute(det);
+ det += (acx * bcytail + bcy * acxtail) - (acy * bcxtail + bcx * acytail);
+ if ((det >= errbound) || (-det >= errbound)) {
+ return det;
+ }
+
+ double s1 = Two_Product_Head(acxtail, bcy);
+ double s0 = Two_Product_Tail(acxtail, bcy, s1);
+
+ double t1 = Two_Product_Head(acytail, bcx);
+ double t0 = Two_Product_Tail(acytail, bcx, t1);
+
+ double u3 = Two_Two_Diff__x3(s1, s0, t1, t0);
+ double u[] = new double[4];
+ u[2] = Two_Two_Diff__x2(s1, s0, t1, t0);
+ u[1] = Two_Two_Diff__x1(s1, s0, t1, t0);
+ u[0] = Two_Two_Diff__x0(s1, s0, t1, t0);
+
+ u[3] = u3;
+ double C1[] = new double[8];
+ int C1length = fast_expansion_sum_zeroelim(4, B, 4, u, C1);
+
+ s1 = Two_Product_Head(acx, bcytail);
+ s0 = Two_Product_Tail(acx, bcytail, s1);
+
+ t1 = Two_Product_Head(acy, bcxtail);
+ t0 = Two_Product_Tail(acy, bcxtail, t1);
+
+ u3 = Two_Two_Diff__x3(s1, s0, t1, t0);
+ u[2] = Two_Two_Diff__x2(s1, s0, t1, t0);
+ u[1] = Two_Two_Diff__x1(s1, s0, t1, t0);
+ u[0] = Two_Two_Diff__x0(s1, s0, t1, t0);
+
+ u[3] = u3;
+ double C2[] = new double[12];
+ int C2length = fast_expansion_sum_zeroelim(C1length, C1, 4, u, C2);
+
+ s1 = Two_Product_Head(acxtail, bcytail);
+ s0 = Two_Product_Tail(acxtail, bcytail, s1);
+
+ t1 = Two_Product_Head(acytail, bcxtail);
+ t0 = Two_Product_Tail(acytail, bcxtail, t1);
+
+ u3 = Two_Two_Diff__x3(s1, s0, t1, t0);
+ u[2] = Two_Two_Diff__x2(s1, s0, t1, t0);
+ u[1] = Two_Two_Diff__x1(s1, s0, t1, t0);
+ u[0] = Two_Two_Diff__x0(s1, s0, t1, t0);
+
+ u[3] = u3;
+ double D[] = new double[16];
+ int Dlength = fast_expansion_sum_zeroelim(C2length, C2, 4, u, D);
+
+ return (D[Dlength - 1]);
+ }
+
+
+ private static final double epsilon;
+
+ private static final double splitter;
+
+ private static final double resulterrbound;
+
+ private static final double ccwerrboundA;
+
+ private static final double ccwerrboundB;
+
+ private static final double ccwerrboundC;
+
+ private static final double o3derrboundA;
+
+ private static final double o3derrboundB;
+
+ private static final double o3derrboundC;
+
+ private static final double iccerrboundA;
+
+ private static final double iccerrboundB;
+
+ private static final double iccerrboundC;
+
+ private static final double isperrboundA;
+
+ private static final double isperrboundB;
+
+ private static final double isperrboundC;
+
+ /*****************************************************************************/
+ /* */
+ /* exactinit() Initialize the variables used for exact arithmetic. */
+ /* */
+ /* `epsilon' is the largest power of two such that 1.0 + epsilon = 1.0 in */
+ /* floating-point arithmetic. `epsilon' bounds the relative roundoff */
+ /* error. It is used for floating-point error analysis. */
+ /* */
+ /* `splitter' is used to split floating-point numbers into two half- */
+ /* length significands for exact multiplication. */
+ /* */
+ /* I imagine that a highly optimizing compiler might be too smart for its */
+ /* own good, and somehow cause this routine to fail, if it pretends that */
+ /* floating-point arithmetic is too much like real arithmetic. */
+ /* */
+ /* Don't change this routine unless you fully understand it. */
+ /* */
+ /*****************************************************************************/
+
+ static {
+ double epsilon_temp;
+ double splitter_temp;
+ double half;
+ double check, lastcheck;
+ int every_other;
+
+ every_other = 1;
+ half = 0.5;
+ epsilon_temp = 1.0;
+ splitter_temp = 1.0;
+ check = 1.0;
+ /* Repeatedly divide `epsilon' by two until it is too small to add to */
+ /* one without causing roundoff. (Also check if the sum is equal to */
+ /* the previous sum, for machines that round up instead of using exact */
+ /* rounding. Not that this library will work on such machines anyway. */
+ do {
+ lastcheck = check;
+ epsilon_temp *= half;
+ if (every_other != 0) {
+ splitter_temp *= 2.0;
+ }
+ every_other = every_other == 0 ? 1 : 0;
+ check = 1.0 + epsilon_temp;
+ } while ((check != 1.0) && (check != lastcheck));
+ splitter_temp += 1.0;
+
+ /* Error bounds for orientation and incircle tests. */
+ resulterrbound = (3.0 + 8.0 * epsilon_temp) * epsilon_temp;
+ ccwerrboundA = (3.0 + 16.0 * epsilon_temp) * epsilon_temp;
+ ccwerrboundB = (2.0 + 12.0 * epsilon_temp) * epsilon_temp;
+ ccwerrboundC = (9.0 + 64.0 * epsilon_temp) * epsilon_temp * epsilon_temp;
+ o3derrboundA = (7.0 + 56.0 * epsilon_temp) * epsilon_temp;
+ o3derrboundB = (3.0 + 28.0 * epsilon_temp) * epsilon_temp;
+ o3derrboundC = (26.0 + 288.0 * epsilon_temp) * epsilon_temp * epsilon_temp;
+ iccerrboundA = (10.0 + 96.0 * epsilon_temp) * epsilon_temp;
+ iccerrboundB = (4.0 + 48.0 * epsilon_temp) * epsilon_temp;
+ iccerrboundC = (44.0 + 576.0 * epsilon_temp) * epsilon_temp * epsilon_temp;
+ isperrboundA = (16.0 + 224.0 * epsilon_temp) * epsilon_temp;
+ isperrboundB = (5.0 + 72.0 * epsilon_temp) * epsilon_temp;
+ isperrboundC = (71.0 + 1408.0 * epsilon_temp) * epsilon_temp * epsilon_temp;
+ epsilon = epsilon_temp;
+ splitter = splitter_temp;
+ }
+
+ private static double Absolute(double a)
+ {
+ return ((a) >= 0.0 ? (a) : -(a));
+ }
+
+ private static double Fast_Two_Sum_Tail(double a, double b, double x)
+ {
+ double bvirt = x - a;
+ double y = b - bvirt;
+
+ return y;
+ }
+
+ private static double Fast_Two_Sum_Head(double a, double b)
+ {
+ double x = (double) (a + b);
+
+ return x;
+ }
+
+ private static double Two_Sum_Tail(double a, double b, double x)
+ {
+ double bvirt = (double) (x - a);
+ double avirt = x - bvirt;
+ double bround = b - bvirt;
+ double around = a - avirt;
+
+ double y = around + bround;
+
+ return y;
+ }
+
+ private static double Two_Sum_Head(double a, double b)
+ {
+ double x = (double) (a + b);
+
+ return x;
+ }
+
+ private static double Two_Diff_Tail(double a, double b, double x)
+ {
+ double bvirt = (double) (a - x); // porting issue: why this cast?
+ double avirt = x + bvirt;
+ double bround = bvirt - b;
+ double around = a - avirt;
+ double y = around + bround;
+
+ return y;
+ }
+
+ private static double Two_Diff_Head(double a, double b)
+ {
+ double x = (double) (a - b);
+
+ return x;
+ }
+
+ private static double SplitLo(double a)
+ {
+ double c = (double) (splitter * a); // porting issue: why this cast?
+ double abig = (double) (c - a); // porting issue: why this cast?
+ double ahi = c - abig;
+ double alo = a - ahi;
+
+ return alo;
+ }
+
+ private static double SplitHi(double a)
+ {
+ double c = (double) (splitter * a); // porting issue: why this cast?
+ double abig = (double) (c - a); // porting issue: why this cast?
+ double ahi = c - abig;
+
+ return ahi;
+ }
+
+ private static double Two_Product_Tail(double a, double b, double x)
+ {
+ double ahi = SplitHi(a);
+ double alo = SplitLo(a);
+ double bhi = SplitHi(b);
+ double blo = SplitLo(b);
+
+ double err1 = x - (ahi * bhi);
+ double err2 = err1 - (alo * bhi);
+ double err3 = err2 - (ahi * blo);
+ double y = (alo * blo) - err3;
+
+ return y;
+ }
+
+ private static double Two_Product_Head(double a, double b)
+ {
+ double x = (double) (a * b);
+
+ return x;
+ }
+
+ // #define Two_One_Diff(a1, a0, b, x2, x1, x0)
+ private static double Two_One_Diff__x0(double a1, double a0, double b)
+ {
+ double _i = Two_Diff_Head(a0, b);
+ double x0 = Two_Diff_Tail(a0, b, _i);
+
+ return x0;
+ }
+
+ // #define Two_One_Diff(a1, a0, b, x2, x1, x0)
+ private static double Two_One_Diff__x1(double a1, double a0, double b)
+ {
+ double _i = Two_Diff_Head(a0, b);
+ double x2 = Two_Sum_Head(a1, _i);
+ double x1 = Two_Sum_Tail(a1, _i, x2);
+
+ return x1;
+ }
+
+ // #define Two_One_Diff(a1, a0, b, x2, x1, x0)
+ private static double Two_One_Diff__x2(double a1, double a0, double b)
+ {
+ double _i = Two_Diff_Head(a0, b);
+ double x2 = Two_Sum_Head(a1, _i);
+
+ return x2;
+ }
+
+ // #define Two_Two_Diff(a1, a0, b1, b0, x3, x2, x1, x0)
+ private static double Two_Two_Diff__x0(double a1, double a0, double b1,
+ double b0)
+ {
+ double x0 = Two_One_Diff__x0(a1, a0, b0);
+
+ return x0;
+ }
+
+ // #define Two_Two_Diff(a1, a0, b1, b0, x3, x2, x1, x0)
+ private static double Two_Two_Diff__x1(double a1, double a0, double b1,
+ double b0)
+ {
+ double _j = Two_One_Diff__x2(a1, a0, b0);
+ double _0 = Two_One_Diff__x1(a1, a0, b0);
+
+ double x1 = Two_One_Diff__x0(_j, _0, b1);
+
+ return x1;
+ }
+
+ // #define Two_Two_Diff(a1, a0, b1, b0, x3, x2, x1, x0)
+ private static double Two_Two_Diff__x2(double a1, double a0, double b1,
+ double b0)
+ {
+ double _j = Two_One_Diff__x2(a1, a0, b0);
+ double _0 = Two_One_Diff__x1(a1, a0, b0);
+
+ double x2 = Two_One_Diff__x1(_j, _0, b1);
+
+ return x2;
+ }
+
+ // #define Two_Two_Diff(a1, a0, b1, b0, x3, x2, x1, x0)
+ private static double Two_Two_Diff__x3(double a1, double a0, double b1,
+ double b0)
+ {
+ double _j = Two_One_Diff__x2(a1, a0, b0);
+ double _0 = Two_One_Diff__x1(a1, a0, b0);
+
+ double x3 = Two_One_Diff__x2(_j, _0, b1);
+
+ return x3;
+ }
+
+ /*****************************************************************************/
+ /* */
+ /* fast_expansion_sum_zeroelim() Sum two expansions, eliminating zero */
+ /* components from the output expansion. */
+ /* */
+ /* Sets h = e + f. See the long version of my paper for details. */
+ /* */
+ /* If round-to-even is used (as with IEEE 754), maintains the strongly */
+ /* nonoverlapping property. (That is, if e is strongly nonoverlapping, h */
+ /* will be also.) Does NOT maintain the nonoverlapping or nonadjacent */
+ /* properties. */
+ /* */
+ /*****************************************************************************/
+
+ private static int fast_expansion_sum_zeroelim(int elen, double[] e,
+ int flen, double[] f, double[] h) /* h cannot be e or f. */
+ {
+ double Q;
+ double Qnew;
+ double hh;
+
+ int eindex, findex, hindex;
+ double enow, fnow;
+
+ enow = e[0];
+ fnow = f[0];
+ eindex = findex = 0;
+ if ((fnow > enow) == (fnow > -enow)) {
+ Q = enow;
+ enow = e[eindex++];
+ }
+ else {
+ Q = fnow;
+ fnow = f[findex++];
+ }
+ hindex = 0;
+ if ((eindex < elen) && (findex < flen)) {
+ if ((fnow > enow) == (fnow > -enow)) {
+ Qnew = Fast_Two_Sum_Head(enow, Q);
+ hh = Fast_Two_Sum_Tail(enow, Q, Qnew);
+ enow = e[eindex++];
+ }
+ else {
+ Qnew = Fast_Two_Sum_Head(fnow, Q);
+ hh = Fast_Two_Sum_Tail(fnow, Q, Qnew);
+ fnow = f[findex++];
+ }
+ Q = Qnew;
+ if (hh != 0.0) {
+ h[hindex++] = hh;
+ }
+ while ((eindex < elen) && (findex < flen)) {
+ if ((fnow > enow) == (fnow > -enow)) {
+ Qnew = Two_Sum_Head(Q, enow);
+ hh = Two_Sum_Tail(Q, enow, Qnew);
+ enow = e[eindex++];
+ }
+ else {
+ Qnew = Two_Sum_Head(Q, fnow);
+ hh = Two_Sum_Tail(Q, fnow, Qnew);
+ fnow = f[findex++];
+ }
+ Q = Qnew;
+ if (hh != 0.0) {
+ h[hindex++] = hh;
+ }
+ }
+ }
+ while (eindex < elen) {
+ Qnew = Two_Sum_Head(Q, enow);
+ hh = Two_Sum_Tail(Q, enow, Qnew);
+ enow = e[eindex++];
+ Q = Qnew;
+ if (hh != 0.0) {
+ h[hindex++] = hh;
+ }
+ }
+ while (findex < flen) {
+ Qnew = Two_Sum_Head(Q, fnow);
+ hh = Two_Sum_Tail(Q, fnow, Qnew);
+ fnow = f[findex++];
+ Q = Qnew;
+ if (hh != 0.0) {
+ h[hindex++] = hh;
+ }
+ }
+ if ((Q != 0.0) || (hindex == 0)) {
+ h[hindex++] = Q;
+ }
+ return hindex;
+ }
+
+ /*****************************************************************************/
+ /* */
+ /* estimate() Produce a one-word estimate of an expansion's value. */
+ /* */
+ /* See either version of my paper for details. */
+ /* */
+ /*****************************************************************************/
+
+ private static double estimate(int elen, double[] e)
+ {
+ double Q;
+ int eindex;
+
+ Q = e[0];
+ for (eindex = 1; eindex < elen; eindex++) {
+ Q += e[eindex];
+ }
+ return Q;
+ }
+
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistanceTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistanceTest.java
new file mode 100644
index 0000000..9b910a9
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistanceTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.algorithm.distance;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import test.jts.junit.GeometryUtils;
+
+
+public class DiscreteHausdorffDistanceTest
+extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(DiscreteHausdorffDistanceTest.class);
+ }
+
+ public DiscreteHausdorffDistanceTest(String name) { super(name); }
+
+ public void testLineSegments() throws Exception
+ {
+ runTest("LINESTRING (0 0, 2 1)", "LINESTRING (0 0, 2 0)", 1.0);
+ }
+
+ public void testLineSegments2() throws Exception
+ {
+ runTest("LINESTRING (0 0, 2 0)", "LINESTRING (0 1, 1 2, 2 1)", 2.0);
+ }
+
+ public void testLinePoints() throws Exception
+ {
+ runTest("LINESTRING (0 0, 2 0)", "MULTIPOINT (0 1, 1 0, 2 1)", 1.0);
+ }
+
+ /**
+ * Shows effects of limiting HD to vertices
+ * Answer is not true Hausdorff distance.
+ *
+ * @throws Exception
+ */
+ public void testLinesShowingDiscretenessEffect() throws Exception
+ {
+ runTest("LINESTRING (130 0, 0 0, 0 150)", "LINESTRING (10 10, 10 150, 130 10)", 14.142135623730951);
+ // densifying provides accurate HD
+ runTest("LINESTRING (130 0, 0 0, 0 150)", "LINESTRING (10 10, 10 150, 130 10)", 0.5, 70.0);
+ }
+
+ private static final double TOLERANCE = 0.00001;
+
+ private void runTest(String wkt1, String wkt2, double expectedDistance)
+ throws ParseException
+ {
+ Geometry g1 = GeometryUtils.readWKT(wkt1);
+ Geometry g2 = GeometryUtils.readWKT(wkt2);
+
+ double distance = DiscreteHausdorffDistance.distance(g1, g2);
+ assertEquals(distance, expectedDistance, TOLERANCE);
+ }
+ private void runTest(String wkt1, String wkt2, double densifyFrac, double expectedDistance)
+ throws ParseException
+ {
+ Geometry g1 = GeometryUtils.readWKT(wkt1);
+ Geometry g2 = GeometryUtils.readWKT(wkt2);
+
+ double distance = DiscreteHausdorffDistance.distance(g1, g2, densifyFrac);
+ assertEquals(distance, expectedDistance, TOLERANCE);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocatorTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocatorTest.java
new file mode 100644
index 0000000..f46f4e0
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocatorTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm.locate;
+
+import org.locationtech.jts.algorithm.AbstractPointInRingTest;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.textui.TestRunner;
+
+/**
+ * Tests IndexedPointInAreaLocator algorithms
+ *
+ * @version 1.7
+ */
+public class IndexedPointInAreaLocatorTest extends AbstractPointInRingTest {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(IndexedPointInAreaLocatorTest.class);
+ }
+
+ public IndexedPointInAreaLocatorTest(String name) { super(name); }
+
+
+ protected void runPtInRing(int expectedLoc, Coordinate pt, String wkt)
+ throws Exception
+ {
+ Geometry geom = reader.read(wkt);
+ IndexedPointInAreaLocator loc = new IndexedPointInAreaLocator(geom);
+ int result = loc.locate(pt);
+ assertEquals(expectedLoc, result);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocatorTest.java b/modules/core/src/test/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocatorTest.java
new file mode 100644
index 0000000..1caa47c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocatorTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.algorithm.locate;
+
+import org.locationtech.jts.algorithm.AbstractPointInRingTest;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.textui.TestRunner;
+
+/**
+ * Tests IndexedPointInAreaLocator algorithms
+ *
+ * @version 1.7
+ */
+public class SimplePointInAreaLocatorTest extends AbstractPointInRingTest {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(SimplePointInAreaLocatorTest.class);
+ }
+
+ public SimplePointInAreaLocatorTest(String name) { super(name); }
+
+
+ protected void runPtInRing(int expectedLoc, Coordinate pt, String wkt)
+ throws Exception
+ {
+ Geometry geom = reader.read(wkt);
+ SimplePointInAreaLocator loc = new SimplePointInAreaLocator(geom);
+ int result = loc.locate(pt);
+ assertEquals(expectedLoc, result);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/dissolve/LineDissolverTest.java b/modules/core/src/test/java/org/locationtech/jts/dissolve/LineDissolverTest.java
new file mode 100644
index 0000000..425f37b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/dissolve/LineDissolverTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.dissolve;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import test.jts.junit.GeometryUtils;
+
+
+public class LineDissolverTest extends TestCase {
+ public static void main(String args[]) {
+ TestRunner.run(LineDissolverTest.class);
+ }
+
+ public LineDissolverTest(String name) { super(name); }
+
+ public void testDebug() throws ParseException
+ {
+ //testSingleLine();
+ testIsolatedRing();
+ }
+
+ public void testSingleSegmentLine() throws ParseException
+ {
+ checkDissolve("LINESTRING (0 0, 1 1)", "LINESTRING (0 0, 1 1)");
+ }
+
+ public void testTwoSegmentLine() throws ParseException
+ {
+ checkDissolve("LINESTRING (0 0, 1 1, 2 2)", "LINESTRING (0 0, 1 1, 2 2)");
+ }
+
+ public void testOverlappingTwoSegmentLines() throws ParseException
+ {
+ checkDissolve(
+ new String[] {"LINESTRING (0 0, 1 1, 2 2)", "LINESTRING (1 1, 2 2, 3 3)"},
+ "LINESTRING (0 0, 1 1, 2 2, 3 3)");
+ }
+
+ public void testOverlappingLines3() throws ParseException
+ {
+ checkDissolve(
+ new String[] {"LINESTRING (0 0, 1 1, 2 2)",
+ "LINESTRING (1 1, 2 2, 3 3)",
+ "LINESTRING (1 1, 2 2, 2 0)" },
+ "MULTILINESTRING ((0 0, 1 1, 2 2), (2 0, 2 2), (2 2, 3 3))");
+ }
+
+ public void testDivergingLines() throws ParseException
+ {
+ checkDissolve(
+ "MULTILINESTRING ((0 0, 1 0, 2 1), (0 0, 1 0, 2 0), (1 0, 2 1, 2 0, 3 0))",
+ "MULTILINESTRING ((0 0, 1 0), (1 0, 2 0), (1 0, 2 1, 2 0), (2 0, 3 0))");
+ }
+
+ public void testLollipop() throws ParseException
+ {
+ checkDissolve(
+ "LINESTRING (0 0, 1 0, 2 0, 2 1, 1 0, 0 0)",
+ "MULTILINESTRING ((0 0, 1 0), (1 0, 2 0, 2 1, 1 0))");
+ }
+
+ public void testDisjointLines() throws ParseException
+ {
+ checkDissolve(
+ "MULTILINESTRING ((0 0, 1 0, 2 1), (10 0, 11 0, 12 0))",
+ "MULTILINESTRING ((0 0, 1 0, 2 1), (10 0, 11 0, 12 0))");
+ }
+
+ public void testSingleLine() throws ParseException
+ {
+ checkDissolve(
+ "MULTILINESTRING ((0 0, 1 0, 2 1))",
+ "LINESTRING (0 0, 1 0, 2 1)");
+ }
+
+ public void testOneSegmentY() throws ParseException
+ {
+ checkDissolve("MULTILINESTRING ((0 0, 1 1, 2 2), (1 1, 1 2))", "MULTILINESTRING ((0 0, 1 1), (1 1, 2 2), (1 1, 1 2))");
+ }
+
+ public void testTwoSegmentY() throws ParseException
+ {
+ checkDissolve("MULTILINESTRING ((0 0, 9 9, 10 10, 11 11, 20 20), (10 10, 10 20))",
+ "MULTILINESTRING ((10 20, 10 10), (10 10, 9 9, 0 0), (10 10, 11 11, 20 20))");
+ }
+
+ public void testIsolatedRing() throws ParseException
+ {
+ checkDissolve("LINESTRING (0 0, 1 1, 1 0, 0 0)", "LINESTRING (0 0, 1 1, 1 0, 0 0)");
+ }
+
+ public void testIsolateRingFromMultipleLineStrings() throws ParseException
+ {
+ checkDissolve("MULTILINESTRING ((0 0, 1 0, 1 1), (0 0, 0 1, 1 1))", "LINESTRING (0 0, 0 1, 1 1, 1 0, 0 0)");
+ }
+
+ /**
+ * Shows that rings with incident lines are created with the correct node point.
+ *
+ * @throws ParseException
+ */
+ public void testRingWithTail() throws ParseException
+ {
+ checkDissolve("MULTILINESTRING ((0 0, 1 0, 1 1), (0 0, 0 1, 1 1), (1 0, 2 0))", "MULTILINESTRING ((1 0, 0 0, 0 1, 1 1, 1 0), (1 0, 2 0))");
+ }
+
+ public void testZeroLengthStartSegment() throws ParseException
+ {
+ checkDissolve(
+ "MULTILINESTRING ((0 0, 0 0, 2 1))",
+ "LINESTRING (0 0, 2 1)");
+ }
+
+
+ private void checkDissolve(String wkt, String expectedWKT) throws ParseException {
+ checkDissolve(new String[] { wkt }, expectedWKT);
+ }
+
+ private void checkDissolve(String[] wkt, String expectedWKT) throws ParseException {
+ List geoms = GeometryUtils.readWKT(wkt);
+ Geometry expected = GeometryUtils.readWKT(expectedWKT);
+ checkDissolve(geoms, expected);
+ }
+
+
+ private void checkDissolve(List geoms, Geometry expected) {
+ LineDissolver d = new LineDissolver();
+ d.add(geoms);
+ Geometry result = d.getResult();
+ boolean equal = result.norm().equalsExact(expected.norm());
+ if (! equal) {
+ //System.out.println("Expected = " + expected
+ // + " actual = " + result.norm());
+ }
+ assertTrue(equal);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/edgegraph/EdgeGraphTest.java b/modules/core/src/test/java/org/locationtech/jts/edgegraph/EdgeGraphTest.java
new file mode 100644
index 0000000..f84612f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/edgegraph/EdgeGraphTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.edgegraph;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.io.ParseException;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import test.jts.junit.GeometryUtils;
+
+
+public class EdgeGraphTest extends TestCase {
+ public static void main(String args[]) {
+ TestRunner.run(EdgeGraphTest.class);
+ }
+
+
+ public EdgeGraphTest(String name) { super(name); }
+
+ public void testNode() throws Exception
+ {
+ EdgeGraph graph = build("MULTILINESTRING((0 0, 1 0), (0 0, 0 1), (0 0, -1 0))");
+ checkEdgeRing(graph, new Coordinate(0, 0),
+ new Coordinate[] { new Coordinate(1, 0),
+ new Coordinate(0, 1), new Coordinate(-1, 0)
+ });
+ checkEdge(graph, new Coordinate(0, 0), new Coordinate(1, 0));
+ }
+
+ private void checkEdgeRing(EdgeGraph graph, Coordinate p,
+ Coordinate[] dest) {
+ HalfEdge e = graph.findEdge(p, dest[0]);
+ HalfEdge onext = e;
+ int i = 0;
+ do {
+ assertTrue(onext.dest().equals2D(dest[i++]));
+ onext = onext.oNext();
+ } while (onext != e);
+
+ }
+
+
+ private void checkEdge(EdgeGraph graph, Coordinate p0, Coordinate p1) {
+ HalfEdge e = graph.findEdge(p0, p1);
+ assertNotNull(e);
+ }
+
+
+ private EdgeGraph build(String wkt) throws ParseException {
+ return build(new String[] { wkt });
+ }
+
+ private EdgeGraph build(String[] wkt) throws ParseException {
+ List geoms = GeometryUtils.readWKT(wkt);
+ return EdgeGraphBuilder.build(geoms);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/generator/GeometryGenerator.java b/modules/core/src/test/java/org/locationtech/jts/generator/GeometryGenerator.java
new file mode 100644
index 0000000..e74f10c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/generator/GeometryGenerator.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.generator;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+
+/**
+ * This class illustrates the basic functionality and configuration options for generating spatial data.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public abstract class GeometryGenerator {
+ protected int dimensions = 2;
+ protected GeometryFactory geometryFactory; // includes srid
+ protected Envelope boundingBox;
+
+ /**
+ * @return A Geometry which uses some or all of the Bounding Box specified.
+ */
+ public abstract Geometry create();
+
+
+ /**
+ * @see GridGenerator
+ * @return A new GridGenerator
+ */
+ public static GridGenerator createGridGenerator(){
+ return new GridGenerator();
+ }
+
+ /**
+ * @see PointGenerator
+ * @return A new PointGenerator
+ */
+ public static PointGenerator createPointGenerator(){
+ return new PointGenerator();
+ }
+
+ /**
+ * @see LineStringGenerator
+ * @return A new LineStringGenerator
+ */
+ public static LineStringGenerator createLineStringGenerator(){
+ LineStringGenerator lsg = new LineStringGenerator();
+ lsg.setGenerationAlgorithm(LineStringGenerator.ARC);
+ lsg.setNumberPoints(10);
+ return lsg;
+ }
+
+ /**
+ * @see PolygonGenerator
+ * @return A new PolygonGenerator
+ */
+ public static PolygonGenerator createPolygonGenerator(){
+ PolygonGenerator pg = new PolygonGenerator();
+ pg.setGenerationAlgorithm(PolygonGenerator.ARC);
+ pg.setNumberPoints(10);
+ pg.setNumberHoles(8);
+ return pg;
+ }
+
+ /**
+ * @see PointGenerator
+ * @see MultiGenerator
+ * @return A new MultiGenerator
+ */
+ public static MultiGenerator createMultiPointGenerator(){
+ MultiGenerator mg = new MultiGenerator(createPointGenerator());
+ mg.setNumberGeometries(4);
+ return mg;
+ }
+
+ /**
+ * @see LineStringGenerator
+ * @see MultiGenerator
+ * @return A new PointGenerator
+ */
+ public static MultiGenerator createMultiLineStringGenerator(){
+ MultiGenerator mg = new MultiGenerator(createLineStringGenerator());
+ mg.setNumberGeometries(4);
+ return mg;
+ }
+
+ /**
+ * @see PolygonGenerator
+ * @see MultiGenerator
+ * @return A new PointGenerator
+ */
+ public static MultiGenerator createMultiPolygonGenerator(){
+ MultiGenerator mg = new MultiGenerator(createPolygonGenerator());
+ mg.setNumberGeometries(4);
+ return mg;
+ }
+
+ /**
+ * @return Returns the boundingBox.
+ */
+ public Envelope getBoundingBox() {
+ return boundingBox;
+ }
+
+ /**
+ * @param boundingBox The boundingBox to set.
+ */
+ public void setBoundingBox(Envelope boundingBox) {
+ this.boundingBox = boundingBox;
+ }
+
+ /**
+ * @return Returns the dimensions.
+ */
+ public int getDimensions() {
+ return dimensions;
+ }
+
+ /**
+ * @param dimensions The dimensions to set.
+ */
+ public void setDimensions(int dimensions) {
+ this.dimensions = dimensions;
+ throw new RuntimeException("Dimensions other than 2 are not yet supported");
+ }
+
+ /**
+ * @return Returns the geometryFactory.
+ */
+ public GeometryFactory getGeometryFactory() {
+ return geometryFactory;
+ }
+
+ /**
+ * @param geometryFactory The geometryFactory to set.
+ */
+ public void setGeometryFactory(GeometryFactory geometryFactory) {
+ this.geometryFactory = geometryFactory;
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/generator/GridGenerator.java b/modules/core/src/test/java/org/locationtech/jts/generator/GridGenerator.java
new file mode 100644
index 0000000..ab27848
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/generator/GridGenerator.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.generator;
+
+import java.util.NoSuchElementException;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+
+
+/**
+ * This class should be used to generate a grid of bounding boxes,
+ * most useful when creating multiple geometries.
+ *
+ * Successive calls to create() will walk the user though the grid.
+ * Use canCreate() and reset() to control the walk through the grid.
+ *
+ * @see #canCreate()
+ * @see #reset()
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class GridGenerator extends GeometryGenerator {
+
+ protected int numberColumns = 1;
+ protected int numberRows = 1;
+ protected int index = 0;
+
+ /**
+ * Sets some default values.
+ */
+ public GridGenerator(){
+ dimensions = 2;
+ }
+
+ /**
+ *
+ * @see org.locationtech.jts.generator.GeometryGenerator#create()
+ *
+ * @throws NoSuchElementException when all the grids have been created (@see #create())
+ * @throws NullPointerException when either the Geometry Factory, or the Bounding Box are undefined.
+ */
+ public Geometry create() {
+ return geometryFactory.toGeometry(createEnv());
+ }
+ /**
+ *
+ * @return Envelope
+ *
+ * @see org.locationtech.jts.generator.GeometryGenerator#create()
+ *
+ * @throws NoSuchElementException when all the grids have been created (@see #create())
+ * @throws NullPointerException when either the Geometry Factory, or the Bounding Box are undefined.
+ */
+ public Envelope createEnv() {
+ if(!canCreate()){
+ throw new NoSuchElementException("There are not any grids left to create.");
+ }
+ if(geometryFactory == null){
+ throw new NullPointerException("GeometryFactory is not declared");
+ }
+ if(boundingBox == null || boundingBox.isNull()){
+ throw new NullPointerException("Bounding Box is not declared");
+ }
+
+ double x = boundingBox.getMinX(); // base x
+ double dx = boundingBox.getMaxX()-x;
+
+ double y = boundingBox.getMinY(); // base y
+ double dy = boundingBox.getMaxY()-y;
+
+ int row = numberRows==1?0:index / numberRows;
+ int col = numberColumns==1?0:index % numberColumns;
+
+ double sx,sy; // size of a step
+ sx = dx/numberColumns;
+ sy = dy/numberRows;
+
+ double minx, miny;
+ minx = x+col*sx;
+ miny = y+row*sy;
+
+ Envelope box = new Envelope(geometryFactory.getPrecisionModel().makePrecise(minx),
+ geometryFactory.getPrecisionModel().makePrecise(minx+sx),
+ geometryFactory.getPrecisionModel().makePrecise(miny),
+ geometryFactory.getPrecisionModel().makePrecise(miny+sy));
+
+ index++;
+ return box;
+ }
+
+ /**
+ * @return true when more grids exist
+ */
+ public boolean canCreate(){
+ return (numberColumns*numberRows)>index;
+ }
+
+ /**
+ * Resets the grid counter
+ */
+ public void reset(){
+ index = 0;
+ }
+
+ /**
+ * @see org.locationtech.jts.generator.GeometryGenerator#setDimensions(int)
+ */
+ public void setDimensions(int dimensions) {
+ if(dimensions!=2)
+ throw new IllegalStateException("MAY NOT CHANGE GridGenerator's Dimensions");
+ }
+
+ /**
+ * @return Returns the numberColumns.
+ */
+ public int getNumberColumns() {
+ return numberColumns;
+ }
+
+ /**
+ * @param numberColumns The numberColumns to set.
+ */
+ public void setNumberColumns(int numberColumns) {
+ if(numberColumns<=0)
+ throw new IndexOutOfBoundsException("Index sizes must be positive, non zero");
+ this.numberColumns = numberColumns;
+ }
+
+ /**
+ * @return Returns the numberRows.
+ */
+ public int getNumberRows() {
+ return numberRows;
+ }
+
+ /**
+ * @param numberRows The numberRows to set.
+ */
+ public void setNumberRows(int numberRows) {
+ if(numberRows<=0)
+ throw new IndexOutOfBoundsException("Index sizes must be positive, non zero");
+ this.numberRows = numberRows;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/generator/LineStringGenerator.java b/modules/core/src/test/java/org/locationtech/jts/generator/LineStringGenerator.java
new file mode 100644
index 0000000..8abcf55
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/generator/LineStringGenerator.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.generator;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.operation.valid.IsValidOp;
+
+/**
+ *
+ * This class is used to create a line string within the specified bounding box.
+ *
+ * Successive calls to create may or may not return the same geometry topology.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class LineStringGenerator extends GeometryGenerator {
+ protected int numberPoints = 2;
+ protected int generationAlgorithm = 0;
+
+ /**
+ * Create the points in a vertical line
+ */
+ public static final int VERT = 1;
+
+ /**
+ * Create the points in a horizontal line
+ */
+ public static final int HORZ = 2;
+
+ /**
+ * Create the points in an approximation of an open circle (one edge will not be included).
+ *
+ * Note: this requires the number of points to be greater than 2.
+ *
+ * @see #getNumberPoints()
+ * @see #setNumberPoints(int)
+ */
+ public static final int ARC = 0;
+
+ /**
+ * Number of iterations attempting to create a valid line string
+ */
+ private static final int RUNS = 5;
+
+ /**
+ * As the user increases the number of points, the probability of creating a random valid linestring decreases.
+ * Please take not of this when selecting the generation style, and the number of points.
+ *
+ * May return null if a geometry could not be created.
+ *
+ * @see #getNumberPoints()
+ * @see #setNumberPoints(int)
+ * @see #getGenerationAlgorithm()
+ * @see #setGenerationAlgorithm(int)
+ *
+ * @see #VERT
+ * @see #HORZ
+ * @see #ARC
+ *
+ * @see org.locationtech.jts.generator.GeometryGenerator#create()
+ *
+ * @throws IllegalStateException When the alg is not valid or the number of points is invalid
+ * @throws NullPointerException when either the Geometry Factory, or the Bounding Box are undefined.
+ */
+ public Geometry create() {
+
+ if(geometryFactory == null){
+ throw new NullPointerException("GeometryFactory is not declared");
+ }
+ if(boundingBox == null || boundingBox.isNull()){
+ throw new NullPointerException("Bounding Box is not declared");
+ }
+ if(numberPoints<2){
+ throw new IllegalStateException("Too few points");
+ }
+
+ Coordinate[] coords = new Coordinate[numberPoints];
+
+ double x = boundingBox.getMinX(); // base x
+ double dx = boundingBox.getMaxX()-x;
+
+ double y = boundingBox.getMinY(); // base y
+ double dy = boundingBox.getMaxY()-y;
+
+
+ for(int i=0;i<RUNS;i++){
+ switch(getGenerationAlgorithm()){
+ case VERT:
+ fillVert(x,dx,y,dy,coords,geometryFactory);
+ break;
+ case HORZ:
+ fillHorz(x,dx,y,dy,coords,geometryFactory);
+ break;
+ case ARC:
+ fillArc(x,dx,y,dy,coords,geometryFactory);
+ break;
+ default:
+ throw new IllegalStateException("Invalid Alg. Specified");
+ }
+
+ LineString ls = geometryFactory.createLineString(coords);
+ IsValidOp valid = new IsValidOp(ls);
+ if(valid.isValid()){
+ return ls;
+ }
+ }
+ return null;
+ }
+
+ private static void fillVert(double x, double dx, double y, double dy, Coordinate[] coords, GeometryFactory gf){
+ double fx = x+Math.random()*dx;
+ double ry = dy; // remainder of y distance
+ coords[0] = new Coordinate(fx,y);
+ gf.getPrecisionModel().makePrecise(coords[0]);
+ for(int i=1;i<coords.length-1;i++){
+ ry -= Math.random()*ry;
+ coords[i] = new Coordinate(fx,y+dy-ry);
+ gf.getPrecisionModel().makePrecise(coords[i]);
+ }
+ coords[coords.length-1] = new Coordinate(fx,y+dy);
+ gf.getPrecisionModel().makePrecise(coords[coords.length-1]);
+ }
+
+ private static void fillHorz(double x, double dx, double y, double dy, Coordinate[] coords, GeometryFactory gf){
+ double fy = y+Math.random()*dy;
+ double rx = dx; // remainder of x distance
+ coords[0] = new Coordinate(x,fy);
+ gf.getPrecisionModel().makePrecise(coords[0]);
+ for(int i=1;i<coords.length-1;i++){
+ rx -= Math.random()*rx;
+ coords[i] = new Coordinate(x+dx-rx,fy);
+ gf.getPrecisionModel().makePrecise(coords[i]);
+ }
+ coords[coords.length-1] = new Coordinate(x+dx,fy);
+ gf.getPrecisionModel().makePrecise(coords[coords.length-1]);
+ }
+
+ private static void fillArc(double x, double dx, double y, double dy, Coordinate[] coords, GeometryFactory gf){
+ if(coords.length == 2)
+ throw new IllegalStateException("Too few points for Arc");
+
+ double theta = 360/coords.length;
+ double start = theta/2;
+
+ double radius = dx<dy?dx/3:dy/3;
+
+ double cx = x+(dx/2); // center
+ double cy = y+(dy/2); // center
+
+ for(int i=0;i<coords.length;i++){
+ double angle = Math.toRadians(start+theta*i);
+
+ double fx = Math.sin(angle)*radius; // may be neg.
+ double fy = Math.cos(angle)*radius; // may be neg.
+
+ coords[i] = new Coordinate(cx+fx,cy+fy);
+ gf.getPrecisionModel().makePrecise(coords[i]);
+ }
+ }
+
+ /**
+ * @return Returns the numberPoints.
+ */
+ public int getNumberPoints() {
+ return numberPoints;
+ }
+
+ /**
+ * @param numberPoints The numberPoints to set.
+ */
+ public void setNumberPoints(int numberPoints) {
+ this.numberPoints = numberPoints;
+ }
+
+ /**
+ * @return Returns the generationAlgorithm.
+ */
+ public int getGenerationAlgorithm() {
+ return generationAlgorithm;
+ }
+
+ /**
+ * @param generationAlgorithm The generationAlgorithm to set.
+ */
+ public void setGenerationAlgorithm(int generationAlgorithm) {
+ this.generationAlgorithm = generationAlgorithm;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/generator/MultiGenerator.java b/modules/core/src/test/java/org/locationtech/jts/generator/MultiGenerator.java
new file mode 100644
index 0000000..7378aa4
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/generator/MultiGenerator.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.generator;
+
+import java.util.ArrayList;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+
+/**
+ *
+ * Cascades the effort of creating a set of topologically valid geometries.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class MultiGenerator extends GeometryGenerator {
+
+ private GeometryGenerator generator = null;
+ private int numberGeometries = 2;
+ private int generationAlgorithm = 0;
+
+ /**
+ * Grid style blocks
+ */
+ public static final int BOX = 0;
+ /**
+ * vertical strips
+ */
+ public static final int VERT = 1;
+ /**
+ * Horizontal strips
+ */
+ public static final int HORZ = 2;
+
+ /**
+ * @param generator
+ */
+ public MultiGenerator(GeometryGenerator generator) {
+ this.generator = generator;
+ }
+
+ /**
+ * Creates a geometry collection representing the set of child geometries created.
+ *
+ * @see #setNumberGeometries(int)
+ * @see org.locationtech.jts.generator.GeometryGenerator#create()
+ *
+ * @see #BOX
+ * @see #VERT
+ * @see #HORZ
+ *
+ * @throws NullPointerException when the generator is missing
+ * @throws IllegalStateException when the number of child geoms is too small
+ * @throws IllegalStateException when the selected alg. is invalid
+ */
+ public Geometry create() {
+ if(generator == null)
+ throw new NullPointerException("Missing child generator");
+
+ if(numberGeometries < 1)
+ throw new IllegalStateException("Too few child geoms to create");
+
+ ArrayList geoms = new ArrayList(numberGeometries);
+
+ GridGenerator grid = GeometryGenerator.createGridGenerator();
+ grid.setBoundingBox(boundingBox);
+ grid.setGeometryFactory(geometryFactory);
+
+ switch(generationAlgorithm){
+ case BOX:
+
+ int nrow = (int)Math.sqrt(numberGeometries);
+ int ncol = numberGeometries/nrow;
+ grid.setNumberRows(nrow);
+ grid.setNumberColumns(ncol);
+
+ break;
+ case VERT:
+
+ grid.setNumberRows(1);
+ grid.setNumberColumns(numberGeometries);
+
+ break;
+ case HORZ:
+
+ grid.setNumberRows(numberGeometries);
+ grid.setNumberColumns(1);
+
+ break;
+ default:
+ throw new IllegalStateException("Invalid Alg. Specified");
+ }
+
+ while(grid.canCreate()){
+ generator.setBoundingBox(grid.createEnv());
+ geoms.add(generator.create());
+ }
+
+ // yes ... there are better ways
+ if(generator instanceof PointGenerator){
+ return geometryFactory.createMultiPoint((Point[]) geoms.toArray(new Point[numberGeometries]));
+ }else{
+ if(generator instanceof LineStringGenerator){
+ return geometryFactory.createMultiLineString((LineString[]) geoms.toArray(new LineString[numberGeometries]));
+ }else{
+ if(generator instanceof PolygonGenerator){
+ return geometryFactory.createMultiPolygon((Polygon[]) geoms.toArray(new Polygon[numberGeometries]));
+ }else{
+ // same as multi
+ return geometryFactory.createGeometryCollection((Geometry[]) geoms.toArray(new Geometry[numberGeometries]));
+ }}}
+ }
+
+ /**
+ * @return Returns the numberGeometries.
+ */
+ public int getNumberGeometries() {
+ return numberGeometries;
+ }
+
+ /**
+ * @param numberGeometries The numberGeometries to set.
+ */
+ public void setNumberGeometries(int numberGeometries) {
+ this.numberGeometries = numberGeometries;
+ }
+
+ /**
+ * @return Returns the generator.
+ */
+ public GeometryGenerator getGenerator() {
+ return generator;
+ }
+
+ /**
+ * @see org.locationtech.jts.generator.GeometryGenerator#setBoundingBox(org.locationtech.jts.geom.Envelope)
+ */
+ public void setBoundingBox(Envelope boundingBox) {
+ super.setBoundingBox(boundingBox);
+ if(generator!=null)
+ generator.setBoundingBox(boundingBox);
+ }
+
+ /**
+ * @see org.locationtech.jts.generator.GeometryGenerator#setDimensions(int)
+ */
+ public void setDimensions(int dimensions) {
+ super.setDimensions(dimensions);
+ if(generator!=null)
+ generator.setDimensions(dimensions);
+ }
+
+ /**
+ * @see org.locationtech.jts.generator.GeometryGenerator#setGeometryFactory(org.locationtech.jts.geom.GeometryFactory)
+ */
+ public void setGeometryFactory(GeometryFactory geometryFactory) {
+ super.setGeometryFactory(geometryFactory);
+ if(generator!=null)
+ generator.setGeometryFactory(geometryFactory);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/generator/PointGenerator.java b/modules/core/src/test/java/org/locationtech/jts/generator/PointGenerator.java
new file mode 100644
index 0000000..3a6fabc
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/generator/PointGenerator.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.generator;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+
+/**
+ *
+ * Creates a point based on the bounding box.
+ *
+ * This implementation returns the centroid.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class PointGenerator extends GeometryGenerator {
+
+ /**
+ * @see org.locationtech.jts.generator.GeometryGenerator#create()
+ * @throws NullPointerException when either the Geometry Factory, or the Bounding Box are undefined.
+ */
+ public Geometry create() {
+ if(geometryFactory == null){
+ throw new NullPointerException("GeometryFactory is not declared");
+ }
+ if(boundingBox == null || boundingBox.isNull()){
+ throw new NullPointerException("Bounding Box is not declared");
+ }
+
+ Point p = geometryFactory.toGeometry(boundingBox).getCentroid();
+ geometryFactory.getPrecisionModel().makePrecise(p.getCoordinate());
+ return p;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/generator/PolygonGenerator.java b/modules/core/src/test/java/org/locationtech/jts/generator/PolygonGenerator.java
new file mode 100644
index 0000000..74f650f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/generator/PolygonGenerator.java
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.generator;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.operation.valid.IsValidOp;
+
+/**
+ *
+ * This class is used to create a polygon within the specified bounding box.
+ *
+ * Successive calls to create may or may not return the same geometry topology.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class PolygonGenerator extends GeometryGenerator {
+ protected int numberPoints = 4;
+ protected int numberHoles = 0;
+ protected int generationAlgorithm = 0;
+
+ /**
+ * Creates rectangular polygons
+ */
+ public static final int BOX = 0;
+
+ /**
+ * Creates polygons whose points will not be rectangular when there are more than 4 points
+ */
+ public static final int ARC = 1;
+
+ private static final int RUNS = 5;
+
+ /**
+ * As the user increases the number of points, the probability of creating a random valid polygon decreases.
+ * Please take not of this when selecting the generation style, and the number of points.
+ *
+ * May return null if a geometry could not be created.
+ *
+ * @see #getNumberPoints()
+ * @see #setNumberPoints(int)
+ * @see #getGenerationAlgorithm()
+ * @see #setGenerationAlgorithm(int)
+ *
+ * @see #BOX
+ * @see #ARC
+ *
+ * @see org.locationtech.jts.generator.GeometryGenerator#create()
+ *
+ * @throws IllegalStateException When the alg is not valid or the number of points is invalid
+ * @throws NullPointerException when either the Geometry Factory, or the Bounding Box are undefined.
+ */
+ public Geometry create() {
+
+ if(geometryFactory == null){
+ throw new NullPointerException("GeometryFactory is not declared");
+ }
+ if(boundingBox == null || boundingBox.isNull()){
+ throw new NullPointerException("Bounding Box is not declared");
+ }
+ if(numberPoints<4){
+ throw new IllegalStateException("Too few points");
+ }
+
+ double x = boundingBox.getMinX(); // base x
+ double dx = boundingBox.getMaxX()-x;
+
+ double y = boundingBox.getMinY(); // base y
+ double dy = boundingBox.getMaxY()-y;
+
+ Polygon p = null;
+
+ for(int i=0;i<RUNS;i++){
+ switch(getGenerationAlgorithm()){
+ case BOX:
+ p = createBox(x,dx,y,dy,numberHoles,numberPoints,geometryFactory);
+ break;
+ case ARC:
+ p = createArc(x,dx,y,dy,numberHoles,numberPoints,geometryFactory);
+ break;
+ default:
+ throw new IllegalStateException("Invalid Alg. Specified");
+ }
+
+ IsValidOp valid = new IsValidOp(p);
+ if(valid.isValid()){
+ return p;
+ }
+ }
+ return null;
+ }
+
+ private static Polygon createArc(double x, double dx, double y, double dy, int nholes, int npoints, GeometryFactory gf){
+ // make outer ring first
+ double radius = dx<dy?dx/3:dy/3;
+
+ double cx = x+(dx/2); // center
+ double cy = y+(dy/2); // center
+
+ LinearRing outer = createArc(cx,cy,radius,npoints,gf);
+
+ if(nholes == 0){
+ return gf.createPolygon(outer,null);
+ }
+
+ LinearRing[] inner = new LinearRing[nholes];
+
+ radius *= .75;
+ int degreesPerHole = 360/(nholes+1);
+ int degreesPerGap = degreesPerHole/nholes;
+ degreesPerGap = degreesPerGap<2?2:degreesPerGap;
+ degreesPerHole = (360-(degreesPerGap*nholes))/nholes;
+
+ if(degreesPerHole < 2)
+ throw new RuntimeException("Slices too small for poly. Use Box alg.");
+
+ int start = degreesPerGap/2;
+ for(int i=0;i<nholes;i++){
+ int st = start+(i*(degreesPerHole+degreesPerGap)); // start angle
+ inner[i] = createTri(cx,cy,st,st+degreesPerHole,radius,gf);
+ }
+
+
+ return gf.createPolygon(outer,inner);
+ }
+
+ private static LinearRing createTri(double cx, double cy ,int startAngle, int endAngle, double radius, GeometryFactory gf){
+
+ Coordinate[] coords = new Coordinate[4];
+
+ double fx1,fx2,fy1,fy2;
+
+ double angle = Math.toRadians(startAngle);
+ fx1 = Math.sin(angle)*radius; // may be neg.
+ fy1 = Math.cos(angle)*radius; // may be neg.
+
+ angle = Math.toRadians(endAngle);
+ fx2 = Math.sin(angle)*radius; // may be neg.
+ fy2 = Math.cos(angle)*radius; // may be neg.
+
+ coords[0] = new Coordinate(cx,cy);
+ gf.getPrecisionModel().makePrecise(coords[0]);
+ coords[1] = new Coordinate(cx+fx1,cy+fy1);
+ gf.getPrecisionModel().makePrecise(coords[1]);
+ coords[2] = new Coordinate(cx+fx2,cy+fy2);
+ gf.getPrecisionModel().makePrecise(coords[2]);
+ coords[3] = new Coordinate(cx,cy);
+ gf.getPrecisionModel().makePrecise(coords[3]);
+
+ return gf.createLinearRing(coords);
+ }
+
+ private static LinearRing createArc(double cx, double cy ,double radius, int npoints, GeometryFactory gf){
+
+ Coordinate[] coords = new Coordinate[npoints+1];
+
+ double theta = 360/npoints;
+
+ for(int i=0;i<npoints;i++){
+ double angle = Math.toRadians(theta*i);
+
+ double fx = Math.sin(angle)*radius; // may be neg.
+ double fy = Math.cos(angle)*radius; // may be neg.
+
+ coords[i] = new Coordinate(cx+fx,cy+fy);
+ gf.getPrecisionModel().makePrecise(coords[i]);
+ }
+
+ coords[npoints] = new Coordinate(coords[0]);
+ gf.getPrecisionModel().makePrecise(coords[npoints]);
+
+ return gf.createLinearRing(coords);
+ }
+
+ private static Polygon createBox(double x, double dx, double y, double dy, int nholes, int npoints, GeometryFactory gf){
+ // make outer ring first
+ LinearRing outer = createBox(x,dx,y,dy,npoints,gf);
+
+ if(nholes == 0){
+ return gf.createPolygon(outer,null);
+ }
+
+ LinearRing[] inner = new LinearRing[nholes];
+
+ int nrow = (int)Math.sqrt(nholes);
+ int ncol = nholes/nrow;
+
+ double ddx = dx/(ncol+1);
+ double ddy = dy/(nrow+1);
+
+ // spacers
+ double spx = ddx/(ncol+1);
+ double spy = ddy/(nrow+1);
+
+ // should have more grids than required
+ int cindex = 0;
+ for(int i=0;i<nrow;i++){
+ for(int j=0;j<ncol;j++){
+ if(cindex<nholes){
+ // make another box
+ int pts = npoints/2;
+ pts = pts<4?4:pts;
+
+ inner[cindex++] = createBox(spx+x+j*(ddx+spx),ddx,spy+y+i*(ddy+spy),ddy,pts,gf);
+ }
+ }
+ }
+
+ return gf.createPolygon(outer,inner);
+ }
+
+ private static LinearRing createBox(double x, double dx, double y, double dy, int npoints, GeometryFactory gf){
+
+ //figure out the number of points per side
+ int ptsPerSide = npoints/4;
+ int rPtsPerSide = npoints%4;
+ Coordinate[] coords = new Coordinate[npoints+1];
+ coords[0] = new Coordinate(x,y); // start
+ gf.getPrecisionModel().makePrecise(coords[0]);
+
+ int cindex = 1;
+ for(int i=0;i<4;i++){ // sides
+ int npts = ptsPerSide+(rPtsPerSide-->0?1:0);
+ // npts atleast 1
+
+ if(i%2 == 1){ // odd vert
+ double cy = dy/npts;
+ if(i > 1) // down
+ cy *=-1;
+ double tx = coords[cindex-1].x;
+ double sy = coords[cindex-1].y;
+
+ for(int j=0;j<npts;j++){
+ coords[cindex] = new Coordinate(tx,sy+(j+1)*cy);
+ gf.getPrecisionModel().makePrecise(coords[cindex++]);
+ }
+ }else{ // even horz
+ double cx = dx/npts;
+ if(i > 1) // down
+ cx *=-1;
+ double ty = coords[cindex-1].y;
+ double sx = coords[cindex-1].x;
+
+ for(int j=0;j<npts;j++){
+ coords[cindex] = new Coordinate(sx+(j+1)*cx,ty);
+ gf.getPrecisionModel().makePrecise(coords[cindex++]);
+ }
+ }
+ }
+ coords[npoints] = new Coordinate(x,y); // end
+ gf.getPrecisionModel().makePrecise(coords[npoints]);
+
+ return gf.createLinearRing(coords);
+ }
+
+ /**
+ * @return Returns the generationAlgorithm.
+ */
+ public int getGenerationAlgorithm() {
+ return generationAlgorithm;
+ }
+
+ /**
+ * @param generationAlgorithm The generationAlgorithm to set.
+ */
+ public void setGenerationAlgorithm(int generationAlgorithm) {
+ this.generationAlgorithm = generationAlgorithm;
+ }
+
+ /**
+ * @return Returns the numberHoles.
+ */
+ public int getNumberHoles() {
+ return numberHoles;
+ }
+
+ /**
+ * @param numberHoles The numberHoles to set.
+ */
+ public void setNumberHoles(int numberHoles) {
+ this.numberHoles = numberHoles;
+ }
+
+ /**
+ * @return Returns the numberPoints.
+ */
+ public int getNumberPoints() {
+ return numberPoints;
+ }
+
+ /**
+ * @param numberPoints The numberPoints to set.
+ */
+ public void setNumberPoints(int numberPoints) {
+ this.numberPoints = numberPoints;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/AreaLengthTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/AreaLengthTest.java
new file mode 100644
index 0000000..27865e1
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/AreaLengthTest.java
@@ -0,0 +1,68 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * @version 1.7
+ */
+public class AreaLengthTest extends TestCase {
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ private static final double TOLERANCE = 1E-5;
+
+ public static void main(String args[]) {
+ TestRunner.run(AreaLengthTest.class);
+ }
+
+ public AreaLengthTest(String name) { super(name); }
+
+ public void testLength() throws Exception
+ {
+ checkLength("MULTIPOINT (220 140, 180 280)", 0.0);
+ checkLength("LINESTRING (220 140, 180 280)", 145.6021977);
+ checkLength("LINESTRING (0 0, 100 100)", 141.4213562373095);
+ checkLength("POLYGON ((20 20, 40 20, 40 40, 20 40, 20 20))", 80.0);
+ checkLength("POLYGON ((20 20, 40 20, 40 40, 20 40, 20 20), (25 35, 35 35, 35 25, 25 25, 25 35))", 120.0);
+ }
+
+ public void testArea() throws Exception
+ {
+ checkArea("MULTIPOINT (220 140, 180 280)", 0.0);
+ checkArea("LINESTRING (220 140, 180 280)", 0.0);
+ checkArea("POLYGON ((20 20, 40 20, 40 40, 20 40, 20 20))", 400.0);
+ checkArea("POLYGON ((20 20, 40 20, 40 40, 20 40, 20 20), (25 35, 35 35, 35 25, 25 25, 25 35))", 300.0);
+ }
+
+ public void checkLength(String wkt, double expectedValue) throws Exception {
+ Geometry g = reader.read(wkt);
+ double len = g.getLength();
+// //System.out.println(len);
+ assertEquals(expectedValue, len, TOLERANCE);
+ }
+
+ public void checkArea(String wkt, double expectedValue) throws Exception {
+ Geometry g = reader.read(wkt);
+ assertEquals(expectedValue, g.getArea(), TOLERANCE);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/BidirectionalComparatorTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/BidirectionalComparatorTest.java
new file mode 100644
index 0000000..3b5c03f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/BidirectionalComparatorTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import java.util.Comparator;
+
+import org.locationtech.jts.geom.CoordinateArrays.BidirectionalComparator;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests {@link BidirectionalComparator}.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class BidirectionalComparatorTest extends TestCase {
+
+ WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(BidirectionalComparatorTest.class);
+ }
+
+ public BidirectionalComparatorTest(String name) { super(name); }
+
+
+ public void testLineString1() throws Exception
+ {
+ assertTrue(0 == compareBiDir(
+ "LINESTRING ( 1388155.775 794886.703, 1388170.712 794887.346, 1388185.425 794892.987, 1388195.167 794898.409, 1388210.091 794899.06, 1388235.117 794900.145, 1388250.276 794895.796, 1388270.174 794896.648, 1388280.138 794897.079, 1388295.063 794897.731, 1388310.348 794893.382, 1388330.479 794889.255, 1388345.617 794884.895, 1388360.778 794880.538, 1388366.184 794870.766, 1388366.62 794860.776, 1388362.086 794850.563, 1388357.761 794835.234, 1388343.474 794 [...]
+ "LINESTRING ( 1388454.204 794698.202, 1388433.884 794693.192, 1388409.429 794682.126, 1388394.513 794681.487, 1388369.486 794680.401, 1388339.4 794684.108, 1388319.278 794688.247, 1388303.994 794692.585, 1388293.603 794702.155, 1388278.444 794706.504, 1388273.037 794716.275, 1388282.129 794736.7, 1388286.452 794751.914, 1388301.155 794757.682, 1388310.597 794773.107, 1388320.114 794783.54, 1388339.151 794804.386, 1388343.474 794819.588, 1388357.761 794835 [...]
+ ));
+ }
+
+ public void testLineString2() throws Exception
+ {
+ assertTrue(0 == compareBiDir(
+ "LINESTRING (1389103.293 794193.755, 1389064.931 794188.991)",
+ "LINESTRING (1389064.931 794188.991, 1389103.293 794193.755)"
+ ));
+ }
+
+
+
+ public int compareBiDir(String wkt0, String wkt1)
+ throws Exception
+ {
+ LineString g0 = (LineString) rdr.read(wkt0);
+ LineString g1 = (LineString) rdr.read(wkt1);
+ Coordinate[] pts0 = g0.getCoordinates();
+ Coordinate[] pts1 = g1.getCoordinates();
+ Comparator comp = new CoordinateArrays.BidirectionalComparator();
+ return comp.compare(pts0, pts1);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateArraysTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateArraysTest.java
new file mode 100644
index 0000000..f7cb641
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateArraysTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Unit tests for {@link CoordinateArrays}
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class CoordinateArraysTest extends TestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(CoordinateArraysTest.class);
+ }
+
+ private static Coordinate[] COORDS_1 = new Coordinate[] { new Coordinate(1, 1), new Coordinate(2, 2), new Coordinate(3, 3) };
+ private static Coordinate[] COORDS_EMPTY = new Coordinate[0];
+
+ public CoordinateArraysTest(String name) { super(name); }
+
+ public void testPtNotInList1()
+ {
+ assertTrue(CoordinateArrays.ptNotInList(
+ new Coordinate[] { new Coordinate(1, 1), new Coordinate(2, 2), new Coordinate(3, 3) },
+ new Coordinate[] { new Coordinate(1, 1), new Coordinate(1, 2), new Coordinate(1, 3) }
+ ).equals2D(new Coordinate(2, 2))
+ );
+ }
+ public void testPtNotInList2()
+ {
+ assertTrue(CoordinateArrays.ptNotInList(
+ new Coordinate[] { new Coordinate(1, 1), new Coordinate(2, 2), new Coordinate(3, 3) },
+ new Coordinate[] { new Coordinate(1, 1), new Coordinate(2, 2), new Coordinate(3, 3) }
+ ) == null
+ );
+ }
+ public void testEnvelope1()
+ {
+ assertEquals( CoordinateArrays.envelope(COORDS_1), new Envelope(1, 3, 1, 3) );
+ }
+ public void testEnvelopeEmpty()
+ {
+ assertEquals( CoordinateArrays.envelope(COORDS_EMPTY), new Envelope() );
+ }
+ public void testIntersection_envelope1()
+ {
+ assertTrue(CoordinateArrays.equals(
+ CoordinateArrays.intersection(COORDS_1, new Envelope(1, 2, 1, 2)),
+ new Coordinate[] { new Coordinate(1, 1), new Coordinate(2, 2) }
+ ));
+ }
+ public void testIntersection_envelopeDisjoint()
+ {
+ assertTrue(CoordinateArrays.equals(
+ CoordinateArrays.intersection(COORDS_1, new Envelope(10, 20, 10, 20)), COORDS_EMPTY )
+ );
+ }
+ public void testIntersection_empty_envelope()
+ {
+ assertTrue(CoordinateArrays.equals(
+ CoordinateArrays.intersection(COORDS_EMPTY, new Envelope(1, 2, 1, 2)), COORDS_EMPTY )
+ );
+ }
+ public void testIntersection_coords_emptyEnvelope()
+ {
+ assertTrue(CoordinateArrays.equals(
+ CoordinateArrays.intersection(COORDS_1, new Envelope()), COORDS_EMPTY )
+ );
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateSequencesTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateSequencesTest.java
new file mode 100644
index 0000000..fd88783
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateSequencesTest.java
@@ -0,0 +1,70 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * @version 1.7
+ */
+public class CoordinateSequencesTest extends TestCase {
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ private static final double TOLERANCE = 1E-5;
+
+ public static void main(String args[]) {
+ TestRunner.run(CoordinateSequencesTest.class);
+ }
+
+ public CoordinateSequencesTest(String name) { super(name); }
+
+ public void testCopyToLargerDim() throws Exception
+ {
+ PackedCoordinateSequenceFactory csFactory = new PackedCoordinateSequenceFactory();
+ CoordinateSequence cs2D = createTestSequence(csFactory, 10, 2);
+ CoordinateSequence cs3D = csFactory.create(10, 3);
+ CoordinateSequences.copy(cs2D, 0, cs3D, 0, cs3D.size());
+ assertTrue(CoordinateSequences.isEqual(cs2D, cs3D));
+ }
+
+ public void testCopyToSmallerDim() throws Exception
+ {
+ PackedCoordinateSequenceFactory csFactory = new PackedCoordinateSequenceFactory();
+ CoordinateSequence cs3D = createTestSequence(csFactory, 10, 3);
+ CoordinateSequence cs2D = csFactory.create(10, 2);
+ CoordinateSequences.copy(cs3D, 0, cs2D, 0, cs2D.size());
+ assertTrue(CoordinateSequences.isEqual(cs2D, cs3D));
+ }
+
+ private static CoordinateSequence createTestSequence(CoordinateSequenceFactory csFactory, int size, int dim)
+ {
+ CoordinateSequence cs = csFactory.create(size, dim);
+ // initialize with a data signature where coords look like [1, 10, 100, ...]
+ for (int i = 0; i < size; i++) {
+ for (int d = 0; d < dim; d++) {
+ cs.setOrdinate(i, d, i * Math.pow(10, d));
+ }
+ }
+ return cs;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateTest.java
new file mode 100644
index 0000000..9d4056b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/CoordinateTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+public class CoordinateTest extends TestCase
+{
+ public CoordinateTest(String name)
+ {
+ super(name);
+ }
+
+ public static void main(String args[]) {
+ TestRunner.run(CoordinateTest.class);
+ }
+
+ public void testConstructor3D()
+ {
+ Coordinate c = new Coordinate(350.2, 4566.8, 5266.3);
+ assertEquals(c.x, 350.2);
+ assertEquals(c.y, 4566.8);
+ assertEquals(c.z, 5266.3);
+ }
+
+ public void testConstructor2D()
+ {
+ Coordinate c = new Coordinate(350.2, 4566.8);
+ assertEquals(c.x, 350.2);
+ assertEquals(c.y, 4566.8);
+ assertEquals(c.z, Coordinate.NULL_ORDINATE);
+ }
+ public void testDefaultConstructor()
+ {
+ Coordinate c = new Coordinate();
+ assertEquals(c.x, 0.0);
+ assertEquals(c.y, 0.0);
+ assertEquals(c.z, Coordinate.NULL_ORDINATE);
+ }
+ public void testCopyConstructor3D()
+ {
+ Coordinate orig = new Coordinate(350.2, 4566.8, 5266.3);
+ Coordinate c = new Coordinate(orig);
+ assertEquals(c.x, 350.2);
+ assertEquals(c.y, 4566.8);
+ assertEquals(c.z, 5266.3);
+ }
+ public void testSetCoordinate()
+ {
+ Coordinate orig = new Coordinate(350.2, 4566.8, 5266.3);
+ Coordinate c = new Coordinate();
+ c.setCoordinate(orig);
+ assertEquals(c.x, 350.2);
+ assertEquals(c.y, 4566.8);
+ assertEquals(c.z, 5266.3);
+ }
+ public void testGetOrdinate()
+ {
+ Coordinate c = new Coordinate(350.2, 4566.8, 5266.3);
+ assertEquals(c.getOrdinate(Coordinate.X), 350.2);
+ assertEquals(c.getOrdinate(Coordinate.Y), 4566.8);
+ assertEquals(c.getOrdinate(Coordinate.Z), 5266.3);
+ }
+ public void testSetOrdinate()
+ {
+ Coordinate c = new Coordinate();
+ c.setOrdinate(Coordinate.X, 111);
+ c.setOrdinate(Coordinate.Y, 222);
+ c.setOrdinate(Coordinate.Z, 333);
+ assertEquals(c.getOrdinate(Coordinate.X), 111.0);
+ assertEquals(c.getOrdinate(Coordinate.Y), 222.0);
+ assertEquals(c.getOrdinate(Coordinate.Z), 333.0);
+ }
+ public void testEquals()
+ {
+ Coordinate c1 = new Coordinate(1,2,3);
+ String s = "Not a coordinate";
+ assertTrue(! c1.equals(s));
+
+ Coordinate c2 = new Coordinate(1,2,3);
+ assertTrue(c1.equals2D(c2));
+
+ Coordinate c3 = new Coordinate(1,22,3);
+ assertTrue(! c1.equals2D(c3));
+ }
+ public void testEquals2D()
+ {
+ Coordinate c1 = new Coordinate(1,2,3);
+ Coordinate c2 = new Coordinate(1,2,3);
+ assertTrue(c1.equals2D(c2));
+
+ Coordinate c3 = new Coordinate(1,22,3);
+ assertTrue(! c1.equals2D(c3));
+ }
+ public void testEquals3D()
+ {
+ Coordinate c1 = new Coordinate(1,2,3);
+ Coordinate c2 = new Coordinate(1,2,3);
+ assertTrue(c1.equals3D(c2));
+
+ Coordinate c3 = new Coordinate(1,22,3);
+ assertTrue(! c1.equals3D(c3));
+ }
+ public void testEquals2DWithinTolerance()
+ {
+ Coordinate c = new Coordinate(100.0, 200.0, 50.0);
+ Coordinate aBitOff = new Coordinate(100.1, 200.1, 50.0);
+ assertTrue(c.equals2D(aBitOff, 0.2));
+ }
+
+ public void testEqualsInZ() {
+
+ Coordinate c = new Coordinate(100.0, 200.0, 50.0);
+ Coordinate withSameZ = new Coordinate(100.1, 200.1, 50.1);
+ assertTrue(c.equalInZ(withSameZ, 0.2));
+ }
+
+ public void testCompareTo()
+ {
+ Coordinate lowest = new Coordinate(10.0, 100.0, 50.0);
+ Coordinate highest = new Coordinate(20.0, 100.0, 50.0);
+ Coordinate equalToHighest = new Coordinate(20.0, 100.0, 50.0);
+ Coordinate higherStill = new Coordinate(20.0, 200.0, 50.0);
+
+ assertEquals(-1, lowest.compareTo(highest));
+ assertEquals(1, highest.compareTo(lowest));
+ assertEquals(-1, highest.compareTo(higherStill));
+ assertEquals(0, highest.compareTo(equalToHighest));
+ }
+ public void testToString()
+ {
+ String expectedResult = "(100.0, 200.0, 50.0)";
+ String actualResult = new Coordinate(100.0, 200.0, 50.0).toString();
+ assertEquals(expectedResult, actualResult);
+ }
+
+ public void testClone() {
+ Coordinate c = new Coordinate(100.0, 200.0, 50.0);
+ Coordinate clone = (Coordinate) c.clone();
+ assertTrue(c.equals3D(clone));
+ }
+
+ public void testDistance() {
+ Coordinate coord1 = new Coordinate(0.0, 0.0, 0.0);
+ Coordinate coord2 = new Coordinate(100.0, 200.0, 50.0);
+ double distance = coord1.distance(coord2);
+ assertEquals(distance, 223.60679774997897, 0.00001);
+ }
+ public void testDistance3D() {
+ Coordinate coord1 = new Coordinate(0.0, 0.0, 0.0);
+ Coordinate coord2 = new Coordinate(100.0, 200.0, 50.0);
+ double distance = coord1.distance3D(coord2);
+ assertEquals(distance, 229.128784747792, 0.000001);
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/EnvelopeTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/EnvelopeTest.java
new file mode 100644
index 0000000..5fe6145
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/EnvelopeTest.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * @version 1.7
+ */
+public class EnvelopeTest extends TestCase {
+ private PrecisionModel precisionModel = new PrecisionModel(1);
+
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel,
+ 0);
+
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public EnvelopeTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ TestRunner.run(EnvelopeTest.class);
+ }
+
+ public void testEverything() throws Exception {
+ Envelope e1 = new Envelope();
+ assertTrue(e1.isNull());
+ assertEquals(0, e1.getWidth(), 1E-3);
+ assertEquals(0, e1.getHeight(), 1E-3);
+ e1.expandToInclude(100, 101);
+ e1.expandToInclude(200, 202);
+ e1.expandToInclude(150, 151);
+ assertEquals(200, e1.getMaxX(), 1E-3);
+ assertEquals(202, e1.getMaxY(), 1E-3);
+ assertEquals(100, e1.getMinX(), 1E-3);
+ assertEquals(101, e1.getMinY(), 1E-3);
+ assertTrue(e1.contains(120, 120));
+ assertTrue(e1.contains(120, 101));
+ assertTrue(!e1.contains(120, 100));
+ assertEquals(101, e1.getHeight(), 1E-3);
+ assertEquals(100, e1.getWidth(), 1E-3);
+ assertTrue(!e1.isNull());
+
+ Envelope e2 = new Envelope(499, 500, 500, 501);
+ assertTrue(!e1.contains(e2));
+ assertTrue(!e1.intersects(e2));
+ e1.expandToInclude(e2);
+ assertTrue(e1.contains(e2));
+ assertTrue(e1.intersects(e2));
+ assertEquals(500, e1.getMaxX(), 1E-3);
+ assertEquals(501, e1.getMaxY(), 1E-3);
+ assertEquals(100, e1.getMinX(), 1E-3);
+ assertEquals(101, e1.getMinY(), 1E-3);
+
+ Envelope e3 = new Envelope(300, 700, 300, 700);
+ assertTrue(!e1.contains(e3));
+ assertTrue(e1.intersects(e3));
+
+ Envelope e4 = new Envelope(300, 301, 300, 301);
+ assertTrue(e1.contains(e4));
+ assertTrue(e1.intersects(e4));
+ }
+
+ public void testIntersects() {
+ checkIntersectsPermuted(1,1, 2,2, 2,2, 3,3, true);
+ checkIntersectsPermuted(1,1, 2,2, 3,3, 4,4, false);
+ }
+
+ public void testIntersectsEmpty() {
+ assertTrue(!new Envelope(-5, 5, -5, 5).intersects(new Envelope()));
+ assertTrue(!new Envelope().intersects(new Envelope(-5, 5, -5, 5)));
+ assertTrue(!new Envelope().intersects(new Envelope(100, 101, 100, 101)));
+ assertTrue(!new Envelope(100, 101, 100, 101).intersects(new Envelope()));
+ }
+
+ public void testContainsEmpty() {
+ assertTrue(!new Envelope(-5, 5, -5, 5).contains(new Envelope()));
+ assertTrue(!new Envelope().contains(new Envelope(-5, 5, -5, 5)));
+ assertTrue(!new Envelope().contains(new Envelope(100, 101, 100, 101)));
+ assertTrue(!new Envelope(100, 101, 100, 101).contains(new Envelope()));
+ }
+
+ public void testExpandToIncludeEmpty() {
+ assertEquals(new Envelope(-5, 5, -5, 5), expandToInclude(new Envelope(-5,
+ 5, -5, 5), new Envelope()));
+ assertEquals(new Envelope(-5, 5, -5, 5), expandToInclude(new Envelope(),
+ new Envelope(-5, 5, -5, 5)));
+ assertEquals(new Envelope(100, 101, 100, 101), expandToInclude(
+ new Envelope(), new Envelope(100, 101, 100, 101)));
+ assertEquals(new Envelope(100, 101, 100, 101), expandToInclude(
+ new Envelope(100, 101, 100, 101), new Envelope()));
+ }
+
+ private Envelope expandToInclude(Envelope a, Envelope b) {
+ a.expandToInclude(b);
+ return a;
+ }
+
+ public void testEmpty() {
+ assertEquals(0, new Envelope().getHeight(), 0);
+ assertEquals(0, new Envelope().getWidth(), 0);
+ assertEquals(new Envelope(), new Envelope());
+ Envelope e = new Envelope(100, 101, 100, 101);
+ e.init(new Envelope());
+ assertEquals(new Envelope(), e);
+ }
+
+ public void testAsGeometry() throws Exception {
+ assertTrue(geometryFactory.createPoint((Coordinate) null).getEnvelope()
+ .isEmpty());
+
+ Geometry g = geometryFactory.createPoint(new Coordinate(5, 6))
+ .getEnvelope();
+ assertTrue(!g.isEmpty());
+ assertTrue(g instanceof Point);
+
+ Point p = (Point) g;
+ assertEquals(5, p.getX(), 1E-1);
+ assertEquals(6, p.getY(), 1E-1);
+
+ LineString l = (LineString) reader.read("LINESTRING(10 10, 20 20, 30 40)");
+ Geometry g2 = l.getEnvelope();
+ assertTrue(!g2.isEmpty());
+ assertTrue(g2 instanceof Polygon);
+
+ Polygon poly = (Polygon) g2;
+ poly.normalize();
+ assertEquals(5, poly.getExteriorRing().getNumPoints());
+ assertEquals(new Coordinate(10, 10), poly.getExteriorRing().getCoordinateN(
+ 0));
+ assertEquals(new Coordinate(10, 40), poly.getExteriorRing().getCoordinateN(
+ 1));
+ assertEquals(new Coordinate(30, 40), poly.getExteriorRing().getCoordinateN(
+ 2));
+ assertEquals(new Coordinate(30, 10), poly.getExteriorRing().getCoordinateN(
+ 3));
+ assertEquals(new Coordinate(10, 10), poly.getExteriorRing().getCoordinateN(
+ 4));
+ }
+
+ public void testSetToNull() throws Exception {
+ Envelope e1 = new Envelope();
+ assertTrue(e1.isNull());
+ e1.expandToInclude(5, 5);
+ assertTrue(!e1.isNull());
+ e1.setToNull();
+ assertTrue(e1.isNull());
+ }
+
+ public void testEquals() throws Exception {
+ Envelope e1 = new Envelope(1, 2, 3, 4);
+ Envelope e2 = new Envelope(1, 2, 3, 4);
+ assertEquals(e1, e2);
+ assertEquals(e1.hashCode(), e2.hashCode());
+
+ Envelope e3 = new Envelope(1, 2, 3, 5);
+ assertTrue(!e1.equals(e3));
+ assertTrue(e1.hashCode() != e3.hashCode());
+ e1.setToNull();
+ assertTrue(!e1.equals(e2));
+ assertTrue(e1.hashCode() != e2.hashCode());
+ e2.setToNull();
+ assertEquals(e1, e2);
+ assertEquals(e1.hashCode(), e2.hashCode());
+ }
+
+ public void testEquals2() {
+ assertTrue(new Envelope().equals(new Envelope()));
+ assertTrue(new Envelope(1, 2, 1, 2).equals(new Envelope(1, 2, 1, 2)));
+ assertTrue(!new Envelope(1, 2, 1.5, 2).equals(new Envelope(1, 2, 1, 2)));
+ }
+
+ public void testCopyConstructor() throws Exception {
+ Envelope e1 = new Envelope(1, 2, 3, 4);
+ Envelope e2 = new Envelope(e1);
+ assertEquals(1, e2.getMinX(), 1E-5);
+ assertEquals(2, e2.getMaxX(), 1E-5);
+ assertEquals(3, e2.getMinY(), 1E-5);
+ assertEquals(4, e2.getMaxY(), 1E-5);
+ }
+
+ public void testGeometryFactoryCreateEnvelope()
+ throws Exception
+ {
+ checkExpectedEnvelopeGeometry("POINT (0 0)");
+ checkExpectedEnvelopeGeometry("POINT (100 13)");
+ checkExpectedEnvelopeGeometry("LINESTRING (0 0, 0 10)");
+ checkExpectedEnvelopeGeometry("LINESTRING (0 0, 10 0)");
+
+ String poly10 = "POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10))";
+ checkExpectedEnvelopeGeometry(poly10);
+
+ checkExpectedEnvelopeGeometry("LINESTRING (0 0, 10 10)",
+ poly10);
+ checkExpectedEnvelopeGeometry("POLYGON ((5 10, 10 6, 5 0, 0 6, 5 10))",
+ poly10);
+
+
+ }
+
+ private void checkIntersectsPermuted(double a1x, double a1y, double a2x, double a2y, double b1x, double b1y, double b2x, double b2y, boolean expected) {
+ checkIntersects(a1x, a1y, a2x, a2y, b1x, b1y, b2x, b2y, expected);
+ checkIntersects(a1x, a2y, a2x, a1y, b1x, b1y, b2x, b2y, expected);
+ checkIntersects(a1x, a1y, a2x, a2y, b1x, b2y, b2x, b1y, expected);
+ checkIntersects(a1x, a2y, a2x, a1y, b1x, b2y, b2x, b1y, expected);
+ }
+ private void checkIntersects(double a1x, double a1y, double a2x, double a2y, double b1x, double b1y, double b2x, double b2y, boolean expected) {
+ Envelope a = new Envelope(a1x, a2x, a1y, a2y);
+ Envelope b = new Envelope(b1x, b2x, b1y, b2y);
+ assertEquals(expected, a.intersects(b));
+
+ Coordinate a1 = new Coordinate(a1x, a1y);
+ Coordinate a2 = new Coordinate(a2x, a2y);
+ Coordinate b1 = new Coordinate(b1x, b1y);
+ Coordinate b2 = new Coordinate(b2x, b2y);
+ assertEquals(expected, Envelope.intersects(a1, a2, b1, b2));
+
+ assertEquals(expected, a.intersects(b1, b2));
+ }
+
+ void checkExpectedEnvelopeGeometry(String wktInput)
+ throws ParseException
+ {
+ checkExpectedEnvelopeGeometry(wktInput, wktInput);
+ }
+
+ void checkExpectedEnvelopeGeometry(String wktInput, String wktEnvGeomExpected)
+ throws ParseException
+ {
+ Geometry input = reader.read(wktInput);
+ Geometry envGeomExpected = reader.read(wktEnvGeomExpected);
+
+ Envelope env = input.getEnvelopeInternal();
+ Geometry envGeomActual = geometryFactory.toGeometry(env);
+ boolean isEqual = envGeomActual.equalsNorm(envGeomExpected);
+ assertTrue(isEqual);
+ }
+
+ public void testCompareTo()
+ {
+ checkCompareTo(0, new Envelope(), new Envelope());
+ checkCompareTo(0, new Envelope(1,2, 1,2), new Envelope(1,2, 1,2));
+ checkCompareTo(1, new Envelope(2,3, 1,2), new Envelope(1,2, 1,2));
+ checkCompareTo(-1, new Envelope(1,2, 1,2), new Envelope(2,3, 1,2));
+ checkCompareTo(1, new Envelope(1,2, 1,3), new Envelope(1,2, 1,2));
+ checkCompareTo(1, new Envelope(2,3, 1,3), new Envelope(1,3, 1,2));
+ }
+
+ public void checkCompareTo(int expected, Envelope env1, Envelope env2)
+ {
+ assertTrue(expected == env1.compareTo(env2));
+ assertTrue(-expected == env2.compareTo(env1));
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/GeometryCollectionImplTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryCollectionImplTest.java
new file mode 100644
index 0000000..1d67897
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryCollectionImplTest.java
@@ -0,0 +1,78 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test for com.vividsolutions.jts.geom.GeometryCollectionImpl.
+ *
+ * @version 1.7
+ */
+public class GeometryCollectionImplTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1000);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(suite());
+ }
+
+ public GeometryCollectionImplTest(String name) { super(name); }
+
+ public static Test suite() { return new TestSuite(GeometryCollectionImplTest.class); }
+
+ public void testGetDimension() throws Exception {
+ GeometryCollection g = (GeometryCollection) reader.read("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))");
+ assertEquals(1, g.getDimension());
+ }
+
+ public void testGetCoordinates() throws Exception {
+ GeometryCollection g = (GeometryCollection) reader.read("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))");
+ Coordinate[] coordinates = g.getCoordinates();
+ assertEquals(4, g.getNumPoints());
+ assertEquals(4, coordinates.length);
+ assertEquals(new Coordinate(10, 10), coordinates[0]);
+ assertEquals(new Coordinate(20, 20), coordinates[3]);
+ }
+
+ public void testGeometryCollectionIterator() throws Exception {
+ GeometryCollection g = (GeometryCollection) reader.read(
+ "GEOMETRYCOLLECTION (GEOMETRYCOLLECTION (POINT (10 10)))");
+ GeometryCollectionIterator i = new GeometryCollectionIterator(g);
+ assertTrue(i.hasNext());
+ assertTrue(i.next() instanceof GeometryCollection);
+ assertTrue(i.next() instanceof GeometryCollection);
+ assertTrue(i.next() instanceof Point);
+ }
+
+ public void testGetLength() throws Exception{
+ GeometryCollection g = (GeometryCollection) new WKTReader().read(
+ "MULTIPOLYGON("
+ + "((0 0, 10 0, 10 10, 0 10, 0 0), (3 3, 3 7, 7 7, 7 3, 3 3)),"
+ + "((100 100, 110 100, 110 110, 100 110, 100 100), (103 103, 103 107, 107 107, 107 103, 103 103)))");
+ assertEquals(112, g.getLength(), 1E-15);
+ }
+
+
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/GeometryCollectionIteratorTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryCollectionIteratorTest.java
new file mode 100644
index 0000000..25b6362
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryCollectionIteratorTest.java
@@ -0,0 +1,54 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import junit.textui.TestRunner;
+import test.jts.GeometryTestCase;
+
+
+/**
+ * Test for {@link GeometryCollectionIterator}.
+ *
+ * @version 1.7
+ */
+public class GeometryCollectionIteratorTest extends GeometryTestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(GeometryCollectionIteratorTest.class);
+ }
+
+ public GeometryCollectionIteratorTest(String name) { super(name); }
+
+ public void testGeometryCollection() throws Exception {
+ GeometryCollection g = (GeometryCollection) read(
+ "GEOMETRYCOLLECTION (GEOMETRYCOLLECTION (POINT (10 10)))");
+ GeometryCollectionIterator i = new GeometryCollectionIterator(g);
+ assertTrue(i.hasNext());
+ assertTrue(i.next() instanceof GeometryCollection);
+ assertTrue(i.hasNext());
+ assertTrue(i.next() instanceof GeometryCollection);
+ assertTrue(i.hasNext());
+ assertTrue(i.next() instanceof Point);
+ assertTrue(! i.hasNext());
+ }
+
+ public void testAtomic() throws Exception {
+ Polygon g = (Polygon) read("POLYGON ((1 9, 9 9, 9 1, 1 1, 1 9))");
+ GeometryCollectionIterator i = new GeometryCollectionIterator(g);
+ assertTrue(i.hasNext());
+ assertTrue(i.next() instanceof Polygon);
+ assertTrue(! i.hasNext());
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/GeometryFactoryTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryFactoryTest.java
new file mode 100644
index 0000000..b71c6cb
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryFactoryTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests for {@link GeometryFactory}.
+ *
+ * @version 1.13
+ */
+public class GeometryFactoryTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel();
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(GeometryFactoryTest.class);
+ }
+
+ public GeometryFactoryTest(String name) { super(name); }
+
+ public void testCreateGeometry() throws ParseException
+ {
+ checkCreateGeometryExact("POINT EMPTY");
+ checkCreateGeometryExact("POINT ( 10 20 )");
+ checkCreateGeometryExact("LINESTRING EMPTY");
+ checkCreateGeometryExact("LINESTRING(0 0, 10 10)");
+ checkCreateGeometryExact("MULTILINESTRING ((50 100, 100 200), (100 100, 150 200))");
+ checkCreateGeometryExact("POLYGON ((100 200, 200 200, 200 100, 100 100, 100 200))");
+ checkCreateGeometryExact("MULTIPOLYGON (((100 200, 200 200, 200 100, 100 100, 100 200)), ((300 200, 400 200, 400 100, 300 100, 300 200)))");
+ checkCreateGeometryExact("GEOMETRYCOLLECTION (POLYGON ((100 200, 200 200, 200 100, 100 100, 100 200)), LINESTRING (250 100, 350 200), POINT (350 150))");
+ }
+
+ public void testDeepCopy() throws ParseException
+ {
+ Point g = (Point) read("POINT ( 10 10) ");
+ Geometry g2 = geometryFactory.createGeometry(g);
+ g.getCoordinateSequence().setOrdinate(0, 0, 99);
+ assertTrue(! g.equalsExact(g2));
+ }
+
+ public void testMultiPointCS()
+ {
+ GeometryFactory gf = new GeometryFactory(new PackedCoordinateSequenceFactory());
+ CoordinateSequence mpSeq = gf.getCoordinateSequenceFactory().create(1, 4);
+ mpSeq.setOrdinate(0, 0, 50);
+ mpSeq.setOrdinate(0, 1, -2);
+ mpSeq.setOrdinate(0, 2, 10);
+ mpSeq.setOrdinate(0, 3, 20);
+
+ MultiPoint mp = gf.createMultiPoint(mpSeq);
+ CoordinateSequence pSeq = ((Point)mp.getGeometryN(0)).getCoordinateSequence();
+ assertEquals(4, pSeq.getDimension());
+ for (int i = 0; i < 4; i++)
+ assertEquals(mpSeq.getOrdinate(0, i), pSeq.getOrdinate(0, i));
+ }
+
+ /**
+ * CoordinateArraySequences default their dimension to 3 unless explicitly told otherwise.
+ * This test ensures that GeometryFactory.createGeometry() recreates the input dimension properly.
+ *
+ * @throws ParseException
+ */
+ public void testCopyGeometryWithNonDefaultDimension() throws ParseException
+ {
+ GeometryFactory gf = new GeometryFactory(CoordinateArraySequenceFactory.instance());
+ CoordinateSequence mpSeq = gf.getCoordinateSequenceFactory().create(1, 2);
+ mpSeq.setOrdinate(0, 0, 50);
+ mpSeq.setOrdinate(0, 1, -2);
+
+ Point g = gf.createPoint(mpSeq);
+ CoordinateSequence pSeq = ((Point) g.getGeometryN(0)).getCoordinateSequence();
+ assertEquals(2, pSeq.getDimension());
+
+ Point g2 = (Point) geometryFactory.createGeometry(g);
+ assertEquals(2, g2.getCoordinateSequence().getDimension());
+
+ }
+
+ private void checkCreateGeometryExact(String wkt) throws ParseException
+ {
+ Geometry g = read(wkt);
+ Geometry g2 = geometryFactory.createGeometry(g);
+ assertTrue(g.equalsExact(g2));
+ }
+
+ private Geometry read(String wkt) throws ParseException
+ {
+ return reader.read(wkt);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/GeometryImplTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryImplTest.java
new file mode 100644
index 0000000..4b73126
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryImplTest.java
@@ -0,0 +1,448 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import java.util.Arrays;
+
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryImplTest extends TestCase {
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+ WKTReader readerFloat = new WKTReader();
+
+ public GeometryImplTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(GeometryImplTest.class);
+ }
+
+ public void testComparable() throws Exception {
+ Geometry point = reader.read("POINT EMPTY");
+ Geometry lineString = reader.read("LINESTRING EMPTY");
+ Geometry linearRing = reader.read("LINEARRING EMPTY");
+ Geometry polygon = reader.read("POLYGON EMPTY");
+ Geometry mpoint = reader.read("MULTIPOINT EMPTY");
+ Geometry mlineString = reader.read("MULTILINESTRING EMPTY");
+ Geometry mpolygon = reader.read("MULTIPOLYGON EMPTY");
+ Geometry gc = reader.read("GEOMETRYCOLLECTION EMPTY");
+
+ Geometry[] geometries = new Geometry[] {
+ gc,
+ mpolygon,
+ mlineString,
+ mpoint,
+ polygon,
+ linearRing,
+ lineString,
+ point
+ };
+
+ Geometry[] geometriesExpectedOrder = new Geometry[] {
+ point,
+ mpoint,
+ lineString,
+ linearRing,
+ mlineString,
+ polygon,
+ mpolygon,
+ gc
+ };
+
+ Arrays.sort(geometries);
+
+ assertTrue(Arrays.equals(geometries, geometriesExpectedOrder));
+ }
+
+ public void testPolygonRelate() throws Exception {
+ Geometry bigPolygon = reader.read(
+ "POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ Geometry smallPolygon = reader.read(
+ "POLYGON ((10 10, 10 30, 30 30, 30 10, 10 10))");
+ assertTrue(bigPolygon.contains(smallPolygon));
+ }
+
+ public void testEmptyGeometryCentroid() throws Exception {
+ assertTrue(reader.read("POINT EMPTY").getCentroid().isEmpty());
+ assertTrue(reader.read("POLYGON EMPTY").getCentroid().isEmpty());
+ assertTrue(reader.read("LINESTRING EMPTY").getCentroid().isEmpty());
+ assertTrue(reader.read("GEOMETRYCOLLECTION EMPTY").getCentroid().isEmpty());
+ assertTrue(reader.read("GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, GEOMETRYCOLLECTION EMPTY)").getCentroid().isEmpty());
+ assertTrue(reader.read("MULTIPOLYGON EMPTY").getCentroid().isEmpty());
+ assertTrue(reader.read("MULTILINESTRING EMPTY").getCentroid().isEmpty());
+ assertTrue(reader.read("MULTIPOINT EMPTY").getCentroid().isEmpty());
+ }
+
+ public void testNoOutgoingDirEdgeFound() throws Exception {
+ doTestFromCommcast2003AtYahooDotCa(reader);
+ }
+
+ public void testOutOfMemoryError() throws Exception {
+ doTestFromCommcast2003AtYahooDotCa(new WKTReader());
+ }
+
+
+
+ public void testDepthMismatchAssertionFailedException() throws Exception {
+ //register at robmeek.com reported an assertion failure
+ //("depth mismatch at (160.0, 300.0, Nan)") [Jon Aquino 10/28/2003]
+ reader
+ .read("MULTIPOLYGON (((100 300, 100 400, 200 400, 200 300, 100 300)),"
+ + "((160 300, 160 400, 260 400, 260 300, 160 300)),"
+ + "((160 300, 160 200, 260 200, 260 300, 160 300)))").buffer(0);
+ }
+
+ private void doTestFromCommcast2003AtYahooDotCa(WKTReader reader)
+ throws ParseException {
+ readerFloat.read(
+ "POLYGON ((708653.498611049 2402311.54647056, 708708.895756966 2402203.47250014, 708280.326454234 2402089.6337791, 708247.896591321 2402252.48269854, 708367.379593851 2402324.00761653, 708248.882609455 2402253.07294874, 708249.523621829 2402244.3124463, 708261.854734465 2402182.39086576, 708262.818392579 2402183.35452387, 708653.498611049 2402311.54647056))")
+ .intersection(reader.read(
+ "POLYGON ((708258.754920656 2402197.91172757, 708257.029447455 2402206.56901508, 708652.961095455 2402312.65463437, 708657.068786251 2402304.6356364, 708258.754920656 2402197.91172757))"));
+ }
+
+ public void testEquals() throws Exception {
+ Geometry g = reader.read("POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ Geometry same = reader.read("POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ Geometry differentStart = reader.read(
+ "POLYGON ((0 50, 50 50, 50 0, 0 0, 0 50))");
+ Geometry differentFourth = reader.read(
+ "POLYGON ((0 0, 0 50, 50 50, 50 -99, 0 0))");
+ Geometry differentSecond = reader.read(
+ "POLYGON ((0 0, 0 99, 50 50, 50 0, 0 0))");
+ doTestEquals(g, same, true, true, true, true);
+ doTestEquals(g, differentStart, true, false, false, true);
+ doTestEquals(g, differentFourth, false, false, false, false);
+ doTestEquals(g, differentSecond, false, false, false, false);
+ }
+
+ private void doTestEquals(Geometry a, Geometry b, boolean equalsGeometry,
+ boolean equalsObject, boolean equalsExact, boolean equalsHash) {
+ assertEquals(equalsGeometry, a.equals(b));
+ assertEquals(equalsObject, a.equals((Object) b));
+ assertEquals(equalsExact, a.equalsExact(b));
+ assertEquals(equalsHash, a.hashCode() == b.hashCode());
+ }
+
+ public void testInvalidateEnvelope() throws Exception {
+ Geometry g = reader.read("POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ assertEquals(new Envelope(0, 50, 0, 50), g.getEnvelopeInternal());
+ g.apply(new CoordinateFilter() {
+ public void filter(Coordinate coord) {
+ coord.x += 1;
+ coord.y += 1;
+ }
+ });
+ assertEquals(new Envelope(0, 50, 0, 50), g.getEnvelopeInternal());
+ g.geometryChanged();
+ assertEquals(new Envelope(1, 51, 1, 51), g.getEnvelopeInternal());
+ }
+
+ public void testEquals1() throws Exception {
+ Geometry polygon1 = reader.read(
+ "POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ Geometry polygon2 = reader.read(
+ "POLYGON ((50 50, 50 0, 0 0, 0 50, 50 50))");
+ assertTrue(polygon1.equals(polygon2));
+ }
+
+ public void testEqualsWithNull() throws Exception
+ {
+ Geometry polygon = reader.read("POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ assertTrue(! polygon.equals(null));
+ final Object g = null;
+ assertTrue(! polygon.equals(g));
+ }
+
+ // public void testEquals2() throws Exception {
+ // Geometry lineString = reader.read("LINESTRING(0 0, 0 50, 50 50, 50 0, 0 0)");
+ // Geometry geometryCollection = reader.read("GEOMETRYCOLLECTION ( LINESTRING(0 0 , 0 50), "
+ // + "LINESTRING(0 50 , 50 50), "
+ // + "LINESTRING(50 50, 50 0 ), "
+ // + "LINESTRING(50 0 , 0 0 ) )");
+ // assertTrue(lineString.equals(geometryCollection));
+ // }
+ public void testEqualsExactForLinearRings() throws Exception {
+ LinearRing x = geometryFactory.createLinearRing(new Coordinate[] {
+ new Coordinate(0, 0), new Coordinate(100, 0),
+ new Coordinate(100, 100), new Coordinate(0, 0)
+ });
+ LinearRing somethingExactlyEqual = geometryFactory.createLinearRing(new Coordinate[] {
+ new Coordinate(0, 0), new Coordinate(100, 0),
+ new Coordinate(100, 100), new Coordinate(0, 0)
+ });
+ LinearRing somethingNotEqualButSameClass = geometryFactory.createLinearRing(new Coordinate[] {
+ new Coordinate(0, 0), new Coordinate(100, 0),
+ new Coordinate(100, 555), new Coordinate(0, 0)
+ });
+ LinearRing sameClassButEmpty = geometryFactory.createLinearRing((CoordinateSequence)null);
+ LinearRing anotherSameClassButEmpty = geometryFactory.createLinearRing((CoordinateSequence)null);
+ CollectionFactory collectionFactory = new CollectionFactory() {
+ public Geometry createCollection(Geometry[] geometries) {
+ return geometryFactory.createMultiLineString(GeometryFactory.toLineStringArray(
+ Arrays.asList(geometries)));
+ }
+ };
+
+ doTestEqualsExact(x, somethingExactlyEqual,
+ somethingNotEqualButSameClass, sameClassButEmpty,
+ anotherSameClassButEmpty, collectionFactory);
+
+ // LineString somethingEqualButNotExactly = geometryFactory.createLineString(new Coordinate[] {
+ // new Coordinate(0, 0), new Coordinate(100, 0), new Coordinate(100, 100),
+ // new Coordinate(0, 0) });
+ //
+ // doTestEqualsExact(x, somethingExactlyEqual, somethingEqualButNotExactly,
+ // somethingNotEqualButSameClass);
+ }
+
+ public void testEqualsExactForLineStrings() throws Exception {
+ LineString x = geometryFactory.createLineString(new Coordinate[] {
+ new Coordinate(0, 0), new Coordinate(100, 0),
+ new Coordinate(100, 100)
+ });
+ LineString somethingExactlyEqual = geometryFactory.createLineString(new Coordinate[] {
+ new Coordinate(0, 0), new Coordinate(100, 0),
+ new Coordinate(100, 100)
+ });
+ LineString somethingNotEqualButSameClass = geometryFactory.createLineString(new Coordinate[] {
+ new Coordinate(0, 0), new Coordinate(100, 0),
+ new Coordinate(100, 555)
+ });
+ LineString sameClassButEmpty = geometryFactory.createLineString((Coordinate[])null);
+ LineString anotherSameClassButEmpty = geometryFactory.createLineString((Coordinate[])null);
+ CollectionFactory collectionFactory = new CollectionFactory() {
+ public Geometry createCollection(Geometry[] geometries) {
+ return geometryFactory.createMultiLineString(GeometryFactory.toLineStringArray(
+ Arrays.asList(geometries)));
+ }
+ };
+
+ doTestEqualsExact(x, somethingExactlyEqual,
+ somethingNotEqualButSameClass, sameClassButEmpty,
+ anotherSameClassButEmpty, collectionFactory);
+
+ CollectionFactory collectionFactory2 = new CollectionFactory() {
+ public Geometry createCollection(Geometry[] geometries) {
+ return geometryFactory.createMultiLineString(GeometryFactory.toLineStringArray(
+ Arrays.asList(geometries)));
+ }
+ };
+
+ doTestEqualsExact(x, somethingExactlyEqual,
+ somethingNotEqualButSameClass, sameClassButEmpty,
+ anotherSameClassButEmpty, collectionFactory2);
+ }
+
+ public void testEqualsExactForPoints() throws Exception {
+ Point x = geometryFactory.createPoint(new Coordinate(100, 100));
+ Point somethingExactlyEqual = geometryFactory.createPoint(new Coordinate(
+ 100, 100));
+ Point somethingNotEqualButSameClass = geometryFactory.createPoint(new Coordinate(
+ 999, 100));
+ Point sameClassButEmpty = geometryFactory.createPoint((Coordinate)null);
+ Point anotherSameClassButEmpty = geometryFactory.createPoint((Coordinate)null);
+ CollectionFactory collectionFactory = new CollectionFactory() {
+ public Geometry createCollection(Geometry[] geometries) {
+ return geometryFactory.createMultiPoint(GeometryFactory.toPointArray(
+ Arrays.asList(geometries)));
+ }
+ };
+
+ doTestEqualsExact(x, somethingExactlyEqual,
+ somethingNotEqualButSameClass, sameClassButEmpty,
+ anotherSameClassButEmpty, collectionFactory);
+ }
+
+ public void testEqualsExactForPolygons() throws Exception {
+ Polygon x = (Polygon) reader.read(
+ "POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ Polygon somethingExactlyEqual = (Polygon) reader.read(
+ "POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ Polygon somethingNotEqualButSameClass = (Polygon) reader.read(
+ "POLYGON ((50 50, 50 0, 0 0, 0 50, 50 50))");
+ Polygon sameClassButEmpty = (Polygon) reader.read("POLYGON EMPTY");
+ Polygon anotherSameClassButEmpty = (Polygon) reader.read(
+ "POLYGON EMPTY");
+ CollectionFactory collectionFactory = new CollectionFactory() {
+ public Geometry createCollection(Geometry[] geometries) {
+ return geometryFactory.createMultiPolygon(GeometryFactory.toPolygonArray(
+ Arrays.asList(geometries)));
+ }
+ };
+
+ doTestEqualsExact(x, somethingExactlyEqual,
+ somethingNotEqualButSameClass, sameClassButEmpty,
+ anotherSameClassButEmpty, collectionFactory);
+ }
+
+ public void testEqualsExactForGeometryCollections()
+ throws Exception {
+ Geometry polygon1 = (Polygon) reader.read(
+ "POLYGON ((0 0, 0 50, 50 50, 50 0, 0 0))");
+ Geometry polygon2 = (Polygon) reader.read(
+ "POLYGON ((50 50, 50 0, 0 0, 0 50, 50 50))");
+ GeometryCollection x = geometryFactory.createGeometryCollection(new Geometry[] {
+ polygon1, polygon2
+ });
+ GeometryCollection somethingExactlyEqual = geometryFactory.createGeometryCollection(new Geometry[] {
+ polygon1, polygon2
+ });
+ GeometryCollection somethingNotEqualButSameClass = geometryFactory.createGeometryCollection(new Geometry[] {
+ polygon2
+ });
+ GeometryCollection sameClassButEmpty = geometryFactory.createGeometryCollection(null);
+ GeometryCollection anotherSameClassButEmpty = geometryFactory.createGeometryCollection(null);
+ CollectionFactory collectionFactory = new CollectionFactory() {
+ public Geometry createCollection(Geometry[] geometries) {
+ return geometryFactory.createGeometryCollection(geometries);
+ }
+ };
+
+ doTestEqualsExact(x, somethingExactlyEqual,
+ somethingNotEqualButSameClass, sameClassButEmpty,
+ anotherSameClassButEmpty, collectionFactory);
+ }
+
+ public void testGeometryCollectionIntersects1() throws Exception {
+ Geometry gc0 = reader.read(
+ "GEOMETRYCOLLECTION ( POINT(0 0) )");
+ Geometry gc1 = reader.read(
+ "GEOMETRYCOLLECTION ( LINESTRING(0 0, 1 1) )");
+ Geometry gc2 = reader.read(
+ "GEOMETRYCOLLECTION ( LINESTRING(1 0, 0 1) )");
+ assertTrue(gc0.intersects(gc1));
+ assertTrue(gc1.intersects(gc2));
+ assertTrue(!gc0.intersects(gc2));
+ // symmetric
+ assertTrue(gc1.intersects(gc0));
+ assertTrue(gc2.intersects(gc1));
+ assertTrue(!gc2.intersects(gc0));
+ }
+
+ public void testGeometryCollectionIntersects2() throws Exception {
+ Geometry gc0 = reader.read(
+ "POINT(0 0)");
+ Geometry gc1 = reader.read(
+ "GEOMETRYCOLLECTION ( LINESTRING(0 0, 1 1) )");
+ Geometry gc2 = reader.read(
+ "LINESTRING(1 0, 0 1)");
+ assertTrue(gc0.intersects(gc1));
+ assertTrue(gc1.intersects(gc2));
+ // symmetric
+ assertTrue(gc1.intersects(gc0));
+ assertTrue(gc2.intersects(gc1));
+ }
+
+ public void testGeometryCollectionIntersects3() throws Exception {
+ Geometry gc0 = reader.read(
+ "GEOMETRYCOLLECTION ( POINT(0 0), LINESTRING(1 1, 2 2) )");
+ Geometry gc1 = reader.read(
+ "GEOMETRYCOLLECTION ( POINT(15 15) )");
+ Geometry gc2 = reader.read(
+ "GEOMETRYCOLLECTION ( LINESTRING(0 0, 2 0), POLYGON((10 10, 20 10, 20 20, 10 20, 10 10)))");
+ assertTrue(gc0.intersects(gc2));
+ assertTrue(!gc0.intersects(gc1));
+ assertTrue(gc1.intersects(gc2));
+ // symmetric
+ assertTrue(gc2.intersects(gc0));
+ assertTrue(!gc1.intersects(gc0));
+ assertTrue(gc2.intersects(gc1));
+ }
+
+ private void doTestEqualsExact(Geometry x,
+ Geometry somethingExactlyEqual,
+ Geometry somethingNotEqualButSameClass,
+ Geometry sameClassButEmpty,
+ Geometry anotherSameClassButEmpty,
+ CollectionFactory collectionFactory)
+ throws Exception {
+ Geometry emptyDifferentClass;
+
+ if (x instanceof Point) {
+ emptyDifferentClass = geometryFactory.createGeometryCollection(null);
+ } else {
+ emptyDifferentClass = geometryFactory.createPoint((Coordinate)null);
+ }
+
+ Geometry somethingEqualButNotExactly = geometryFactory.createGeometryCollection(new Geometry[] {
+ x
+ });
+
+ doTestEqualsExact(x, somethingExactlyEqual,
+ collectionFactory.createCollection(new Geometry[] { x }),
+ somethingNotEqualButSameClass);
+
+ doTestEqualsExact(sameClassButEmpty, anotherSameClassButEmpty,
+ emptyDifferentClass, x);
+
+ /**
+ * Test comparison of non-empty versus empty.
+ */
+ doTestEqualsExact(x, somethingExactlyEqual,
+ sameClassButEmpty, sameClassButEmpty);
+
+ doTestEqualsExact(collectionFactory.createCollection(
+ new Geometry[] { x, x }),
+ collectionFactory.createCollection(
+ new Geometry[] { x, somethingExactlyEqual }),
+ somethingEqualButNotExactly,
+ collectionFactory.createCollection(
+ new Geometry[] { x, somethingNotEqualButSameClass }));
+ }
+
+ private void doTestEqualsExact(Geometry x,
+ Geometry somethingExactlyEqual,
+ Geometry somethingEqualButNotExactly,
+ Geometry somethingNotEqualButSameClass) throws Exception {
+ Geometry differentClass;
+
+ if (x instanceof Point) {
+ differentClass = reader.read(
+ "POLYGON ((0 0, 0 50, 50 43949, 50 0, 0 0))");
+ } else {
+ differentClass = reader.read("POINT ( 2351 1563 )");
+ }
+
+ assertTrue(x.equalsExact(x));
+ assertTrue(x.equalsExact(somethingExactlyEqual));
+ assertTrue(somethingExactlyEqual.equalsExact(x));
+ assertTrue(!x.equalsExact(somethingEqualButNotExactly));
+ assertTrue(!somethingEqualButNotExactly.equalsExact(x));
+ assertTrue(!x.equalsExact(somethingEqualButNotExactly));
+ assertTrue(!somethingEqualButNotExactly.equalsExact(x));
+ assertTrue(!x.equalsExact(differentClass));
+ assertTrue(!differentClass.equalsExact(x));
+ }
+
+ public static void main(String[] args) throws Exception {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ private interface CollectionFactory {
+ Geometry createCollection(Geometry[] geometries);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/IntersectionMatrixTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/IntersectionMatrixTest.java
new file mode 100644
index 0000000..abf4ed8
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/IntersectionMatrixTest.java
@@ -0,0 +1,118 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+/**
+ * @version 1.7
+ */
+public class IntersectionMatrixTest extends TestCase {
+
+ public IntersectionMatrixTest(String name) { super(name); }
+
+ private static int A = Dimension.A;
+ private static int L = Dimension.L;
+ private static int P = Dimension.P;
+
+ public static Test suite() { return new TestSuite(IntersectionMatrixTest.class); }
+
+ public void testToString() throws Exception {
+ IntersectionMatrix i = new IntersectionMatrix();
+ i.set("012*TF012");
+ assertEquals("012*TF012", i.toString());
+
+ IntersectionMatrix c = new IntersectionMatrix(i);
+ assertEquals("012*TF012", c.toString());
+ }
+
+ public void testTranspose() {
+ IntersectionMatrix x = new IntersectionMatrix("012*TF012");
+
+ IntersectionMatrix i = new IntersectionMatrix(x);
+ IntersectionMatrix j = i.transpose();
+ assertSame(i, j);
+
+ assertEquals("0*01T12F2", i.toString());
+
+ assertEquals("012*TF012", x.toString());
+ }
+
+ public void testIsDisjoint() {
+ assertTrue((new IntersectionMatrix("FF*FF****")).isDisjoint());
+ assertTrue((new IntersectionMatrix("FF1FF2T*0")).isDisjoint());
+ assertTrue(! (new IntersectionMatrix("*F*FF****")).isDisjoint());
+ }
+
+ public void testIsTouches() {
+ assertTrue((new IntersectionMatrix("FT*******")).isTouches(P,A));
+ assertTrue((new IntersectionMatrix("FT*******")).isTouches(A,P));
+ assertTrue(! (new IntersectionMatrix("FT*******")).isTouches(P,P));
+ }
+
+ public void testIsIntersects() {
+ assertTrue(! (new IntersectionMatrix("FF*FF****")).isIntersects());
+ assertTrue(! (new IntersectionMatrix("FF1FF2T*0")).isIntersects());
+ assertTrue((new IntersectionMatrix("*F*FF****")).isIntersects());
+ }
+
+ public void testIsCrosses() {
+ assertTrue((new IntersectionMatrix("TFTFFFFFF")).isCrosses(P,L));
+ assertTrue(! (new IntersectionMatrix("TFTFFFFFF")).isCrosses(L,P));
+ assertTrue(! (new IntersectionMatrix("TFFFFFTFF")).isCrosses(P,L));
+ assertTrue((new IntersectionMatrix("TFFFFFTFF")).isCrosses(L,P));
+ assertTrue((new IntersectionMatrix("0FFFFFFFF")).isCrosses(L,L));
+ assertTrue(! (new IntersectionMatrix("1FFFFFFFF")).isCrosses(L,L));
+ }
+
+ public void testIsWithin() {
+ assertTrue((new IntersectionMatrix("T0F00F000")).isWithin());
+ assertTrue(! (new IntersectionMatrix("T00000FF0")).isWithin());
+ }
+
+ public void testIsContains() {
+ assertTrue(! (new IntersectionMatrix("T0F00F000")).isContains());
+ assertTrue((new IntersectionMatrix("T00000FF0")).isContains());
+ }
+
+ public void testIsOverlaps() {
+ assertTrue((new IntersectionMatrix("2*2***2**")).isOverlaps(P,P));
+ assertTrue((new IntersectionMatrix("2*2***2**")).isOverlaps(A,A));
+ assertTrue(! (new IntersectionMatrix("2*2***2**")).isOverlaps(P,A));
+ assertTrue(! (new IntersectionMatrix("2*2***2**")).isOverlaps(L,L));
+ assertTrue((new IntersectionMatrix("1*2***2**")).isOverlaps(L,L));
+
+ assertTrue(! (new IntersectionMatrix("0FFFFFFF2")).isOverlaps(P,P));
+ assertTrue(! (new IntersectionMatrix("1FFF0FFF2")).isOverlaps(L,L));
+ assertTrue(! (new IntersectionMatrix("2FFF1FFF2")).isOverlaps(A,A));
+ }
+
+ public void testIsEquals() {
+ assertTrue((new IntersectionMatrix("0FFFFFFF2")).isEquals(P,P));
+ assertTrue((new IntersectionMatrix("1FFF0FFF2")).isEquals(L,L));
+ assertTrue((new IntersectionMatrix("2FFF1FFF2")).isEquals(A,A));
+
+ assertTrue(! (new IntersectionMatrix("0F0FFFFF2")).isEquals(P,P));
+ assertTrue( (new IntersectionMatrix("1FFF1FFF2")).isEquals(L,L));
+ assertTrue(! (new IntersectionMatrix("2FFF1*FF2")).isEquals(A,A));
+
+ assertTrue(! (new IntersectionMatrix("0FFFFFFF2")).isEquals(P,L));
+ assertTrue(! (new IntersectionMatrix("1FFF0FFF2")).isEquals(L,A));
+ assertTrue(! (new IntersectionMatrix("2FFF1FFF2")).isEquals(A,P));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/IsRectangleTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/IsRectangleTest.java
new file mode 100644
index 0000000..56d8c27
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/IsRectangleTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test named predicate short-circuits
+ */
+/**
+ * @version 1.7
+ */
+public class IsRectangleTest extends TestCase {
+
+ WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(IsRectangleTest.class);
+ }
+
+ public IsRectangleTest(String name) { super(name); }
+
+
+ public void testValidRectangle() throws Exception
+ {
+ assertTrue(isRectangle("POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))"));
+ }
+
+ public void testValidRectangle2() throws Exception
+ {
+ assertTrue(isRectangle("POLYGON ((0 0, 0 200, 100 200, 100 0, 0 0))"));
+ }
+
+ public void testRectangleWithHole() throws Exception
+ {
+ assertTrue(! isRectangle("POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0), (10 10, 10 90, 90 90, 90 10, 10 10) ))"));
+ }
+
+ public void testNotRectilinear() throws Exception
+ {
+ assertTrue(! isRectangle("POLYGON ((0 0, 0 100, 99 100, 100 0, 0 0))"));
+ }
+
+ public void testTooManyPoints() throws Exception
+ {
+ assertTrue(! isRectangle("POLYGON ((0 0, 0 100, 100 50, 100 100, 100 0, 0 0))"));
+ }
+
+ public void testTooFewPoints() throws Exception
+ {
+ assertTrue(! isRectangle("POLYGON ((0 0, 0 100, 100 0, 0 0))"));
+ }
+
+ public void testRectangularLinestring() throws Exception
+ {
+ assertTrue(! isRectangle("LINESTRING (0 0, 0 100, 100 100, 100 0, 0 0)"));
+ }
+
+ public void testPointsInWrongOrder() throws Exception
+ {
+ assertTrue(! isRectangle("POLYGON ((0 0, 0 100, 100 0, 100 100, 0 0))"));
+ }
+
+ public boolean isRectangle(String wkt)
+ throws Exception
+ {
+ Geometry a = rdr.read(wkt);
+ return a.isRectangle();
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/LineSegmentTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/LineSegmentTest.java
new file mode 100644
index 0000000..2635986
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/LineSegmentTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test named predicate short-circuits
+ */
+/**
+ * @version 1.7
+ */
+public class LineSegmentTest extends TestCase {
+
+ WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(LineSegmentTest.class);
+ }
+
+ public LineSegmentTest(String name) { super(name); }
+
+ private static double ROOT2 = Math.sqrt(2);
+
+ public void testProjectionFactor()
+ {
+ // zero-length line
+ LineSegment seg = new LineSegment(10, 0, 10, 0);
+ assertTrue(Double.isNaN(seg.projectionFactor(new Coordinate(11, 0))));
+
+ LineSegment seg2 = new LineSegment(10, 0, 20, 0);
+ assertTrue(seg2.projectionFactor(new Coordinate(11, 0)) == 0.1);
+
+ }
+
+ public void testOffset() throws Exception
+ {
+ checkOffset(0, 0, 10, 10, 0.0, ROOT2, -1, 1);
+ checkOffset(0, 0, 10, 10, 0.0, -ROOT2, 1, -1);
+
+ checkOffset(0, 0, 10, 10, 1.0, ROOT2, 9, 11);
+ checkOffset(0, 0, 10, 10, 0.5, ROOT2, 4, 6);
+
+ checkOffset(0, 0, 10, 10, 0.5, -ROOT2, 6, 4);
+ checkOffset(0, 0, 10, 10, 0.5, -ROOT2, 6, 4);
+
+ checkOffset(0, 0, 10, 10, 2.0, ROOT2, 19, 21);
+ checkOffset(0, 0, 10, 10, 2.0, -ROOT2, 21, 19);
+
+ checkOffset(0, 0, 10, 10, 2.0, 5 * ROOT2, 15, 25);
+ checkOffset(0, 0, 10, 10, -2.0, 5 * ROOT2, -25, -15);
+
+ }
+
+ void checkOffset(double x0, double y0, double x1, double y1, double segFrac, double offset,
+ double expectedX, double expectedY)
+ {
+ LineSegment seg = new LineSegment(x0, y0, x1, y1);
+ Coordinate p = seg.pointAlongOffset(segFrac, offset);
+
+ assertTrue(equalsTolerance(new Coordinate(expectedX, expectedY), p, 0.000001));
+ }
+
+ public static boolean equalsTolerance(Coordinate p0, Coordinate p1, double tolerance)
+ {
+ if (Math.abs(p0.x - p1.x) > tolerance) return false;
+ if (Math.abs(p0.y - p1.y) > tolerance) return false;
+ return true;
+ }
+
+ public void testOrientationIndexCoordinate()
+ {
+ LineSegment seg = new LineSegment(0, 0, 10, 10);
+ checkOrientationIndex(seg, 10, 11, 1);
+ checkOrientationIndex(seg, 10, 9, -1);
+
+ checkOrientationIndex(seg, 11, 11, 0);
+
+ checkOrientationIndex(seg, 11, 11.0000001, 1);
+ checkOrientationIndex(seg, 11, 10.9999999, -1);
+
+ checkOrientationIndex(seg, -2, -1.9999999, 1);
+ checkOrientationIndex(seg, -2, -2.0000001, -1);
+ }
+
+ public void testOrientationIndexSegment()
+ {
+ LineSegment seg = new LineSegment(100, 100, 110, 110);
+
+ checkOrientationIndex(seg, 100, 101, 105, 106, 1);
+ checkOrientationIndex(seg, 100, 99, 105, 96, -1);
+
+ checkOrientationIndex(seg, 200, 200, 210, 210, 0);
+
+ }
+
+ void checkOrientationIndex(double x0, double y0, double x1, double y1, double px, double py,
+ int expectedOrient)
+ {
+ LineSegment seg = new LineSegment(x0, y0, x1, y1);
+ checkOrientationIndex(seg, px, py, expectedOrient);
+ }
+
+ void checkOrientationIndex(LineSegment seg,
+ double px, double py,
+ int expectedOrient)
+ {
+ Coordinate p = new Coordinate(px, py);
+ int orient = seg.orientationIndex(p);
+ assertTrue(orient == expectedOrient);
+ }
+
+ void checkOrientationIndex(LineSegment seg,
+ double s0x, double s0y,
+ double s1x, double s1y,
+ int expectedOrient)
+ {
+ LineSegment seg2 = new LineSegment(s0x, s0y, s1x, s1y);
+ int orient = seg.orientationIndex(seg2);
+ assertTrue(orient == expectedOrient);
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/LineStringImplTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/LineStringImplTest.java
new file mode 100644
index 0000000..5a22aef
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/LineStringImplTest.java
@@ -0,0 +1,185 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test for com.vividsolutions.jts.geom.impl.LineStringImpl.
+ *
+ * @version 1.7
+ */
+public class LineStringImplTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1000);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(suite());
+ }
+
+ public LineStringImplTest(String name) { super(name); }
+
+ public static Test suite() { return new TestSuite(LineStringImplTest.class); }
+
+ public void testIsSimple() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING (0 0, 10 10, 10 0, 0 10, 0 0)");
+ assertTrue(! l1.isSimple());
+ LineString l2 = (LineString) reader.read("LINESTRING (0 0, 10 10, 10 0, 0 10)");
+ assertTrue(! l2.isSimple());
+ }
+
+ public void testIsCoordinate() throws Exception {
+ LineString l = (LineString) reader.read("LINESTRING (0 0, 10 10, 10 0)");
+ assertTrue(l.isCoordinate(new Coordinate(0, 0)));
+ assertTrue(! l.isCoordinate(new Coordinate(5, 0)));
+ }
+
+ public void testUnclosedLinearRing() {
+ try {
+ geometryFactory.createLinearRing(new Coordinate[]{
+ new Coordinate(0, 0), new Coordinate(1, 0), new Coordinate(1, 1), new Coordinate(2, 1)});
+ assertTrue(false);
+ }
+ catch (Exception e) {
+ assertTrue(e instanceof IllegalArgumentException);
+ }
+ }
+
+ public void testEquals1() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444)");
+ LineString l2 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444)");
+ assertTrue(l1.equals(l2));
+ }
+
+ public void testEquals2() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444)");
+ LineString l2 = (LineString) reader.read("LINESTRING(3.333 4.444, 1.111 2.222)");
+ assertTrue(l1.equals(l2));
+ }
+
+ public void testEquals3() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444)");
+ LineString l2 = (LineString) reader.read("LINESTRING(3.333 4.443, 1.111 2.222)");
+ assertTrue(! l1.equals(l2));
+ }
+
+ public void testEquals4() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444)");
+ LineString l2 = (LineString) reader.read("LINESTRING(3.333 4.4445, 1.111 2.222)");
+ assertTrue(! l1.equals(l2));
+ }
+
+ public void testEquals5() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444)");
+ LineString l2 = (LineString) reader.read("LINESTRING(3.333 4.4446, 1.111 2.222)");
+ assertTrue(! l1.equals(l2));
+ }
+
+ public void testEquals6() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444, 5.555 6.666)");
+ LineString l2 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444, 5.555 6.666)");
+ assertTrue(l1.equals(l2));
+ }
+
+ public void testEquals7() throws Exception {
+ LineString l1 = (LineString) reader.read("LINESTRING(1.111 2.222, 5.555 6.666, 3.333 4.444)");
+ LineString l2 = (LineString) reader.read("LINESTRING(1.111 2.222, 3.333 4.444, 5.555 6.666)");
+ assertTrue(!l1.equals(l2));
+ }
+
+ public void testGetCoordinates() throws Exception {
+ LineString l = (LineString) reader.read("LINESTRING(1.111 2.222, 5.555 6.666, 3.333 4.444)");
+ Coordinate[] coordinates = l.getCoordinates();
+ assertEquals(new Coordinate(5.555, 6.666), coordinates[1]);
+ }
+
+ public void testIsClosed() throws Exception {
+ LineString l = (LineString) reader.read("LINESTRING EMPTY");
+ assertTrue(l.isEmpty());
+ assertTrue(! l.isClosed());
+
+ LinearRing r = geometryFactory.createLinearRing((CoordinateSequence)null);
+ assertTrue(r.isEmpty());
+ assertTrue(r.isClosed());
+
+ MultiLineString m = geometryFactory.createMultiLineString(
+ new LineString[] {l, r});
+ assertTrue(! m.isClosed());
+
+ MultiLineString m2 = geometryFactory.createMultiLineString(
+ new LineString[] {r});
+ assertTrue(! m2.isClosed());
+ }
+
+ public void testGetGeometryType() throws Exception {
+ LineString l = (LineString) reader.read("LINESTRING EMPTY");
+ assertEquals("LineString", l.getGeometryType());
+ }
+
+ public void testEquals8() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1000), 0));
+ MultiLineString l1 = (MultiLineString) reader.read("MULTILINESTRING((1732328800 519578384, 1732026179 519976285, 1731627364 519674014, 1731929984 519276112, 1732328800 519578384))");
+ MultiLineString l2 = (MultiLineString) reader.read("MULTILINESTRING((1731627364 519674014, 1731929984 519276112, 1732328800 519578384, 1732026179 519976285, 1731627364 519674014))");
+ assertTrue(l1.equals(l2));
+ }
+
+ public void testEquals9() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ MultiLineString l1 = (MultiLineString) reader.read("MULTILINESTRING((1732328800 519578384, 1732026179 519976285, 1731627364 519674014, 1731929984 519276112, 1732328800 519578384))");
+ MultiLineString l2 = (MultiLineString) reader.read("MULTILINESTRING((1731627364 519674014, 1731929984 519276112, 1732328800 519578384, 1732026179 519976285, 1731627364 519674014))");
+ assertTrue(l1.equals(l2));
+ }
+
+ public void testEquals10() throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory(new PrecisionModel(1), 0));
+ Geometry l1 = reader.read("POLYGON((1732328800 519578384, 1732026179 519976285, 1731627364 519674014, 1731929984 519276112, 1732328800 519578384))");
+ Geometry l2 = reader.read("POLYGON((1731627364 519674014, 1731929984 519276112, 1732328800 519578384, 1732026179 519976285, 1731627364 519674014))");
+ l1.normalize();
+ l2.normalize();
+ assertTrue(l1.equalsExact(l2));
+ }
+
+ public void testFiveZeros() {
+ LineString ls = new GeometryFactory().createLineString(new Coordinate[]{
+ new Coordinate(0, 0),
+ new Coordinate(0, 0),
+ new Coordinate(0, 0),
+ new Coordinate(0, 0),
+ new Coordinate(0, 0)});
+ assertTrue(ls.isClosed());
+ }
+
+ public void testLinearRingConstructor() throws Exception {
+ try {
+ LinearRing ring =
+ new GeometryFactory().createLinearRing(
+ new Coordinate[] {
+ new Coordinate(0, 0),
+ new Coordinate(10, 10),
+ new Coordinate(0, 0)});
+ assertTrue(false);
+ } catch (IllegalArgumentException e) {
+ assertTrue(true);
+ }
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/MultiPointImplTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/MultiPointImplTest.java
new file mode 100644
index 0000000..26a5b1b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/MultiPointImplTest.java
@@ -0,0 +1,87 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test for com.vividsolutions.jts.geom.impl.MultiPointImpl.
+ *
+ * @version 1.7
+ */
+public class MultiPointImplTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1000);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(suite());
+ }
+
+ public MultiPointImplTest(String name) { super(name); }
+
+ public static Test suite() { return new TestSuite(MultiPointImplTest.class); }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testIsSimple1() throws Exception {
+// MultiPoint m = (MultiPoint) reader.read("MULTIPOINT(1.111 2.222, 3.333 4.444, 5.555 6.666)");
+// assertTrue(m.isSimple());
+// }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testIsSimple2() throws Exception {
+// MultiPoint m = (MultiPoint) reader.read("MULTIPOINT(1.111 2.222, 3.333 4.444, 3.333 4.444)");
+// assertTrue(! m.isSimple());
+// }
+
+ public void testGetGeometryN() throws Exception {
+ MultiPoint m = (MultiPoint) reader.read("MULTIPOINT(1.111 2.222, 3.333 4.444, 3.333 4.444)");
+ Geometry g = m.getGeometryN(1);
+ assertTrue(g instanceof Point);
+ Point p = (Point) g;
+ Coordinate externalCoordinate = new Coordinate();
+ Coordinate internal = p.getCoordinate();
+ externalCoordinate.x = internal.x;
+ externalCoordinate.y = internal.y;
+ assertEquals(3.333, externalCoordinate.x, 1E-10);
+ assertEquals(4.444, externalCoordinate.y, 1E-10);
+ }
+
+ public void testGetEnvelope() throws Exception {
+ MultiPoint m = (MultiPoint) reader.read("MULTIPOINT(1.111 2.222, 3.333 4.444, 3.333 4.444)");
+ Envelope e = m.getEnvelopeInternal();
+ assertEquals(1.111, e.getMinX(), 1E-10);
+ assertEquals(3.333, e.getMaxX(), 1E-10);
+ assertEquals(2.222, e.getMinY(), 1E-10);
+ assertEquals(4.444, e.getMaxY(), 1E-10);
+ }
+
+ public void testEquals() throws Exception {
+ MultiPoint m1 = (MultiPoint) reader.read("MULTIPOINT(5 6, 7 8)");
+ MultiPoint m2 = (MultiPoint) reader.read("MULTIPOINT(5 6, 7 8)");
+ assertTrue(m1.equals(m2));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/NormalizeTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/NormalizeTest.java
new file mode 100644
index 0000000..891e39e
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/NormalizeTest.java
@@ -0,0 +1,198 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class NormalizeTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public NormalizeTest(String Name_) {
+ super(Name_);
+ }
+
+ public static void main(String[] args) {
+ String[] testCaseName = {NormalizeTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ public void testNormalizePoint() throws Exception {
+ Point point = (Point) reader.read("POINT (30 30)");
+ point.normalize();
+ assertEquals(new Coordinate(30, 30), point.getCoordinate());
+ }
+
+ public void testNormalizeEmptyPoint() throws Exception {
+ Point point = (Point) reader.read("POINT EMPTY");
+ point.normalize();
+ assertEquals(null, point.getCoordinate());
+ }
+
+ public void testComparePoint() throws Exception {
+ Point p1 = (Point) reader.read("POINT (30 30)");
+ Point p2 = (Point) reader.read("POINT (30 40)");
+ assertTrue(p1.compareTo(p2) < 0);
+ }
+
+ public void testCompareEmptyPoint() throws Exception {
+ Point p1 = (Point) reader.read("POINT (30 30)");
+ Point p2 = (Point) reader.read("POINT EMPTY");
+ assertTrue(p1.compareTo(p2) > 0);
+ }
+
+ public void testNormalizeMultiPoint() throws Exception {
+ MultiPoint m = (MultiPoint) reader.read(
+ "MULTIPOINT(30 20, 10 10, 20 20, 30 30, 20 10)");
+ m.normalize();
+ MultiPoint expectedValue = (MultiPoint) reader.read(
+ "MULTIPOINT(10 10, 20 10, 20 20, 30 20, 30 30)");
+ assertEqualsExact(expectedValue, m);
+ MultiPoint unexpectedValue = (MultiPoint) reader.read(
+ "MULTIPOINT(20 10, 20 20, 30 20, 30 30, 10 10)");
+ assertTrue(! m.equalsExact(unexpectedValue));
+ }
+
+ public void testNormalizeLineString1() throws Exception {
+ LineString l = (LineString) reader.read(
+ "LINESTRING (20 20, 160 40, 160 100, 100 120, 60 60)");
+ l.normalize();
+ LineString expectedValue = (LineString) reader.read(
+ "LINESTRING (20 20, 160 40, 160 100, 100 120, 60 60)");
+ assertEqualsExact(expectedValue, l);
+ }
+
+ public void testNormalizeLineString2() throws Exception {
+ LineString l = (LineString) reader.read(
+ "LINESTRING (20 20, 160 40, 160 100, 100 120, 60 60)");
+ l.normalize();
+ LineString expectedValue = (LineString) reader.read(
+ "LINESTRING (20 20, 160 40, 160 100, 100 120, 60 60)");
+ assertEqualsExact(expectedValue, l);
+ }
+
+ public void testNormalizeLineString3() throws Exception {
+ LineString l = (LineString) reader.read(
+ "LINESTRING (200 240, 140 160, 80 160, 160 80, 80 80)");
+ l.normalize();
+ LineString expectedValue = (LineString) reader.read(
+ "LINESTRING (80 80, 160 80, 80 160, 140 160, 200 240)");
+ assertEqualsExact(expectedValue, l);
+ }
+
+ public void testNormalizeLineString4() throws Exception {
+ LineString l = (LineString) reader.read(
+ "LINESTRING (200 240, 140 160, 80 160, 160 80, 80 80)");
+ l.normalize();
+ LineString expectedValue = (LineString) reader.read(
+ "LINESTRING (80 80, 160 80, 80 160, 140 160, 200 240)");
+ assertEqualsExact(expectedValue, l);
+ }
+
+ public void testNormalizeLineString5() throws Exception {
+ LineString l = (LineString) reader.read(
+ "LINESTRING (200 340, 140 240, 140 160, 60 240, 140 240, 200 340)");
+ l.normalize();
+ LineString expectedValue = (LineString) reader.read(
+ "LINESTRING (200 340, 140 240, 60 240, 140 160, 140 240, 200 340)");
+ assertEqualsExact(expectedValue, l);
+ }
+
+ public void testNormalizeStringNoSideEffect() throws Exception {
+ LineString l = (LineString) reader.read(
+ "LINESTRING (200 240, 140 160, 80 160, 160 80, 80 80)");
+ LineString ref = (LineString) reader.read(
+ "LINESTRING (200 240, 140 160)");
+ LineString seg = l.getFactory().createLineString(
+ new Coordinate[]{l.getCoordinates()[0], l.getCoordinates()[1]});
+ assertEqualsExact(ref, seg);
+ l.normalize();
+ assertEqualsExact(ref, seg);
+ }
+
+ public void testNormalizeEmptyLineString() throws Exception {
+ LineString l = (LineString) reader.read("LINESTRING EMPTY");
+ l.normalize();
+ LineString expectedValue = (LineString) reader.read("LINESTRING EMPTY");
+ assertEqualsExact(expectedValue, l);
+ }
+
+ public void testNormalizeEmptyPolygon() throws Exception {
+ Polygon actualValue = (Polygon) reader.read("POLYGON EMPTY");
+ actualValue.normalize();
+ Polygon expectedValue = (Polygon) reader.read("POLYGON EMPTY");
+ assertEqualsExact(expectedValue, actualValue);
+ }
+
+ public void testNormalizePolygon1() throws Exception {
+ Polygon actualValue = (Polygon) reader.read(
+ "POLYGON ((120 320, 240 200, 120 80, 20 200, 120 320), (60 200, 80 220, 80 200, 60 200), (160 200, 180 200, 180 220, 160 200), (120 140, 140 140, 140 160, 120 140), (140 240, 140 220, 120 260, 140 240))");
+ actualValue.normalize();
+ Polygon expectedValue = (Polygon) reader.read(
+ "POLYGON ((20 200, 120 320, 240 200, 120 80, 20 200), (60 200, 80 200, 80 220, 60 200), (120 140, 140 140, 140 160, 120 140), (120 260, 140 220, 140 240, 120 260), (160 200, 180 200, 180 220, 160 200))");
+ assertEqualsExact(expectedValue, actualValue);
+ }
+
+ public void testNormalizeMultiLineString() throws Exception {
+ MultiLineString actualValue = (MultiLineString) reader.read(
+ "MULTILINESTRING ((200 260, 180 320, 260 340), (120 180, 140 100, 40 80), (200 180, 220 160, 200 180), (100 280, 120 260, 140 260, 140 240, 120 240, 120 260, 100 280))");
+ actualValue.normalize();
+ MultiLineString expectedValue = (MultiLineString) reader.read(
+ "MULTILINESTRING ((40 80, 140 100, 120 180), (100 280, 120 260, 120 240, 140 240, 140 260, 120 260, 100 280), (200 180, 220 160, 200 180), (200 260, 180 320, 260 340))");
+ assertEqualsExact(expectedValue, actualValue);
+ }
+
+ public void testNormalizeMultiPolygon() throws Exception {
+ MultiPolygon actualValue = (MultiPolygon) reader.read(
+ "MULTIPOLYGON (((40 360, 40 280, 140 280, 140 360, 40 360), (60 340, 60 300, 120 300, 120 340, 60 340)), ((140 200, 260 200, 260 100, 140 100, 140 200), (160 180, 240 180, 240 120, 160 120, 160 180)))");
+ actualValue.normalize();
+ MultiPolygon expectedValue = (MultiPolygon) reader.read(
+ "MULTIPOLYGON (((40 280, 40 360, 140 360, 140 280, 40 280), (60 300, 120 300, 120 340, 60 340, 60 300)), ((140 100, 140 200, 260 200, 260 100, 140 100), (160 120, 240 120, 240 180, 160 180, 160 120)))");
+ assertEqualsExact(expectedValue, actualValue);
+ }
+
+ public void testNormalizeGeometryCollection() throws Exception {
+ GeometryCollection actualValue = (GeometryCollection) reader.read(
+ "GEOMETRYCOLLECTION (LINESTRING (200 300, 200 280, 220 280, 220 320, 180 320), POINT (140 220), POLYGON ((100 80, 100 160, 20 160, 20 80, 100 80), (40 140, 40 100, 80 100, 80 140, 40 140)), POINT (100 240))");
+ actualValue.normalize();
+ GeometryCollection expectedValue = (GeometryCollection) reader.read(
+ "GEOMETRYCOLLECTION (POINT (100 240), POINT (140 220), LINESTRING (180 320, 220 320, 220 280, 200 280, 200 300), POLYGON ((20 80, 20 160, 100 160, 100 80, 20 80), (40 100, 80 100, 80 140, 40 140, 40 100)))");
+ assertEqualsExact(expectedValue, actualValue);
+ }
+
+ public void testNormalizePackedCoordinateSequence() throws Exception {
+ GeometryFactory pcsFactory = new GeometryFactory(PackedCoordinateSequenceFactory.DOUBLE_FACTORY);
+ WKTReader pcsReader = new WKTReader(pcsFactory);
+ Geometry geom = pcsReader.read("LINESTRING (100 100, 0 0)");
+ geom.normalize();
+ // force PackedCoordinateSequence to be copied with empty coordinate cache
+ Geometry clone = (Geometry) geom.copy();
+ assertEqualsExact(geom, clone);
+ }
+
+ private void assertEqualsExact(Geometry expectedValue, Geometry actualValue) {
+ assertTrue("Expected " + expectedValue + " but encountered " + actualValue,
+ actualValue.equalsExact(expectedValue));
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/PointImplTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/PointImplTest.java
new file mode 100644
index 0000000..6343780
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/PointImplTest.java
@@ -0,0 +1,104 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test for com.vividsolutions.jts.geom.impl.PointImpl.
+ *
+ * @version 1.7
+ */
+public class PointImplTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1000);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(suite());
+ }
+
+ public PointImplTest(String name) { super(name); }
+
+ public static Test suite() { return new TestSuite(PointImplTest.class); }
+
+ public void testEquals1() throws Exception {
+ Point p1 = (Point) reader.read("POINT(1.234 5.678)");
+ Point p2 = (Point) reader.read("POINT(1.234 5.678)");
+ assertTrue(p1.equals(p2));
+ }
+
+ public void testEquals2() throws Exception {
+ Point p1 = (Point) reader.read("POINT(1.23 5.67)");
+ Point p2 = (Point) reader.read("POINT(1.23 5.67)");
+ assertTrue(p1.equals(p2));
+ }
+
+ public void testEquals3() throws Exception {
+ Point p1 = (Point) reader.read("POINT(1.235 5.678)");
+ Point p2 = (Point) reader.read("POINT(1.234 5.678)");
+ assertTrue(! p1.equals(p2));
+ }
+
+ public void testEquals4() throws Exception {
+ Point p1 = (Point) reader.read("POINT(1.2334 5.678)");
+ Point p2 = (Point) reader.read("POINT(1.2333 5.678)");
+ assertTrue(p1.equals(p2));
+ }
+
+ public void testEquals5() throws Exception {
+ Point p1 = (Point) reader.read("POINT(1.2334 5.678)");
+ Point p2 = (Point) reader.read("POINT(1.2335 5.678)");
+ assertTrue(! p1.equals(p2));
+ }
+
+ public void testEquals6() throws Exception {
+ Point p1 = (Point) reader.read("POINT(1.2324 5.678)");
+ Point p2 = (Point) reader.read("POINT(1.2325 5.678)");
+ assertTrue(! p1.equals(p2));
+ }
+
+ public void testNegRounding1() throws Exception {
+ Point pLo = (Point) reader.read("POINT(-1.233 5.678)");
+ Point pHi = (Point) reader.read("POINT(-1.232 5.678)");
+
+ Point p1 = (Point) reader.read("POINT(-1.2326 5.678)");
+ Point p2 = (Point) reader.read("POINT(-1.2325 5.678)");
+ Point p3 = (Point) reader.read("POINT(-1.2324 5.678)");
+
+ assertTrue(! p1.equals(p2));
+ assertTrue(p3.equals(p2));
+
+ assertTrue(p1.equals(pLo));
+ assertTrue(p2.equals(pHi));
+ assertTrue(p3.equals(pHi));
+ }
+
+ public void testIsSimple() throws Exception {
+ Point p1 = (Point) reader.read("POINT(1.2324 5.678)");
+ assertTrue(p1.isSimple());
+ Point p2 = (Point) reader.read("POINT EMPTY");
+ assertTrue(p2.isSimple());
+ }
+
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/PrecisionModelTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/PrecisionModelTest.java
new file mode 100644
index 0000000..dd05dbb
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/PrecisionModelTest.java
@@ -0,0 +1,68 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+/**
+ * @version 1.7
+ */
+public class PrecisionModelTest extends TestCase
+{
+
+ public PrecisionModelTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(PrecisionModelTest.class);
+ }
+
+ public void testParameterlessConstructor() {
+ PrecisionModel p = new PrecisionModel();
+ //Implicit precision model has scale 0
+ assertEquals(0, p.getScale(), 1E-10);
+ }
+
+ public void testGetMaximumSignificantDigits() {
+ assertEquals(16, new PrecisionModel(PrecisionModel.FLOATING).getMaximumSignificantDigits());
+ assertEquals(6, new PrecisionModel(PrecisionModel.FLOATING_SINGLE).getMaximumSignificantDigits());
+ assertEquals(1, new PrecisionModel(PrecisionModel.FIXED).getMaximumSignificantDigits());
+ assertEquals(4, new PrecisionModel(1000).getMaximumSignificantDigits());
+ }
+
+ public void testMakePrecise()
+ {
+ PrecisionModel pm_10 = new PrecisionModel(0.1);
+
+ preciseCoordinateTester(pm_10, 1200.4, 1240.4, 1200, 1240);
+ preciseCoordinateTester(pm_10, 1209.4, 1240.4, 1210, 1240);
+ }
+
+ private void preciseCoordinateTester(PrecisionModel pm,
+ double x1, double y1,
+ double x2, double y2)
+ {
+ Coordinate p = new Coordinate(x1, y1);
+
+ pm.makePrecise(p);
+
+ Coordinate pPrecise = new Coordinate(x2, y2);
+ assertTrue(p.equals2D(pPrecise));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/PredicateShortCircuitTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/PredicateShortCircuitTest.java
new file mode 100644
index 0000000..de4ea98
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/PredicateShortCircuitTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test named predicate short-circuits
+ */
+/**
+ * @version 1.7
+ */
+public class PredicateShortCircuitTest extends TestCase {
+
+ WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(PredicateShortCircuitTest.class);
+ }
+
+ public PredicateShortCircuitTest(String name) { super(name); }
+
+ String[] polyInsidePoly =
+ { "POLYGON (( 0 0, 100 0, 100 100, 0 100, 0 0 ))",
+ "POLYGON (( 10 10, 90 10, 90 90, 10 90, 10 10 ))" } ;
+ String[] polyPartiallyOverlapsPoly =
+ { "POLYGON (( 10 10, 100 10, 100 100, 10 100, 10 10 ))",
+ "POLYGON (( 0 0, 90 0, 90 90, 0 90, 0 0 ))" } ;
+ String[] polyTouchesPolyAtPoint =
+ { "POLYGON (( 10 10, 100 10, 100 100, 10 100, 10 10 ))",
+ "POLYGON (( 0 0, 10 0, 10 10, 0 10, 0 0 ))" } ;
+ String[] polyTouchesPolyAtLine =
+ { "POLYGON (( 10 10, 100 10, 100 100, 10 100, 10 10 ))",
+ "POLYGON (( 10 0, 10 10, 20 10, 20 0, 10 0 ))" } ;
+ String[] polyInsideHoleInPoly =
+ { "POLYGON (( 40 40, 40 60, 60 60, 60 40, 40 40 ))",
+ "POLYGON (( 0 0, 100 0, 100 100, 0 100, 0 0), ( 10 10, 90 10, 90 90, 10 90, 10 10))" } ;
+
+
+ public void testAll() throws Exception
+ {
+ doPredicates(polyInsidePoly);
+ doPredicates(polyPartiallyOverlapsPoly);
+ doPredicates(polyTouchesPolyAtPoint);
+ doPredicates(polyTouchesPolyAtLine);
+ doPredicates(polyInsideHoleInPoly);
+ }
+
+ public void doPredicates(String[] wkt)
+ throws Exception
+ {
+ Geometry a = rdr.read(wkt[0]);
+ Geometry b = rdr.read(wkt[1]);
+ doPredicates(a, b);
+ doPredicates(b ,a);
+ }
+ public void doPredicates(Geometry a, Geometry b) throws Exception
+ {
+ assertTrue( a.contains(b) == a.relate(b).isContains() );
+ assertTrue( a.crosses(b) == a.relate(b).isCrosses(a.getDimension(), b.getDimension()) );
+ assertTrue( a.disjoint(b) == a.relate(b).isDisjoint() );
+ assertTrue( a.equals(b) == a.relate(b).isEquals(a.getDimension(), b.getDimension()) );
+ assertTrue( a.intersects(b) == a.relate(b).isIntersects() );
+ assertTrue( a.overlaps(b) == a.relate(b).isOverlaps(a.getDimension(), b.getDimension()) );
+ assertTrue( a.touches(b) == a.relate(b).isTouches(a.getDimension(), b.getDimension()) );
+ assertTrue( a.within(b) == a.relate(b).isWithin() );
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/RectanglePredicateSyntheticTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/RectanglePredicateSyntheticTest.java
new file mode 100644
index 0000000..b228d49
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/RectanglePredicateSyntheticTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test spatial predicate optimizations for rectangles by
+ * synthesizing an exhaustive set of test cases.
+ *
+ * @version 1.7
+ */
+public class RectanglePredicateSyntheticTest
+ extends TestCase
+{
+ private WKTReader rdr = new WKTReader();
+ private GeometryFactory fact = new GeometryFactory();
+
+ double baseX = 10;
+ double baseY = 10;
+ double rectSize = 20;
+ double bufSize = 10;
+ double testGeomSize = 10;
+ double bufferWidth = 1.0;
+
+ Envelope rectEnv = new Envelope(baseX, baseX + rectSize, baseY, baseY + rectSize);
+ Geometry rect = fact.toGeometry(rectEnv);
+
+ public static void main(String args[]) {
+ TestRunner.run(RectanglePredicateSyntheticTest.class);
+ }
+
+ public RectanglePredicateSyntheticTest(String name) { super(name); }
+
+ public void testLines()
+ {
+ //System.out.println(rect);
+
+ List testGeoms = getTestGeometries();
+ for (Iterator i = testGeoms.iterator(); i.hasNext(); ) {
+ Geometry testGeom = (Geometry) i.next();
+ runRectanglePredicates(rect, testGeom);
+ }
+ }
+
+ public void testDenseLines()
+ {
+ //System.out.println(rect);
+
+ List testGeoms = getTestGeometries();
+ for (Iterator i = testGeoms.iterator(); i.hasNext(); ) {
+ Geometry testGeom = (Geometry) i.next();
+
+ SegmentDensifier densifier = new SegmentDensifier((LineString) testGeom);
+ LineString denseLine = (LineString) densifier.densify(testGeomSize / 400);
+
+ runRectanglePredicates(rect, denseLine);
+ }
+ }
+
+ public void testPolygons()
+ {
+ List testGeoms = getTestGeometries();
+ for (Iterator i = testGeoms.iterator(); i.hasNext(); ) {
+ Geometry testGeom = (Geometry) i.next();
+ runRectanglePredicates(rect, testGeom.buffer(bufferWidth));
+ }
+ }
+
+ private List getTestGeometries()
+ {
+ Envelope testEnv = new Envelope(rectEnv.getMinX() - bufSize, rectEnv.getMaxX() + bufSize,
+ rectEnv.getMinY() - bufSize, rectEnv.getMaxY() + bufSize);
+ List testGeoms = createTestGeometries(testEnv, 5, testGeomSize);
+ return testGeoms;
+ }
+
+ private void runRectanglePredicates(Geometry rect, Geometry testGeom) {
+ boolean intersectsValue = rect.intersects(testGeom);
+ boolean relateIntersectsValue = rect.relate(testGeom).isIntersects();
+ boolean intersectsOK = intersectsValue == relateIntersectsValue;
+
+ boolean containsValue = rect.contains(testGeom);
+ boolean relateContainsValue = rect.relate(testGeom).isContains();
+ boolean containsOK = containsValue == relateContainsValue;
+
+ //System.out.println(testGeom);
+ if (! intersectsOK || ! containsOK) {
+ System.out.println(testGeom);
+ }
+ assertTrue(intersectsOK);
+ assertTrue(containsOK);
+ }
+
+ public List createTestGeometries(Envelope env, double inc, double size)
+ {
+ List testGeoms = new ArrayList();
+
+ for (double y = env.getMinY(); y <= env.getMaxY(); y += inc) {
+ for (double x = env.getMinX(); x <= env.getMaxX(); x += inc) {
+ Coordinate base = new Coordinate(x, y);
+ testGeoms.add(createAngle(base, size, 0));
+ testGeoms.add(createAngle(base, size, 1));
+ testGeoms.add(createAngle(base, size, 2));
+ testGeoms.add(createAngle(base, size, 3));
+ }
+ }
+ return testGeoms;
+ }
+
+ public Geometry createAngle(Coordinate base, double size, int quadrant)
+ {
+ int[][] factor = {
+ { 1, 0 },
+ { 0, 1 },
+ { -1, 0 },
+ { 0, -1 } };
+
+ int xFac = factor[quadrant][0];
+ int yFac = factor[quadrant][1];
+
+ Coordinate p0 = new Coordinate(base.x + xFac * size, base.y + yFac * size);
+ Coordinate p2 = new Coordinate(base.x + yFac * size, base.y + (- xFac) * size);
+
+ return fact.createLineString(new Coordinate[] { p0, base, p2 } );
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/RectanglePredicateTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/RectanglePredicateTest.java
new file mode 100644
index 0000000..9940f39
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/RectanglePredicateTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test spatial predicate optimizations for rectangles.
+ *
+ * @version 1.7
+ */
+
+public class RectanglePredicateTest
+ extends TestCase
+{
+ private WKTReader rdr = new WKTReader();
+ private GeometryFactory fact = new GeometryFactory();
+
+ public static void main(String args[]) {
+ TestRunner.run(RectanglePredicateTest.class);
+ }
+
+ public RectanglePredicateTest(String name) { super(name); }
+
+ public void testShortAngleOnBoundary()
+ throws Exception
+ {
+ String[] onBoundary =
+ { "POLYGON ((10 10, 30 10, 30 30, 10 30, 10 10))",
+ "LINESTRING (10 25, 10 10, 25 10)" } ;
+ runRectanglePred(onBoundary);
+ }
+
+ public void testAngleOnBoundary()
+ throws Exception
+ {
+ String[] onBoundary =
+ { "POLYGON ((10 10, 30 10, 30 30, 10 30, 10 10))",
+ "LINESTRING (10 30, 10 10, 30 10)" } ;
+ runRectanglePred(onBoundary);
+ }
+
+ private void runRectanglePred(String[] wkt)
+ throws Exception
+ {
+ Geometry rect = rdr.read(wkt[0]);
+ Geometry b = rdr.read(wkt[1]);
+ runRectanglePred(rect, b);
+ }
+
+ private void runRectanglePred(Geometry rect, Geometry testGeom) {
+ boolean intersectsValue = rect.intersects(testGeom);
+ boolean relateIntersectsValue = rect.relate(testGeom).isIntersects();
+ boolean intersectsOK = intersectsValue == relateIntersectsValue;
+
+ boolean containsValue = rect.contains(testGeom);
+ boolean relateContainsValue = rect.relate(testGeom).isContains();
+ boolean containsOK = containsValue == relateContainsValue;
+
+ //System.out.println(testGeom);
+ if (! intersectsOK || ! containsOK) {
+ //System.out.println(testGeom);
+ }
+ assertTrue(intersectsOK);
+ assertTrue(containsOK);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/SegmentDensifier.java b/modules/core/src/test/java/org/locationtech/jts/geom/SegmentDensifier.java
new file mode 100644
index 0000000..6d2eb6a
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/SegmentDensifier.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom;
+
+/**
+ * Densifies a LineString
+ *
+ * @version 1.7
+ */
+public class SegmentDensifier
+{
+ private LineString inputLine;
+ private CoordinateList newCoords;
+
+ public SegmentDensifier(LineString line) {
+ this.inputLine = line;
+ }
+
+ public Geometry densify(double segLength)
+ {
+ newCoords = new CoordinateList();
+
+ CoordinateSequence seq = inputLine.getCoordinateSequence();
+
+ Coordinate p0 = new Coordinate();
+ Coordinate p1 = new Coordinate();
+ seq.getCoordinate(0, p0);
+ newCoords.add(new Coordinate(p0));
+
+ for (int i = 0; i < seq.size() - 1; i++) {
+ seq.getCoordinate(i, p0);
+ seq.getCoordinate(i + 1, p1);
+ densify(p0, p1, segLength);
+ }
+ Coordinate[] newPts = newCoords.toCoordinateArray();
+ return inputLine.getFactory().createLineString(newPts);
+ }
+
+ private void densify(Coordinate p0, Coordinate p1, double segLength)
+ {
+ double origLen = p1.distance(p0);
+ int nPtsToAdd = (int) Math.floor(origLen / segLength);
+
+ double delx = p1.x - p0.x;
+ double dely = p1.y - p0.y;
+
+ double segLenFrac = segLength / origLen;
+ for (int i = 0; i <= nPtsToAdd; i++) {
+ double addedPtFrac = i * segLenFrac;
+ Coordinate pt = new Coordinate(p0.x + addedPtFrac * delx,
+ p0.y + addedPtFrac * dely);
+ newCoords.add(pt, false);
+ }
+ newCoords.add(new Coordinate(p1), false);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/TriangleTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/TriangleTest.java
new file mode 100644
index 0000000..0eb8f70
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/TriangleTest.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom;
+
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * @version 1.7
+ */
+public class TriangleTest extends TestCase
+{
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel,
+ 0);
+
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ private static final double TOLERANCE = 1E-5;
+
+ public static void main(String args[])
+ {
+ TestRunner.run(TriangleTest.class);
+ }
+
+ public TriangleTest(String name)
+ {
+ super(name);
+ }
+
+ public void testInterpolateZ() throws Exception
+ {
+ checkInterpolateZ("LINESTRING(1 1 0, 2 1 0, 1 2 10)", new Coordinate(1.5,
+ 1.5), 5);
+ checkInterpolateZ("LINESTRING(1 1 0, 2 1 0, 1 2 10)", new Coordinate(1.2,
+ 1.2), 2);
+ checkInterpolateZ("LINESTRING(1 1 0, 2 1 0, 1 2 10)", new Coordinate(0, 0),
+ -10);
+ }
+
+ public void checkInterpolateZ(String wkt, Coordinate p, double expectedValue)
+ throws Exception
+ {
+ Geometry g = reader.read(wkt);
+ Coordinate[] pt = g.getCoordinates();
+
+ Triangle t = new Triangle(pt[0], pt[1], pt[2]);
+ double z = t.interpolateZ(p);
+ //System.out.println("Z = " + z);
+ assertEquals(expectedValue, z, 0.000001);
+ }
+
+ public void testArea3D() throws Exception
+ {
+ checkArea3D("POLYGON((0 0 10, 100 0 110, 100 100 110, 0 0 10))",
+ 7071.067811865475);
+ checkArea3D("POLYGON((0 0 10, 100 0 10, 50 100 110, 0 0 10))",
+ 7071.067811865475);
+ }
+
+ public void checkArea3D(String wkt, double expectedValue) throws Exception
+ {
+ Geometry g = reader.read(wkt);
+ Coordinate[] pt = g.getCoordinates();
+ Triangle t = new Triangle(pt[0], pt[1], pt[2]);
+ double area3D = t.area3D();
+ // System.out.println("area3D = " + area3D);
+ assertEquals(expectedValue, area3D, TOLERANCE);
+ }
+
+ public void testArea() throws Exception
+ {
+ // CW
+ checkArea("POLYGON((10 10, 20 20, 20 10, 10 10))", 50);
+ // CCW
+ checkArea("POLYGON((10 10, 20 10, 20 20, 10 10))", -50);
+ // degenerate point triangle
+ checkArea("POLYGON((10 10, 10 10, 10 10, 10 10))", 0);
+ // degenerate line triangle
+ checkArea("POLYGON((10 10, 20 10, 15 10, 10 10))", 0);
+ }
+
+ public void checkArea(String wkt, double expectedValue) throws Exception
+ {
+ Geometry g = reader.read(wkt);
+ Coordinate[] pt = g.getCoordinates();
+
+ Triangle t = new Triangle(pt[0], pt[1], pt[2]);
+ double signedArea = t.signedArea();
+ //System.out.println("signed area = " + signedArea);
+ assertEquals(expectedValue, signedArea, TOLERANCE);
+
+ double area = t.area();
+ assertEquals(Math.abs(expectedValue), area, TOLERANCE);
+
+ }
+
+ public void testAcute() throws Exception
+ {
+ // right triangle
+ checkAcute("POLYGON((10 10, 20 20, 20 10, 10 10))", false);
+ // CCW right tri
+ checkAcute("POLYGON((10 10, 20 10, 20 20, 10 10))", false);
+ // acute
+ checkAcute("POLYGON((10 10, 20 10, 15 20, 10 10))", true);
+ }
+
+ public void checkAcute(String wkt, boolean expectedValue) throws Exception
+ {
+ Geometry g = reader.read(wkt);
+ Coordinate[] pt = g.getCoordinates();
+
+ Triangle t = new Triangle(pt[0], pt[1], pt[2]);
+ boolean isAcute = t.isAcute();
+ //System.out.println("isAcute = " + isAcute);
+ assertEquals(expectedValue, isAcute);
+ }
+
+ public void testCircumCentre() throws Exception
+ {
+ // right triangle
+ checkCircumCentre("POLYGON((10 10, 20 20, 20 10, 10 10))", new Coordinate(
+ 15.0, 15.0));
+ // CCW right tri
+ checkCircumCentre("POLYGON((10 10, 20 10, 20 20, 10 10))", new Coordinate(
+ 15.0, 15.0));
+ // acute
+ checkCircumCentre("POLYGON((10 10, 20 10, 15 20, 10 10))", new Coordinate(
+ 15.0, 13.75));
+ }
+
+ public void testCentroid() throws Exception
+ {
+ // right triangle
+ checkCentroid("POLYGON((10 10, 20 20, 20 10, 10 10))", new Coordinate(
+ (10.0 + 20.0 + 20.0) / 3.0, (10.0 + 20.0 + 10.0) / 3.0));
+ // CCW right tri
+ checkCentroid("POLYGON((10 10, 20 10, 20 20, 10 10))", new Coordinate(
+ (10.0 + 20.0 + 20.0) / 3.0, (10.0 + 10.0 + 20.0) / 3.0));
+ // acute
+ checkCentroid("POLYGON((10 10, 20 10, 15 20, 10 10))", new Coordinate(
+ (10.0 + 20.0 + 15.0) / 3.0, (10.0 + 10.0 + 20.0) / 3.0));
+ }
+
+ public void checkCentroid(String wkt, Coordinate expectedValue)
+ throws Exception
+ {
+ Geometry g = reader.read(wkt);
+ Coordinate[] pt = g.getCoordinates();
+
+ Coordinate centroid = Triangle.centroid(pt[0], pt[1], pt[2]);
+ //System.out.println("(Static) centroid = " + centroid);
+ assertEquals(expectedValue.toString(), centroid.toString());
+
+ // Test Instance version
+ //
+ Triangle t = new Triangle(pt[0], pt[1], pt[2]);
+ centroid = t.centroid();
+ //System.out.println("(Instance) centroid = " + centroid.toString());
+ assertEquals(expectedValue.toString(), centroid.toString());
+ }
+
+ public void checkCircumCentre(String wkt, Coordinate expectedValue)
+ throws Exception
+ {
+ Geometry g = reader.read(wkt);
+ Coordinate[] pt = g.getCoordinates();
+
+ Coordinate circumcentre = Triangle.circumcentre(pt[0], pt[1], pt[2]);
+ //System.out.println("(Static) circumcentre = " + circumcentre);
+ assertEquals(expectedValue.toString(), circumcentre.toString());
+
+ // Test Instance version
+ //
+ Triangle t = new Triangle(pt[0], pt[1], pt[2]);
+ circumcentre = t.circumcentre();
+ //System.out.println("(Instance) circumcentre = " + circumcentre.toString());
+ assertEquals(expectedValue.toString(), circumcentre.toString());
+ }
+
+ public void testLongestSideLength() throws Exception
+ {
+ // right triangle
+ checkLongestSideLength("POLYGON((10 10 1, 20 20 2, 20 10 3, 10 10 1))",
+ 14.142135623730951);
+ // CCW right tri
+ checkLongestSideLength("POLYGON((10 10 1, 20 10 2, 20 20 3, 10 10 1))",
+ 14.142135623730951);
+ // acute
+ checkLongestSideLength("POLYGON((10 10 1, 20 10 2, 15 20 3, 10 10 1))",
+ 11.180339887498949);
+ }
+
+ public void checkLongestSideLength(String wkt, double expectedValue)
+ throws Exception
+ {
+ Geometry g = reader.read(wkt);
+ Coordinate[] pt = g.getCoordinates();
+
+ double length = Triangle.longestSideLength(pt[0], pt[1], pt[2]);
+ //System.out.println("(Static) longestSideLength = " + length);
+ assertEquals(expectedValue, length, 0.00000001);
+
+ // Test Instance version
+ //
+ Triangle t = new Triangle(pt[0], pt[1], pt[2]);
+ length = t.longestSideLength();
+ //System.out.println("(Instance) longestSideLength = " + length);
+ assertEquals(expectedValue, length, 0.00000001);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/impl/BasicCoordinateSequenceTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/impl/BasicCoordinateSequenceTest.java
new file mode 100644
index 0000000..1b3b554
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/impl/BasicCoordinateSequenceTest.java
@@ -0,0 +1,53 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.impl;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class BasicCoordinateSequenceTest extends TestCase {
+ public BasicCoordinateSequenceTest(String name) {
+ super(name);
+ }
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(BasicCoordinateSequenceTest.class);
+ }
+ public void testClone() {
+ CoordinateSequence s1 = CoordinateArraySequenceFactory.instance().create(
+ new Coordinate[] { new Coordinate(1, 2), new Coordinate(3, 4)});
+ CoordinateSequence s2 = (CoordinateSequence) s1.copy();
+ assertTrue(s1.getCoordinate(0).equals(s2.getCoordinate(0)));
+ assertTrue(s1.getCoordinate(0) != s2.getCoordinate(0));
+ }
+
+ public void testCloneDimension2() {
+ CoordinateSequence s1 = CoordinateArraySequenceFactory.instance()
+ .create( 2, 2 );
+ s1.setOrdinate(0, 0, 1);
+ s1.setOrdinate(0, 1, 2);
+ s1.setOrdinate(1, 0, 3);
+ s1.setOrdinate(1, 1, 4);
+
+ CoordinateSequence s2 = (CoordinateSequence) s1.copy();
+ assertTrue(s1.getDimension() == s2.getDimension());
+ assertTrue(s1.getCoordinate(0).equals(s2.getCoordinate(0)));
+ assertTrue(s1.getCoordinate(0) != s2.getCoordinate(0));
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/impl/CoordinateArraySequenceTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/impl/CoordinateArraySequenceTest.java
new file mode 100644
index 0000000..1492ebb
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/impl/CoordinateArraySequenceTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.impl;
+
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
+
+import junit.textui.TestRunner;
+
+/**
+ * Test {@link CoordinateArraySequence}
+ *
+ * @version 1.7
+ */
+public class CoordinateArraySequenceTest
+ extends CoordinateSequenceTestBase
+{
+ public static void main(String args[]) {
+ TestRunner.run(CoordinateArraySequenceTest.class);
+ }
+
+ public CoordinateArraySequenceTest(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ CoordinateSequenceFactory getCSFactory() {
+ return CoordinateArraySequenceFactory.instance();
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/impl/CoordinateSequenceTestBase.java b/modules/core/src/test/java/org/locationtech/jts/geom/impl/CoordinateSequenceTestBase.java
new file mode 100644
index 0000000..66c69c4
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/impl/CoordinateSequenceTestBase.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * General test cases for CoordinateSequences.
+ * Subclasses can set the factory to test different kinds of CoordinateSequences.
+ *
+ * @version 1.7
+ */
+public abstract class CoordinateSequenceTestBase
+ extends TestCase
+{
+ public static final int SIZE = 100;
+
+ public static void main(String args[]) {
+ TestRunner.run(CoordinateSequenceTestBase.class);
+ }
+
+ public CoordinateSequenceTestBase(String name) { super(name); }
+
+ abstract CoordinateSequenceFactory getCSFactory();
+
+ public void testZeroLength()
+ {
+ CoordinateSequence seq = getCSFactory().create(0, 3);
+ assertTrue(seq.size() == 0);
+
+ CoordinateSequence seq2 = getCSFactory().create((Coordinate[]) null);
+ assertTrue(seq2.size() == 0);
+ }
+
+ public void testCreateBySizeAndModify()
+ {
+ Coordinate[] coords = createArray(SIZE);
+
+ CoordinateSequence seq = getCSFactory().create(SIZE, 3);
+ for (int i = 0; i < seq.size(); i++) {
+ seq.setOrdinate(i, 0, coords[i].x);
+ seq.setOrdinate(i, 1, coords[i].y);
+ seq.setOrdinate(i, 2, coords[i].z);
+ }
+
+ assertTrue(isEqual(seq, coords));
+ }
+
+ public void test2DZOrdinate()
+ {
+ Coordinate[] coords = createArray(SIZE);
+
+ CoordinateSequence seq = getCSFactory().create(SIZE, 2);
+ for (int i = 0; i < seq.size(); i++) {
+ seq.setOrdinate(i, 0, coords[i].x);
+ seq.setOrdinate(i, 1, coords[i].y);
+ }
+
+ for (int i = 0; i < seq.size(); i++) {
+ Coordinate p = seq.getCoordinate(i);
+ assertTrue(Double.isNaN(p.z));
+ }
+ }
+
+ public void testCreateByInit()
+ {
+ Coordinate[] coords = createArray(SIZE);
+ CoordinateSequence seq = getCSFactory().create(coords);
+ assertTrue(isEqual(seq, coords));
+ }
+
+ public void testCreateByInitAndCopy()
+ {
+ Coordinate[] coords = createArray(SIZE);
+ CoordinateSequence seq = getCSFactory().create(coords);
+ CoordinateSequence seq2 = getCSFactory().create(seq);
+ assertTrue(isEqual(seq2, coords));
+ }
+
+ public void testSerializable() throws IOException, ClassNotFoundException {
+ Coordinate[] coords = createArray(SIZE);
+ CoordinateSequence seq = getCSFactory().create(coords);
+ // throws exception if not serializable
+ byte[] data = serialize(seq);
+ // check round-trip gives same data
+ CoordinateSequence seq2 = deserialize(data);
+ assertTrue(isEqual(seq2, coords));
+ }
+
+ private static byte[] serialize(CoordinateSequence seq) throws IOException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos);
+ oos.writeObject(seq);
+ oos.close();
+ return bos.toByteArray();
+ }
+
+ private static CoordinateSequence deserialize(byte[] data) throws IOException, ClassNotFoundException {
+ ByteArrayInputStream bais = new ByteArrayInputStream(data);
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ Object o = ois.readObject();
+ return (CoordinateSequence) o;
+ }
+
+ Coordinate[] createArray(int size)
+ {
+ Coordinate[] coords = new Coordinate[size];
+ for (int i = 0; i < size; i++) {
+ double base = 2 * 1;
+ coords[i] = new Coordinate(base, base + 1, base + 2);
+ }
+ return coords;
+ }
+
+ boolean isAllCoordsEqual(CoordinateSequence seq, Coordinate coord)
+ {
+ for (int i = 0; i < seq.size(); i++) {
+ if (! coord.equals(seq.getCoordinate(i))) return false;
+
+ if (coord.x != seq.getOrdinate(i, CoordinateSequence.X)) return false;
+ if (coord.y != seq.getOrdinate(i, CoordinateSequence.Y)) return false;
+ if (coord.z != seq.getOrdinate(i, CoordinateSequence.Z)) return false;
+ }
+ return true;
+ }
+
+ /**
+ * Tests for equality using all supported accessors,
+ * to provides test coverage for them.
+ *
+ * @param seq
+ * @param coords
+ * @return
+ */
+ boolean isEqual(CoordinateSequence seq, Coordinate[] coords)
+ {
+ if (seq.size() != coords.length) return false;
+
+ Coordinate p = new Coordinate();
+
+ for (int i = 0; i < seq.size(); i++) {
+ if (! coords[i].equals(seq.getCoordinate(i))) return false;
+
+ // Ordinate named getters
+ if (coords[i].x != seq.getX(i)) return false;
+ if (coords[i].y != seq.getY(i)) return false;
+
+ // Ordinate indexed getters
+ if (coords[i].x != seq.getOrdinate(i, CoordinateSequence.X)) return false;
+ if (coords[i].y != seq.getOrdinate(i, CoordinateSequence.Y)) return false;
+ if (coords[i].z != seq.getOrdinate(i, CoordinateSequence.Z)) return false;
+
+ // Coordinate getter
+ seq.getCoordinate(i, p);
+ if (coords[i].x != p.x) return false;
+ if (coords[i].y != p.y) return false;
+ if (coords[i].z != p.z) return false;
+
+ }
+ return true;
+ }
+}
+
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/impl/PackedCoordinateSequenceTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/impl/PackedCoordinateSequenceTest.java
new file mode 100644
index 0000000..65d3cd9
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/impl/PackedCoordinateSequenceTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.impl;
+
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
+
+import junit.textui.TestRunner;
+
+/**
+ * Test {@link PackedCoordinateSequence}
+ * @version 1.7
+ */
+public class PackedCoordinateSequenceTest
+ extends CoordinateSequenceTestBase
+{
+ public static void main(String args[]) {
+ TestRunner.run(PackedCoordinateSequenceTest.class);
+ }
+
+ public PackedCoordinateSequenceTest(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ CoordinateSequenceFactory getCSFactory() {
+ return new PackedCoordinateSequenceFactory();
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonIntersectsStressTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonIntersectsStressTest.java
new file mode 100644
index 0000000..7d4962a
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonIntersectsStressTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Stress tests {@link PreparedPolygon#intersects(Geometry)}
+ * to confirm it finds intersections correctly.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PreparedPolygonIntersectsStressTest extends TestCase
+{
+ static final int MAX_ITER = 10000;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ public static void main(String args[]) {
+ TestRunner.run(PreparedPolygonIntersectsStressTest.class);
+ }
+
+ boolean testFailed = false;
+
+ public PreparedPolygonIntersectsStressTest(String name) {
+ super(name);
+ }
+
+ public void test()
+ {
+ run(1000);
+ }
+
+ public void run(int nPts)
+ {
+// Geometry poly = createCircle(new Coordinate(0, 0), 100, nPts);
+ Geometry poly = createSineStar(new Coordinate(0, 0), 100, nPts);
+ //System.out.println(poly);
+
+ //System.out.println();
+ //System.out.println("Running with " + nPts + " points");
+ test(poly);
+ }
+
+ Geometry createCircle(Coordinate origin, double size, int nPts) {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createCircle();
+ // Polygon gRect = gsf.createRectangle();
+ // Geometry g = gRect.getExteriorRing();
+ return circle;
+ }
+
+ Geometry createSineStar(Coordinate origin, double size, int nPts) {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ gsf.setArmLengthRatio(0.1);
+ gsf.setNumArms(20);
+ Geometry poly = gsf.createSineStar();
+ return poly;
+ }
+
+ LineString createTestLine(Envelope env, double size, int nPts)
+ {
+ double width = env.getWidth();
+ double xOffset = width * Math.random();
+ double yOffset = env.getHeight() * Math.random();
+ Coordinate basePt = new Coordinate(
+ env.getMinX() + xOffset,
+ env.getMinY() + yOffset);
+ LineString line = createTestLine(basePt, size, nPts);
+ return line;
+ }
+
+ LineString createTestLine(Coordinate base, double size, int nPts)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(base);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createCircle();
+// System.out.println(circle);
+ return (LineString) circle.getBoundary();
+ }
+
+ public void test(Geometry g) {
+ int count = 0;
+ while (count < MAX_ITER) {
+ count++;
+ LineString line = createTestLine(g.getEnvelopeInternal(), 10, 20);
+
+// System.out.println("Test # " + count);
+// System.out.println(line);
+ testResultsEqual(g, line);
+ }
+ }
+
+ public void testResultsEqual(Geometry g, LineString line)
+ {
+ boolean slowIntersects = g.intersects(line);
+
+ PreparedGeometryFactory pgFact = new PreparedGeometryFactory();
+ PreparedGeometry prepGeom = pgFact.create(g);
+
+ boolean fastIntersects = prepGeom.intersects(line);
+
+ if (slowIntersects != fastIntersects) {
+ System.out.println(line);
+ System.out.println("Slow = " + slowIntersects + ", Fast = " + fastIntersects);
+ throw new RuntimeException("Different results found for intersects() !");
+ }
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicateStressTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicateStressTest.java
new file mode 100644
index 0000000..c950380
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicateStressTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+import org.locationtech.jts.geom.Geometry;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Stress tests {@link PreparedPolygon} for
+ * correctness of
+ * {@link PreparedPolygon#contains(Geometry)}
+ * and {@link PreparedPolygon#intersects(Geometry)}
+ * operations.
+ *
+ * @author Owner
+ *
+ */
+public class PreparedPolygonPredicateStressTest extends TestCase
+{
+
+ public static void main(String args[]) {
+ TestRunner.run(PreparedPolygonPredicateStressTest.class);
+ }
+
+ boolean testFailed = false;
+
+ public PreparedPolygonPredicateStressTest(String name) {
+ super(name);
+ }
+
+ public void test()
+ {
+ PredicateStressTester tester = new PredicateStressTester();
+ tester.run(1000);
+ }
+
+ class PredicateStressTester
+ extends StressTestHarness
+ {
+ public boolean checkResult(Geometry target, Geometry test) {
+ if (! checkIntersects(target, test)) return false;
+ if (! checkContains(target, test)) return false;
+ return true;
+ }
+ }
+
+ public boolean checkContains(Geometry target, Geometry test)
+ {
+ boolean expectedResult = target.contains(test);
+
+ PreparedGeometryFactory pgFact = new PreparedGeometryFactory();
+ PreparedGeometry prepGeom = pgFact.create(target);
+
+ boolean prepResult = prepGeom.contains(test);
+
+ if (prepResult != expectedResult) {
+ return false;
+ }
+ return true;
+ }
+
+ public boolean checkIntersects(Geometry target, Geometry test)
+ {
+ boolean expectedResult = target.intersects(test);
+
+ PreparedGeometryFactory pgFact = new PreparedGeometryFactory();
+ PreparedGeometry prepGeom = pgFact.create(target);
+
+ boolean prepResult = prepGeom.intersects(test);
+
+ if (prepResult != expectedResult) {
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/prep/StressTestHarness.java b/modules/core/src/test/java/org/locationtech/jts/geom/prep/StressTestHarness.java
new file mode 100644
index 0000000..bd009da
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/prep/StressTestHarness.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.geom.prep;
+
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+public abstract class StressTestHarness
+{
+ static final int MAX_ITER = 10000;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ private int numTargetPts = 1000;
+
+ public StressTestHarness() {
+ }
+
+ public void setTargetSize(int nPts)
+ {
+ numTargetPts =nPts;
+ }
+
+ public void run(int nIter)
+ {
+ //System.out.println("Running " + nIter + " tests");
+// Geometry poly = createCircle(new Coordinate(0, 0), 100, nPts);
+ Geometry poly = createSineStar(new Coordinate(0, 0), 100, numTargetPts);
+ //System.out.println(poly);
+
+ //System.out.println();
+ //System.out.println("Running with " + nPts + " points");
+ run(nIter, poly);
+ }
+
+ Geometry createCircle(Coordinate origin, double size, int nPts) {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createCircle();
+ // Polygon gRect = gsf.createRectangle();
+ // Geometry g = gRect.getExteriorRing();
+ return circle;
+ }
+
+ Geometry createSineStar(Coordinate origin, double size, int nPts) {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ gsf.setArmLengthRatio(0.1);
+ gsf.setNumArms(20);
+ Geometry poly = gsf.createSineStar();
+ return poly;
+ }
+
+ Geometry createRandomTestGeometry(Envelope env, double size, int nPts)
+ {
+ double width = env.getWidth();
+ double xOffset = width * Math.random();
+ double yOffset = env.getHeight() * Math.random();
+ Coordinate basePt = new Coordinate(
+ env.getMinX() + xOffset,
+ env.getMinY() + yOffset);
+ Geometry test = createTestCircle(basePt, size, nPts);
+ if (test instanceof Polygon && Math.random() > 0.5) {
+ test = test.getBoundary();
+ }
+ return test;
+ }
+
+ Geometry createTestCircle(Coordinate base, double size, int nPts)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(base);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createCircle();
+// System.out.println(circle);
+ return circle;
+ }
+
+ public void run(int nIter, Geometry target) {
+ int count = 0;
+ while (count < nIter) {
+ count++;
+ Geometry test = createRandomTestGeometry(target.getEnvelopeInternal(), 10, 20);
+
+// System.out.println("Test # " + count);
+// System.out.println(line);
+// System.out.println("Test[" + count + "] " + target.getClass() + "/" + test.getClass());
+ boolean isResultCorrect = checkResult(target, test);
+ if (! isResultCorrect) {
+ throw new RuntimeException("Invalid result found");
+ }
+ }
+ }
+
+ public abstract boolean checkResult(Geometry target, Geometry test);
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/util/AffineTransformationBuilderTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/util/AffineTransformationBuilderTest.java
new file mode 100644
index 0000000..fc7821c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/util/AffineTransformationBuilderTest.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import org.locationtech.jts.geom.Coordinate;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Tests {@link AffineTransformationBuilder}.
+ *
+ * @author Martin Davis
+ */
+public class AffineTransformationBuilderTest
+ extends TestCase
+{
+ public AffineTransformationBuilderTest(String name)
+ {
+ super(name);
+ }
+
+ public void testRotate1()
+ {
+ run(0, 0, 1, 0, 0, 1,
+ 0, 0, 0, 1, -1, 0);
+ }
+
+ public void testRotate2()
+ {
+ run(0, 0, 1, 0, 0, 1,
+ 0, 0, 1, 1, -1, 1);
+ }
+
+ public void testScale1()
+ {
+ run(0, 0, 1, 0, 0, 1,
+ 0, 0, 2, 0, 0, 2);
+ }
+
+ public void testTranslate1()
+ {
+ run(0, 0, 1, 0, 0, 1,
+ 5, 6, 6, 6, 5, 7);
+ }
+
+ public void testLinear1()
+ {
+ run(0, 0, 1, 0, 0, 1,
+ 0, 0, 0, 0, 5, 7);
+ }
+
+ public void testSingular2()
+ {
+ // points on a line mapping to collinear points - not uniquely specified
+ runSingular(0, 0, 1, 1, 2, 2,
+ 0, 0, 10, 10, 30, 30);
+ }
+
+ public void testSingular3()
+ {
+ // points on a line mapping to collinear points - not uniquely specified
+ runSingular(0, 0, 1, 1, 2, 2,
+ 0, 0, 10, 10, 20, 20);
+ }
+
+ public void testSingular1()
+ {
+ // points on a line mapping to non-collinear points - no solution
+ runSingular(0, 0, 1, 1, 2, 2,
+ 0, 0, 1, 2, 1, 3);
+ }
+
+ public void testSingleControl1()
+ {
+ run(0, 0,
+ 5, 6);
+ }
+
+ public void testDualControl_Translation()
+ {
+ run(0, 0, 1, 1,
+ 5, 5, 6, 6);
+ }
+
+ public void testDualControl_General()
+ {
+ run(0, 0, 1, 1,
+ 5, 5, 6, 9);
+ }
+
+ void run(double p0x, double p0y,
+ double p1x, double p1y,
+ double p2x, double p2y,
+ double pp0x, double pp0y,
+ double pp1x, double pp1y,
+ double pp2x, double pp2y
+ )
+ {
+ Coordinate p0 = new Coordinate(p0x, p0y);
+ Coordinate p1 = new Coordinate(p1x, p1y);
+ Coordinate p2 = new Coordinate(p2x, p2y);
+
+ Coordinate pp0 = new Coordinate(pp0x, pp0y);
+ Coordinate pp1 = new Coordinate(pp1x, pp1y);
+ Coordinate pp2 = new Coordinate(pp2x, pp2y);
+
+ AffineTransformationBuilder atb = new AffineTransformationBuilder(
+ p0, p1, p2,
+ pp0, pp1, pp2);
+ AffineTransformation trans = atb.getTransformation();
+
+ Coordinate dest = new Coordinate();
+ assertEqualPoint(pp0, trans.transform(p0, dest));
+ assertEqualPoint(pp1, trans.transform(p1, dest));
+ assertEqualPoint(pp2, trans.transform(p2, dest));
+ }
+
+ void run(double p0x, double p0y,
+ double p1x, double p1y,
+ double pp0x, double pp0y,
+ double pp1x, double pp1y
+ )
+ {
+ Coordinate p0 = new Coordinate(p0x, p0y);
+ Coordinate p1 = new Coordinate(p1x, p1y);
+
+ Coordinate pp0 = new Coordinate(pp0x, pp0y);
+ Coordinate pp1 = new Coordinate(pp1x, pp1y);
+
+ AffineTransformation trans = AffineTransformationFactory.createFromControlVectors(
+ p0, p1,
+ pp0, pp1);
+
+ Coordinate dest = new Coordinate();
+ assertEqualPoint(pp0, trans.transform(p0, dest));
+ assertEqualPoint(pp1, trans.transform(p1, dest));
+ }
+
+ void run(double p0x, double p0y,
+ double pp0x, double pp0y
+ )
+ {
+ Coordinate p0 = new Coordinate(p0x, p0y);
+
+ Coordinate pp0 = new Coordinate(pp0x, pp0y);
+
+ AffineTransformation trans = AffineTransformationFactory.createFromControlVectors(
+ p0, pp0);
+
+ Coordinate dest = new Coordinate();
+ assertEqualPoint(pp0, trans.transform(p0, dest));
+ }
+
+
+ void runSingular(double p0x, double p0y,
+ double p1x, double p1y,
+ double p2x, double p2y,
+ double pp0x, double pp0y,
+ double pp1x, double pp1y,
+ double pp2x, double pp2y
+ )
+ {
+ Coordinate p0 = new Coordinate(p0x, p0y);
+ Coordinate p1 = new Coordinate(p1x, p1y);
+ Coordinate p2 = new Coordinate(p2x, p2y);
+
+ Coordinate pp0 = new Coordinate(pp0x, pp0y);
+ Coordinate pp1 = new Coordinate(pp1x, pp1y);
+ Coordinate pp2 = new Coordinate(pp2x, pp2y);
+
+ AffineTransformationBuilder atb = new AffineTransformationBuilder(
+ p0, p1, p2,
+ pp0, pp1, pp2);
+ AffineTransformation trans = atb.getTransformation();
+ assertEquals(trans, null);
+ }
+
+ private Coordinate ctl0 = new Coordinate(-10, -10);
+ private Coordinate ctl1 = new Coordinate(10, 20);
+ private Coordinate ctl2 = new Coordinate(10, -20);
+
+ public void testTransform1()
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.rotate(1);
+ trans.translate(10, 10);
+ trans.scale(2, 2);
+ runTransform(trans, ctl0, ctl1, ctl2);
+ }
+
+ public void testTransform2()
+ {
+ AffineTransformation trans = new AffineTransformation();
+ trans.rotate(3);
+ trans.translate(10, 10);
+ trans.scale(2, 10);
+ trans.shear(5, 2);
+ trans.reflect(5, 8, 10, 2);
+ runTransform(trans, ctl0, ctl1, ctl2);
+ }
+
+ private void runTransform(AffineTransformation trans,
+ Coordinate p0,
+ Coordinate p1,
+ Coordinate p2)
+ {
+ Coordinate pp0 = trans.transform(p0, new Coordinate());
+ Coordinate pp1 = trans.transform(p1, new Coordinate());
+ Coordinate pp2 = trans.transform(p2, new Coordinate());
+
+ AffineTransformationBuilder atb = new AffineTransformationBuilder(
+ p0, p1, p2,
+ pp0, pp1, pp2);
+ AffineTransformation atbTrans = atb.getTransformation();
+
+ Coordinate dest = new Coordinate();
+ assertEqualPoint(pp0, atbTrans.transform(p0, dest));
+ assertEqualPoint(pp1, atbTrans.transform(p1, dest));
+ assertEqualPoint(pp2, atbTrans.transform(p2, dest));
+ }
+
+
+ private void assertEqualPoint(Coordinate p, Coordinate q)
+ {
+ assertEquals(p.x, q.x, 0.00005);
+ assertEquals(p.y, q.y, 0.00005);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/util/AffineTransformationTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/util/AffineTransformationTest.java
new file mode 100644
index 0000000..375901b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/geom/util/AffineTransformationTest.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.geom.util;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * @author Martin Davis
+ *
+ */
+public class AffineTransformationTest
+ extends TestCase
+{
+ public AffineTransformationTest(String name)
+ {
+ super(name);
+ }
+
+ public void testRotate1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.rotationInstance(Math.PI/2);
+ checkTransformation(10, 0, t, 0, 10);
+ checkTransformation(0, 10, t, -10, 0);
+ checkTransformation(-10, -10, t, 10, -10);
+ }
+
+ public void testRotateAroundPoint1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.rotationInstance(Math.PI/2, 1, 1);
+ checkTransformation(1, 1, t, 1, 1);
+ checkTransformation(10, 0, t, 2, 10);
+ checkTransformation(0, 10, t, -8, 0);
+ checkTransformation(-10, -10, t, 12, -10);
+ }
+
+ public void testReflectXY1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.reflectionInstance(1, 1);
+ checkTransformation(10, 0, t, 0, 10);
+ checkTransformation(0, 10, t, 10, 0);
+ checkTransformation(-10, -10, t, -10, -10);
+ checkTransformation(-3, -4, t, -4, -3);
+ }
+
+ public void testReflectXY2()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.reflectionInstance(1, -1);
+ checkTransformation(10, 0, t, 0, -10);
+ checkTransformation(0, 10, t, -10, 0);
+ checkTransformation(-10, -10, t, 10, 10);
+ checkTransformation(-3, -4, t, 4, 3);
+ }
+
+ public void testReflectXYXY1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.reflectionInstance(0, 5, 5, 0);
+ checkTransformation(5, 0, t, 5, 0);
+ checkTransformation(0, 0, t, 5, 5);
+ checkTransformation(-10, -10, t, 15, 15);
+ }
+
+ public void testScale1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.scaleInstance(2, 3);
+ checkTransformation(10, 0, t, 20, 0);
+ checkTransformation(0, 10, t, 0, 30);
+ checkTransformation(-10, -10, t, -20, -30);
+ }
+
+ public void testShear1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.shearInstance(2, 3);
+ checkTransformation(10, 0, t, 10, 30);
+ }
+
+ public void testTranslate1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.translationInstance(2, 3);
+ checkTransformation(1, 0, t, 3, 3);
+ checkTransformation(0, 0, t, 2, 3);
+ checkTransformation(-10, -5, t, -8, -2);
+ }
+
+ public void testTranslateRotate1()
+ throws IOException, ParseException
+ {
+ AffineTransformation t = AffineTransformation.translationInstance(3, 3)
+ .rotate(Math.PI/2);
+ checkTransformation(10, 0, t, -3, 13);
+ checkTransformation(-10, -10, t, 7, -7);
+ }
+
+ public void testCompose1()
+ {
+ AffineTransformation t0 = AffineTransformation.translationInstance(10, 0);
+ t0.rotate(Math.PI /2);
+ t0.translate(0, -10);
+
+ AffineTransformation t1 = AffineTransformation.translationInstance(0, 0);
+ t1.rotate(Math.PI /2);
+
+ checkTransformation(t0, t1);
+ }
+
+ public void testCompose2()
+ {
+ AffineTransformation t0 = AffineTransformation.reflectionInstance(0, 0, 1, 0);
+ t0.reflect(0, 0, 0, -1);
+
+ AffineTransformation t1 = AffineTransformation.rotationInstance(Math.PI);
+
+ checkTransformation(t0, t1);
+ }
+
+ public void testComposeRotation1()
+ {
+ AffineTransformation t0 = AffineTransformation.rotationInstance(1, 10, 10);
+
+ AffineTransformation t1 = AffineTransformation.translationInstance(-10, -10);
+ t1.rotate(1);
+ t1.translate(10, 10);
+
+ checkTransformation(t0, t1);
+ }
+
+ public void testLineString() throws IOException, ParseException, NoninvertibleTransformationException {
+ checkTransformation("LINESTRING (1 2, 10 20, 100 200)");
+ }
+
+ public void testPolygon() throws IOException, ParseException, NoninvertibleTransformationException {
+ checkTransformation("POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0))");
+ }
+ public void testPolygonWithHole()
+ throws IOException, ParseException, NoninvertibleTransformationException
+ {
+ checkTransformation("POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0), (1 1, 1 10, 10 10, 10 1, 1 1) )");
+ }
+ public void testMultiPoint()
+ throws IOException, ParseException, NoninvertibleTransformationException
+ {
+ checkTransformation("MULTIPOINT (0 0, 1 4, 100 200)");
+ }
+ public void testMultiLineString()
+ throws IOException, ParseException, NoninvertibleTransformationException
+ {
+ checkTransformation("MULTILINESTRING ((0 0, 1 10), (10 10, 20 30), (123 123, 456 789))");
+ }
+ public void testMultiPolygon()
+ throws IOException, ParseException, NoninvertibleTransformationException
+ {
+ checkTransformation("MULTIPOLYGON ( ((0 0, 100 0, 100 100, 0 100, 0 0), (1 1, 1 10, 10 10, 10 1, 1 1) ), ((200 200, 200 250, 250 250, 250 200, 200 200)) )");
+ }
+
+ public void testGeometryCollection()
+ throws IOException, ParseException, NoninvertibleTransformationException
+ {
+ checkTransformation("GEOMETRYCOLLECTION ( POINT ( 1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0)) )");
+ }
+
+ public void testNestedGeometryCollection()
+ throws IOException, ParseException, NoninvertibleTransformationException
+ {
+ checkTransformation("GEOMETRYCOLLECTION ( POINT (20 20), GEOMETRYCOLLECTION ( POINT ( 1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0)) ) )");
+ }
+
+ public void testCompose3()
+ {
+ AffineTransformation t0 = AffineTransformation.reflectionInstance(0, 10, 10, 0);
+ t0.translate(-10, -10);
+
+ AffineTransformation t1 = AffineTransformation.reflectionInstance(0, 0, -1, 1);
+
+ checkTransformation(t0, t1);
+ }
+
+ /**
+ * Checks that a transformation produces the expected result
+ * @param x the input pt x
+ * @param y the input pt y
+ * @param trans the transformation
+ * @param xp the expected output x
+ * @param yp the expected output y
+ */
+ void checkTransformation(double x, double y, AffineTransformation trans, double xp, double yp)
+ {
+ Coordinate p = new Coordinate(x, y);
+ Coordinate p2 = new Coordinate();
+ trans.transform(p, p2);
+ assertEquals(xp, p2.x, .00005);
+ assertEquals(yp, p2.y, .00005);
+
+ // if the transformation is invertible, test the inverse
+ try {
+ AffineTransformation invTrans = trans.getInverse();
+ Coordinate pInv = new Coordinate();
+ invTrans.transform(p2, pInv);
+ assertEquals(x, pInv.x, .00005);
+ assertEquals(y, pInv.y, .00005);
+
+ double det = trans.getDeterminant();
+ double detInv = invTrans.getDeterminant();
+ assertEquals(det, 1.0 / detInv, .00005);
+
+ }
+ catch (NoninvertibleTransformationException ex) {
+ }
+ }
+
+ static WKTReader rdr = new WKTReader();
+
+ void checkTransformation(String geomStr) throws IOException, ParseException,
+ NoninvertibleTransformationException {
+ Geometry geom = rdr.read(geomStr);
+ AffineTransformation trans = AffineTransformation
+ .rotationInstance(Math.PI / 2);
+ AffineTransformation inv = trans.getInverse();
+ Geometry transGeom = (Geometry) geom.copy();
+ transGeom.apply(trans);
+ // System.out.println(transGeom);
+ transGeom.apply(inv);
+ // check if transformed geometry is equal to original
+ boolean isEqual = geom.equalsExact(transGeom, 0.0005);
+ assertTrue(isEqual);
+ }
+
+ void checkTransformation(AffineTransformation trans0, AffineTransformation trans1)
+ {
+ double[] m0 = trans0.getMatrixEntries();
+ double[] m1 = trans1.getMatrixEntries();
+ for (int i = 0; i < m0.length; i++) {
+ assertEquals(m0[i], m1[i], 0.000005);
+ }
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/SpatialIndexTester.java b/modules/core/src/test/java/org/locationtech/jts/index/SpatialIndexTester.java
new file mode 100644
index 0000000..a5e9129
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/SpatialIndexTester.java
@@ -0,0 +1,160 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+
+
+
+/**
+ * @version 1.7
+ */
+public class SpatialIndexTester
+{
+ private static boolean VERBOSE = false;
+
+ private SpatialIndex index;
+ private ArrayList sourceData;
+ private boolean isSuccess = true;
+
+ public SpatialIndexTester() {
+ }
+
+ public boolean isSuccess()
+ {
+ return isSuccess;
+ }
+
+ public void setSpatialIndex(SpatialIndex index)
+ {
+ this.index = index;
+ }
+
+ public SpatialIndex getSpatialIndex()
+ {
+ return index;
+ }
+
+ public void init() {
+ sourceData = new ArrayList();
+ addSourceData(0, sourceData);
+ addSourceData(OFFSET, sourceData);
+ if (VERBOSE) {
+ //System.out.println("===============================");
+ //System.out.println("Grid Extent: " + (CELL_EXTENT * CELLS_PER_GRID_SIDE));
+ //System.out.println("Cell Extent: " + CELL_EXTENT);
+ //System.out.println("Feature Extent: " + FEATURE_EXTENT);
+ //System.out.println("Cells Per Grid Side: " + CELLS_PER_GRID_SIDE);
+ //System.out.println("Offset For 2nd Set Of Features: " + OFFSET);
+ //System.out.println("Feature Count: " + sourceData.size());
+ }
+ insert(sourceData, index);
+ }
+
+ public void run()
+ {
+ doTest(index, QUERY_ENVELOPE_EXTENT_1, sourceData);
+ doTest(index, QUERY_ENVELOPE_EXTENT_2, sourceData);
+ }
+
+ private void insert(List sourceData, SpatialIndex index) {
+ for (Iterator i = sourceData.iterator(); i.hasNext(); ) {
+ Envelope envelope = (Envelope) i.next();
+ index.insert(envelope, envelope);
+ }
+ }
+
+ private static final double CELL_EXTENT = 20.31;
+ private static final int CELLS_PER_GRID_SIDE = 10;
+ private static final double FEATURE_EXTENT = 10.1;
+ private static final double OFFSET = 5.03;
+ private static final double QUERY_ENVELOPE_EXTENT_1 = 1.009;
+ private static final double QUERY_ENVELOPE_EXTENT_2 = 11.7;
+
+ private void addSourceData(double offset, List sourceData) {
+ for (int i = 0; i < CELLS_PER_GRID_SIDE; i++) {
+ double minx = (i * CELL_EXTENT) + offset;
+ double maxx = minx + FEATURE_EXTENT;
+ for (int j = 0; j < CELLS_PER_GRID_SIDE; j++) {
+ double miny = (j * CELL_EXTENT) + offset;
+ double maxy = miny + FEATURE_EXTENT;
+ Envelope e = new Envelope(minx, maxx, miny, maxy);
+ sourceData.add(e);
+ }
+ }
+ }
+
+ private void doTest(SpatialIndex index, double queryEnvelopeExtent, List sourceData) {
+ int extraMatchCount = 0;
+ int expectedMatchCount = 0;
+ int actualMatchCount = 0;
+ int queryCount = 0;
+ for (int x = 0; x < CELL_EXTENT * CELLS_PER_GRID_SIDE; x+= queryEnvelopeExtent) {
+ for (int y = 0; y < CELL_EXTENT * CELLS_PER_GRID_SIDE; y+= queryEnvelopeExtent) {
+ Envelope queryEnvelope = new Envelope(x, x+queryEnvelopeExtent, y, y+queryEnvelopeExtent);
+ List expectedMatches = intersectingEnvelopes(queryEnvelope, sourceData);
+ List actualMatches = index.query(queryEnvelope);
+ // since index returns candidates only, it may return more than the expected value
+ if (expectedMatches.size() > actualMatches.size()) {
+ isSuccess = false;
+ }
+ extraMatchCount += (actualMatches.size() - expectedMatches.size());
+ expectedMatchCount += expectedMatches.size();
+ actualMatchCount += actualMatches.size();
+ compare(expectedMatches, actualMatches);
+ queryCount++;
+ }
+ }
+ if (VERBOSE) {
+ //System.out.println("---------------");
+ //System.out.println("Envelope Extent: " + queryEnvelopeExtent);
+ //System.out.println("Expected Matches: " + expectedMatchCount);
+ //System.out.println("Actual Matches: " + actualMatchCount);
+ //System.out.println("Extra Matches: " + extraMatchCount);
+ //System.out.println("Query Count: " + queryCount);
+ //System.out.println("Average Expected Matches: " + (expectedMatchCount/(double)queryCount));
+ //System.out.println("Average Actual Matches: " + (actualMatchCount/(double)queryCount));
+ //System.out.println("Average Extra Matches: " + (extraMatchCount/(double)queryCount));
+ }
+ }
+
+ private void compare(List expectedEnvelopes, List actualEnvelopes) {
+ //Don't use #containsAll because we want to check using
+ //==, not #equals. [Jon Aquino]
+ for (Iterator i = expectedEnvelopes.iterator(); i.hasNext(); ) {
+ Envelope expected = (Envelope) i.next();
+ boolean found = false;
+ for (Iterator j = actualEnvelopes.iterator(); j.hasNext(); ) {
+ Envelope actual = (Envelope) j.next();
+ if (actual.equals(expected)) {
+ found = true;
+ break;
+ }
+ }
+ if (! found)
+ isSuccess = false;
+ }
+ }
+
+ private List intersectingEnvelopes(Envelope queryEnvelope, List envelopes) {
+ ArrayList intersectingEnvelopes = new ArrayList();
+ for (Iterator i = envelopes.iterator(); i.hasNext(); ) {
+ Envelope candidate = (Envelope) i.next();
+ if (candidate.intersects(queryEnvelope)) { intersectingEnvelopes.add(candidate); }
+ }
+ return intersectingEnvelopes;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/kdtree/KdTreeTest.java b/modules/core/src/test/java/org/locationtech/jts/index/kdtree/KdTreeTest.java
new file mode 100644
index 0000000..f2c28ea
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/kdtree/KdTreeTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index.kdtree;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateArrays;
+import org.locationtech.jts.geom.Envelope;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import test.jts.util.IOUtil;
+
+public class KdTreeTest extends TestCase {
+ public static void main(String args[]) {
+ TestRunner.run(KdTreeTest.class);
+ }
+
+ public KdTreeTest(String name) {
+ super(name);
+ }
+
+ public void testSinglePoint() {
+ KdTree index = new KdTree(.001);
+
+ KdNode node1 = index.insert(new Coordinate(1, 1));
+ KdNode node2 = index.insert(new Coordinate(1, 1));
+
+ assertTrue("Inserting 2 identical points should create one node",
+ node1 == node2);
+
+ Envelope queryEnv = new Envelope(0, 10, 0, 10);
+
+ List result = index.query(queryEnv);
+ assertTrue(result.size() == 1);
+
+ KdNode node = (KdNode) result.get(0);
+ assertTrue(node.getCount() == 2);
+ assertTrue(node.isRepeated());
+ }
+
+ public void testMultiplePoint() {
+ testQuery("MULTIPOINT ( (1 1), (2 2) )", 0,
+ new Envelope(0, 10, 0, 10),
+ "MULTIPOINT ( (1 1), (2 2) )");
+ }
+
+ public void testSubset() {
+ testQuery("MULTIPOINT ( (1 1), (2 2), (3 3), (4 4) )",
+ 0,
+ new Envelope(1.5, 3.4, 1.5, 3.5),
+ "MULTIPOINT ( (2 2), (3 3) )");
+ }
+
+ public void testToleranceFailure() {
+ testQuery("MULTIPOINT ( (0 0), (-.1 1), (.1 1) )",
+ 1,
+ new Envelope(-9, 9, -9, 9),
+ "MULTIPOINT ( (0 0), (-.1 1) )");
+ }
+
+ public void testTolerance2() {
+ testQuery("MULTIPOINT ((10 60), (20 60), (30 60), (30 63))",
+ 9,
+ new Envelope(0,99, 0, 99),
+ "MULTIPOINT ((10 60), (20 60), (30 60))");
+ }
+
+ public void testTolerance2_perturbedY() {
+ testQuery("MULTIPOINT ((10 60), (20 61), (30 60), (30 63))",
+ 9,
+ new Envelope(0,99, 0, 99),
+ "MULTIPOINT ((10 60), (20 61), (30 60))");
+ }
+
+ public void testSnapToNearest() {
+ testQueryRepeated("MULTIPOINT ( (10 60), (20 60), (16 60))",
+ 5,
+ new Envelope(0,99, 0, 99),
+ "MULTIPOINT ( (10 60), (20 60), (20 60))");
+ }
+
+ private void testQuery(String wktInput, double tolerance,
+ Envelope queryEnv, String wktExpected) {
+ KdTree index = build(wktInput, tolerance);
+ testQuery(
+ index,
+ queryEnv, false,
+ IOUtil.read(wktExpected).getCoordinates());
+ }
+
+ private void testQueryRepeated(String wktInput, double tolerance,
+ Envelope queryEnv, String wktExpected) {
+ KdTree index = build(wktInput, tolerance);
+ testQuery(
+ index,
+ queryEnv, true,
+ IOUtil.read(wktExpected).getCoordinates());
+ }
+
+ private void testQuery(KdTree index,
+ Envelope queryEnv, Coordinate[] expectedCoord) {
+ Coordinate[] result = KdTree.toCoordinates(index.query(queryEnv));
+
+ Arrays.sort(result);
+ Arrays.sort(expectedCoord);
+
+ assertTrue("Result count = " + result.length + ", expected count = " + expectedCoord.length,
+ result.length == expectedCoord.length);
+
+ boolean isMatch = CoordinateArrays.equals(result, expectedCoord);
+ assertTrue("Expected result coordinates not found", isMatch);
+ }
+
+ private void testQuery(KdTree index,
+ Envelope queryEnv, boolean includeRepeated, Coordinate[] expectedCoord) {
+ Coordinate[] result = KdTree.toCoordinates(index.query(queryEnv), includeRepeated);
+
+ Arrays.sort(result);
+ Arrays.sort(expectedCoord);
+
+ assertTrue("Result count = " + result.length + ", expected count = " + expectedCoord.length,
+ result.length == expectedCoord.length);
+
+ boolean isMatch = CoordinateArrays.equals(result, expectedCoord);
+ assertTrue("Expected result coordinates not found", isMatch);
+ }
+
+ private KdTree build(String wktInput, double tolerance) {
+ final KdTree index = new KdTree(tolerance);
+ Coordinate[] coords = IOUtil.read(wktInput).getCoordinates();
+ for (int i = 0; i < coords.length; i++) {
+ index.insert(coords[i]);
+ }
+ return index;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/quadtree/DoubleBitsTest.java b/modules/core/src/test/java/org/locationtech/jts/index/quadtree/DoubleBitsTest.java
new file mode 100644
index 0000000..4632cf6
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/quadtree/DoubleBitsTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.quadtree;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests DoubleBits
+ * @version 1.7
+ */
+public class DoubleBitsTest extends TestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(DoubleBitsTest.class);
+ }
+
+ public DoubleBitsTest(String name) { super(name); }
+
+ public void testExponent() throws Exception
+ {
+ assertTrue(DoubleBits.exponent(-1) == 0);
+ assertTrue(DoubleBits.exponent(8.0) == 3);
+ assertTrue(DoubleBits.exponent(128.0) == 7);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/quadtree/IsEmptyTest.java b/modules/core/src/test/java/org/locationtech/jts/index/quadtree/IsEmptyTest.java
new file mode 100644
index 0000000..50a99fc
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/quadtree/IsEmptyTest.java
@@ -0,0 +1,33 @@
+package org.locationtech.jts.index.quadtree;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.SpatialIndexTester;
+
+public class IsEmptyTest extends TestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(IsEmptyTest.class);
+ }
+
+ public IsEmptyTest(String name) {
+ super(name);
+ }
+
+ public void testSpatialIndex()
+ throws Exception
+ {
+ Quadtree index = new Quadtree();
+ assertTrue(index.size() == 0);
+ assertTrue(index.isEmpty());
+
+ index.insert(new Envelope(0,0,1,1), "test");
+ assertTrue(index.size() == 1);
+ assertTrue(!index.isEmpty());
+
+ index.remove(new Envelope(0,0,1,1), "test");
+ assertTrue(index.size() == 0);
+ assertTrue(index.isEmpty());
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/quadtree/QuadtreeTest.java b/modules/core/src/test/java/org/locationtech/jts/index/quadtree/QuadtreeTest.java
new file mode 100644
index 0000000..6c38f9f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/quadtree/QuadtreeTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.index.quadtree;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.SpatialIndexTester;
+
+import test.jts.util.SerializationUtil;
+
+public class QuadtreeTest extends TestCase {
+ public static void main(String args[]) {
+ TestRunner.run(QuadtreeTest.class);
+ }
+
+ public QuadtreeTest(String name) {
+ super(name);
+ }
+
+ public void testSpatialIndex()
+ throws Exception
+ {
+ SpatialIndexTester tester = new SpatialIndexTester();
+ tester.setSpatialIndex(new Quadtree());
+ tester.init();
+ tester.run();
+ assertTrue(tester.isSuccess());
+ }
+
+ public void testSerialization()
+ throws Exception
+ {
+ SpatialIndexTester tester = new SpatialIndexTester();
+ tester.setSpatialIndex(new Quadtree());
+ tester.init();
+ Quadtree tree = (Quadtree) tester.getSpatialIndex();
+ byte[] data = SerializationUtil.serialize(tree);
+ tree = (Quadtree) SerializationUtil.deserialize(data);
+ tester.setSpatialIndex(tree);
+ tester.run();
+ assertTrue(tester.isSuccess());
+ }
+
+ @SuppressWarnings("rawtypes")
+ public void testNullQuery() {
+ Quadtree qt = new Quadtree();
+ List result1 = qt.query(null);
+ assertTrue(result1.size() == 0);
+
+ qt.insert(new Envelope(0, 10, 0, 10), "some data");
+ List result2 = qt.query(null);
+ assertTrue(result2.size() == 0);
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/strtree/GeometryDistanceComparator.java b/modules/core/src/test/java/org/locationtech/jts/index/strtree/GeometryDistanceComparator.java
new file mode 100644
index 0000000..5e5ac9a
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/strtree/GeometryDistanceComparator.java
@@ -0,0 +1,70 @@
+
+/*
+ * Copyright (c) 2017 Jia Yu.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * The Class GeometryDistanceComparator.
+ */
+public class GeometryDistanceComparator implements Comparator<Geometry>, Serializable{
+
+ /** The normal order. */
+ boolean normalOrder;
+
+ /** The query center. */
+ Point queryCenter;
+
+ /**
+ * Instantiates a new Geometry distance comparator.
+ *
+ * @param queryCenter the query center
+ * @param normalOrder The true means puts the least record at the head of this queue. peek() will get the least element. Vice versa.
+ */
+ public GeometryDistanceComparator(Point queryCenter, boolean normalOrder)
+ {
+ this.queryCenter = queryCenter;
+ this.normalOrder = normalOrder;
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ */
+ public int compare(Geometry g1, Geometry g2) {
+ double distance1 = g1.getEnvelopeInternal().distance(this.queryCenter.getEnvelopeInternal());
+ double distance2 = g2.getEnvelopeInternal().distance(this.queryCenter.getEnvelopeInternal());
+ if(this.normalOrder)
+ {
+ if (distance1 > distance2) {
+ return 1;
+ } else if (distance1 == distance2) {
+ return 0;
+ }
+ return -1;
+ }
+ else
+ {
+ if (distance1 > distance2) {
+ return -1;
+ } else if (distance1 == distance2) {
+ return 0;
+ }
+ return 1;
+ }
+
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/strtree/IntervalTest.java b/modules/core/src/test/java/org/locationtech/jts/index/strtree/IntervalTest.java
new file mode 100644
index 0000000..a795043
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/strtree/IntervalTest.java
@@ -0,0 +1,68 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class IntervalTest extends TestCase {
+
+ public IntervalTest(String Name_) {
+ super(Name_);
+ }
+
+ public static void main(String[] args) {
+ String[] testCaseName = {IntervalTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ public void testIntersectsBasic() {
+ assertTrue(new Interval(5, 10).intersects(new Interval(7, 12)));
+ assertTrue(new Interval(7, 12).intersects(new Interval(5, 10)));
+ assertTrue(! new Interval(5, 10).intersects(new Interval(11, 12)));
+ assertTrue(! new Interval(11, 12).intersects(new Interval(5, 10)));
+ assertTrue(new Interval(5, 10).intersects(new Interval(10, 12)));
+ assertTrue(new Interval(10, 12).intersects(new Interval(5, 10)));
+ }
+
+ public void testIntersectsZeroWidthInterval() {
+ assertTrue(new Interval(10, 10).intersects(new Interval(7, 12)));
+ assertTrue(new Interval(7, 12).intersects(new Interval(10, 10)));
+ assertTrue(! new Interval(10, 10).intersects(new Interval(11, 12)));
+ assertTrue(! new Interval(11, 12).intersects(new Interval(10, 10)));
+ assertTrue(new Interval(10, 10).intersects(new Interval(10, 12)));
+ assertTrue(new Interval(10, 12).intersects(new Interval(10, 10)));
+ }
+
+ public void testCopyConstructor() {
+ assertEquals(new Interval(3, 4), new Interval(3, 4));
+ assertEquals(new Interval(3, 4), new Interval(new Interval(3, 4)));
+ }
+
+ public void testGetCentre() {
+ assertEquals(6.5, new Interval(4, 9).getCentre(), 1E-10);
+ }
+
+ public void testExpandToInclude() {
+ assertEquals(new Interval(3, 8), new Interval(3, 4)
+ .expandToInclude(new Interval(7, 8)));
+ assertEquals(new Interval(3, 7), new Interval(3, 7)
+ .expandToInclude(new Interval(4, 5)));
+ assertEquals(new Interval(3, 8), new Interval(3, 7)
+ .expandToInclude(new Interval(4, 8)));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/strtree/SIRtreeTest.java b/modules/core/src/test/java/org/locationtech/jts/index/strtree/SIRtreeTest.java
new file mode 100644
index 0000000..d5114c6
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/strtree/SIRtreeTest.java
@@ -0,0 +1,67 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class SIRtreeTest extends TestCase {
+ public SIRtreeTest(String Name_) {
+ super(Name_);
+ }
+
+ public static void main(String[] args) {
+ String[] testCaseName = {SIRtreeTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ private static class TestTree extends SIRtree {
+ public TestTree(int nodeCapacity) { super(nodeCapacity); }
+ public AbstractNode getRoot() { return super.getRoot(); }
+ protected List boundablesAtLevel(int level) { return super.boundablesAtLevel(level); }
+ }
+
+ public void test() {
+ TestTree t = new TestTree(2);
+ t.insert(2, 6, "A");
+ t.insert(2, 4, "B");
+ t.insert(2, 3, "C");
+ t.insert(2, 4, "D");
+ t.insert(0, 1, "E");
+ t.insert(2, 4, "F");
+ t.insert(5, 6, "G");
+ t.build();
+ assertEquals(2, t.getRoot().getLevel());
+ assertEquals(4, t.boundablesAtLevel(0).size());
+ assertEquals(2, t.boundablesAtLevel(1).size());
+ assertEquals(1, t.boundablesAtLevel(2).size());
+ assertEquals(1, t.query(0.5, 0.5).size());
+ assertEquals(0, t.query(1.5, 1.5).size());
+ assertEquals(2, t.query(4.5, 5.5).size());
+ }
+
+ public void testEmptyTree() {
+ TestTree t = new TestTree(2);
+ t.build();
+ assertEquals(0, t.getRoot().getLevel());
+ assertEquals(1, t.boundablesAtLevel(0).size());
+ assertEquals(0, t.boundablesAtLevel(1).size());
+ assertEquals(0, t.boundablesAtLevel(-1).size());
+ assertEquals(0, t.query(0.5, 0.5).size());
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/index/strtree/STRtreeTest.java b/modules/core/src/test/java/org/locationtech/jts/index/strtree/STRtreeTest.java
new file mode 100644
index 0000000..299a397
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/index/strtree/STRtreeTest.java
@@ -0,0 +1,256 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.strtree;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+
+import junit.framework.TestCase;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.index.ItemVisitor;
+import org.locationtech.jts.index.SpatialIndexTester;
+import org.locationtech.jts.util.AssertionFailedException;
+
+import test.jts.index.STRtreeDemo;
+import test.jts.util.SerializationUtil;
+
+
+
+/**
+ * @version 1.7
+ */
+public class STRtreeTest extends TestCase {
+ private GeometryFactory factory = new GeometryFactory();
+
+ public STRtreeTest(String Name_) {
+ super(Name_);
+ }
+
+ public static void main(String[] args) {
+ String[] testCaseName = {STRtreeTest.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ public void testEmptyTreeUsingListQuery()
+ {
+ STRtree tree = new STRtree();
+ List list = tree.query(new Envelope(0, 0, 1, 1));
+ assertTrue(list.isEmpty());
+ }
+
+ public void testEmptyTreeUsingItemVisitorQuery()
+ {
+ STRtree tree = new STRtree();
+ tree.query(new Envelope(0,0,1,1), new ItemVisitor() {
+ public void visitItem(Object item) {
+ assertTrue("Should never reach here", true);
+ }
+ });
+ }
+
+ public void testCreateParentsFromVerticalSlice() {
+ doTestCreateParentsFromVerticalSlice(3, 2, 2, 1);
+ doTestCreateParentsFromVerticalSlice(4, 2, 2, 2);
+ doTestCreateParentsFromVerticalSlice(5, 2, 2, 1);
+ }
+
+ public void testSpatialIndex()
+ throws Exception
+ {
+ SpatialIndexTester tester = new SpatialIndexTester();
+ tester.setSpatialIndex(new STRtree(4));
+ tester.init();
+ tester.run();
+ assertTrue(tester.isSuccess());
+ }
+
+ public void testSerialization()
+ throws Exception
+ {
+ SpatialIndexTester tester = new SpatialIndexTester();
+ tester.setSpatialIndex(new STRtree(4));
+ tester.init();
+
+ STRtree tree = (STRtree) tester.getSpatialIndex();
+ // create the index before serialization
+ tree.query(new Envelope());
+
+ byte[] data = SerializationUtil.serialize(tree);
+ tree = (STRtree) SerializationUtil.deserialize(data);
+
+ tester.setSpatialIndex(tree);
+ tester.run();
+ assertTrue(tester.isSuccess());
+ }
+
+ public void testDisallowedInserts() {
+ STRtree t = new STRtree(5);
+ t.insert(new Envelope(0, 0, 0, 0), new Object());
+ t.insert(new Envelope(0, 0, 0, 0), new Object());
+ t.query(new Envelope());
+ try {
+ t.insert(new Envelope(0, 0, 0, 0), new Object());
+ assertTrue(false);
+ }
+ catch (AssertionFailedException e) {
+ assertTrue(true);
+ }
+ }
+
+ public void testQuery() throws Throwable {
+ ArrayList geometries = new ArrayList();
+ geometries.add(factory.createLineString(new Coordinate[]{
+ new Coordinate(0, 0), new Coordinate(10, 10)}));
+ geometries.add(factory.createLineString(new Coordinate[]{
+ new Coordinate(20, 20), new Coordinate(30, 30)}));
+ geometries.add(factory.createLineString(new Coordinate[]{
+ new Coordinate(20, 20), new Coordinate(30, 30)}));
+ STRtreeDemo.TestTree t = new STRtreeDemo.TestTree(4);
+ for (Iterator i = geometries.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ t.insert(g.getEnvelopeInternal(), new Object());
+ }
+ t.build();
+ try {
+ assertEquals(1, t.query(new Envelope(5, 6, 5, 6)).size());
+ assertEquals(0, t.query(new Envelope(20, 30, 0, 10)).size());
+ assertEquals(2, t.query(new Envelope(25, 26, 25, 26)).size());
+ assertEquals(3, t.query(new Envelope(0, 100, 0, 100)).size());
+ }
+ catch (Throwable x) {
+ STRtreeDemo.printSourceData(geometries, System.out);
+ STRtreeDemo.printLevels(t, System.out);
+ throw x;
+ }
+ }
+
+ public void testVerticalSlices() {
+ doTestVerticalSlices(3, 2, 2, 1);
+ doTestVerticalSlices(4, 2, 2, 2);
+ doTestVerticalSlices(5, 3, 2, 1);
+ }
+
+ public void testRemove() {
+ STRtree tree = new STRtree();
+ tree.insert(new Envelope(0, 10, 0, 10), "1");
+ tree.insert(new Envelope(5, 15, 5, 15), "2");
+ tree.insert(new Envelope(10, 20, 10, 20), "3");
+ tree.insert(new Envelope(15, 25, 15, 25), "4");
+ tree.remove(new Envelope(10, 20, 10, 20), "4");
+ assertEquals(3, tree.size());
+ }
+
+ public void testKNearestNeighbors() {
+ int topK = 1000;
+ int totalRecords = 10000;
+ GeometryFactory geometryFactory = new GeometryFactory();
+ Coordinate coordinate = new Coordinate(10.1,-10.1);
+ Point queryCenter = geometryFactory.createPoint(coordinate);
+ int valueRange = 1000;
+ List<Geometry> testDataset = new ArrayList<Geometry>();
+ List<Geometry> correctData = new ArrayList<Geometry>();
+ Random random = new Random();
+ GeometryDistanceComparator distanceComparator = new GeometryDistanceComparator(queryCenter,true);
+ /*
+ * Generate the random test data set
+ */
+ for(int i=0;i<totalRecords;i++)
+ {
+ coordinate = new Coordinate(-100+random.nextInt(valueRange)*1.1,random.nextInt(valueRange)*(-5.1));
+ Point spatialObject = geometryFactory.createPoint(coordinate);
+ testDataset.add(spatialObject);
+ }
+ /*
+ * Sort the original data set and make sure the elements are sorted in an ascending order
+ */
+ Collections.sort(testDataset,distanceComparator);
+ /*
+ * Get the correct top K
+ */
+ for(int i=0;i<topK;i++)
+ {
+ correctData.add(testDataset.get(i));
+ }
+
+ STRtree strtree = new STRtree();
+ for(int i=0;i<totalRecords;i++)
+ {
+ strtree.insert(testDataset.get(i).getEnvelopeInternal(), testDataset.get(i));
+ }
+ /*
+ * Shoot a random query to make sure the STR-Tree is built.
+ */
+ strtree.query(new Envelope(1+0.1,1+0.1,2+0.1,2+0.1));
+ /*
+ * Issue the KNN query.
+ */
+ Object[] testTopK = (Object[])strtree.nearestNeighbour(queryCenter.getEnvelopeInternal(), queryCenter, new GeometryItemDistance(), topK);
+ List topKList = Arrays.asList(testTopK);
+ Collections.sort(topKList,distanceComparator);
+ /*
+ * Check the difference between correct result and test result. The difference should be 0.
+ */
+ int difference = 0;
+ for(int i = 0;i<topK;i++)
+ {
+ if(distanceComparator.compare(correctData.get(i), (Geometry)topKList.get(i))!=0)
+ {
+ difference++;
+ }
+ }
+ assertEquals(difference,0);
+ }
+
+ private void doTestCreateParentsFromVerticalSlice(int childCount,
+ int nodeCapacity, int expectedChildrenPerParentBoundable,
+ int expectedChildrenOfLastParent) {
+ STRtreeDemo.TestTree t = new STRtreeDemo.TestTree(nodeCapacity);
+ List parentBoundables
+ = t.createParentBoundablesFromVerticalSlice(itemWrappers(childCount), 0);
+ for (int i = 0; i < parentBoundables.size() - 1; i++) {//-1
+ AbstractNode parentBoundable = (AbstractNode) parentBoundables.get(i);
+ assertEquals(expectedChildrenPerParentBoundable, parentBoundable.getChildBoundables().size());
+ }
+ AbstractNode lastParent = (AbstractNode) parentBoundables.get(parentBoundables.size() - 1);
+ assertEquals(expectedChildrenOfLastParent, lastParent.getChildBoundables().size());
+ }
+
+ private void doTestVerticalSlices(int itemCount, int sliceCount,
+ int expectedBoundablesPerSlice, int expectedBoundablesOnLastSlice) {
+ STRtreeDemo.TestTree t = new STRtreeDemo.TestTree(2);
+ List[] slices =
+ t.verticalSlices(itemWrappers(itemCount), sliceCount);
+ assertEquals(sliceCount, slices.length);
+ for (int i = 0; i < sliceCount - 1; i++) {//-1
+ assertEquals(expectedBoundablesPerSlice, slices[i].size());
+ }
+ assertEquals(expectedBoundablesOnLastSlice, slices[sliceCount - 1].size());
+ }
+
+ private List itemWrappers(int size) {
+ ArrayList itemWrappers = new ArrayList();
+ for (int i = 0; i < size; i++) {
+ itemWrappers.add(new ItemBoundable(new Envelope(0, 0, 0, 0), new Object()));
+ }
+ return itemWrappers;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/SerializabilityTest.java b/modules/core/src/test/java/org/locationtech/jts/io/SerializabilityTest.java
new file mode 100644
index 0000000..4a68a0a
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/SerializabilityTest.java
@@ -0,0 +1,49 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+public class SerializabilityTest
+extends TestCase
+{
+
+ static GeometryFactory fact = new GeometryFactory();
+
+ public static void main(String args[]) {
+ TestRunner.run(SerializabilityTest.class);
+ }
+
+
+ public SerializabilityTest(String name) { super(name); }
+
+ public void testSerializable()
+ throws Exception
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+
+ GeometricShapeFactory gsf = new GeometricShapeFactory(fact);
+ Geometry g = gsf.createCircle();
+ oos.writeObject(g);
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/WKBReaderTest.java b/modules/core/src/test/java/org/locationtech/jts/io/WKBReaderTest.java
new file mode 100644
index 0000000..4dc40c1
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/WKBReaderTest.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import org.locationtech.jts.geom.CoordinateSequenceComparator;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests for reading WKB.
+ *
+ * @author Martin Davis
+ *
+ */
+public class WKBReaderTest extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(WKBReaderTest.class);
+ }
+
+ private GeometryFactory geomFactory = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(geomFactory);
+
+ public void testShortPolygons() throws ParseException
+ {
+ // one point
+ checkWKBGeometry("0000000003000000010000000140590000000000004069000000000000", "POLYGON ((100 200, 100 200, 100 200, 100 200))");
+ // two point
+ checkWKBGeometry("000000000300000001000000024059000000000000406900000000000040590000000000004069000000000000", "POLYGON ((100 200, 100 200, 100 200, 100 200))");
+ }
+
+ public WKBReaderTest(String name) { super(name); }
+
+ public void testSinglePointLineString() throws ParseException
+ {
+ checkWKBGeometry("00000000020000000140590000000000004069000000000000", "LINESTRING (100 200, 100 200)");
+ }
+
+ /**
+ * After removing the 39 bytes of MBR info at the front, and the
+ * end-of-geometry byte, * Spatialite native BLOB is very similar
+ * to WKB, except instead of a endian marker at the start of each
+ * geometry in a multi-geometry, it has a start marker of 0x69.
+ * Endianness is determined by the endian value of the multigeometry.
+ *
+ * @throws ParseException
+ */
+ public void testSpatialiteMultiGeometry() throws ParseException
+ {
+ //multipolygon
+ checkWKBGeometry("01060000000200000069030000000100000004000000000000000000444000000000000044400000000000003440000000000080464000000000008046400000000000003E4000000000000044400000000000004440690300000001000000040000000000000000003E40000000000000344000000000000034400000000000002E40000000000000344000000000000039400000000000003E400000000000003440",
+ "MULTIPOLYGON (((40 40, 20 45, 45 30, 40 40)), ((30 20, 20 15, 20 25, 30 20)))'");
+
+ //multipoint
+ checkWKBGeometry("0104000000020000006901000000000000000000F03F000000000000F03F690100000000000000000000400000000000000040",
+ "MULTIPOINT(1 1,2 2)'");
+
+ //multiline
+ checkWKBGeometry("010500000002000000690200000003000000000000000000244000000000000024400000000000003440000000000000344000000000000024400000000000004440690200000004000000000000000000444000000000000044400000000000003E400000000000003E40000000000000444000000000000034400000000000003E400000000000002440",
+ "MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))");
+
+ //geometrycollection
+ checkWKBGeometry(
+ "010700000002000000690100000000000000000010400000000000001840690200000002000000000000000000104000000000000018400000000000001C400000000000002440",
+ "GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))"
+ );
+ }
+
+ public void test2dSpatialiteWKB() throws ParseException {
+ // Point
+ checkWKBGeometry("0101000020E6100000000000000000F03F0000000000000040",
+ "POINT(1 2)");
+ // LineString
+ checkWKBGeometry("0102000020E610000002000000000000000000F03F000000000000004000000000000008400000000000001040",
+ "LINESTRING(1 2, 3 4)");
+ // Polygon
+ checkWKBGeometry("0103000020E61000000200000005000000000000000000000000000000000000000000000000000000000000000000244000000000000024400000000000002440000000000000244000000000000000000000000000000000000000000000000005000000000000000000F03F000000000000F03F000000000000F03F0000000000002240000000000000224000000000000022400000000000002240000000000000F03F000000000000F03F000000000000F03F",
+ "POLYGON((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,9 1,1 1))");
+ // MultiPoint
+ checkWKBGeometry("0104000020E61000000200000001010000000000000000000000000000000000F03F010100000000000000000000400000000000000840",
+ "MULTIPOINT(0 1,2 3)");
+ // MultiLineString
+ checkWKBGeometry("0105000020E6100000020000000102000000020000000000000000000000000000000000F03F000000000000004000000000000008400102000000020000000000000000001040000000000000144000000000000018400000000000001C40",
+ "MULTILINESTRING((0 1,2 3),(4 5,6 7))");
+ // MultiPolygon
+ checkWKBGeometry("0106000020E61000000200000001030000000200000005000000000000000000000000000000000000000000000000000000000000000000244000000000000024400000000000002440000000000000244000000000000000000000000000000000000000000000000005000000000000000000F03F000000000000F03F000000000000F03F0000000000002240000000000000224000000000000022400000000000002240000000000000F03F000000000000F03F000000000000F03F0103000000010000000500000000000000000022C0000000000000000000000000000022C00000000000002440 [...]
+ "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,9 1,1 1)),((-9 0,-9 10,-1 10,-1 0,-9 0)))");
+ // GeometryCollection
+ checkWKBGeometry("0107000020E61000000900000001010000000000000000000000000000000000F03F01010000000000000000000000000000000000F03F01010000000000000000000040000000000000084001020000000200000000000000000000400000000000000840000000000000104000000000000014400102000000020000000000000000000000000000000000F03F000000000000004000000000000008400102000000020000000000000000001040000000000000144000000000000018400000000000001C40010300000002000000050000000000000000000000000000000000000000000000000000 [...]
+ "GEOMETRYCOLLECTION(POINT(0 1),POINT(0 1),POINT(2 3),LINESTRING(2 3,4 5),LINESTRING(0 1,2 3),LINESTRING(4 5,6 7),POLYGON((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,9 1,1 1)),POLYGON((0 0,0 10,10 10,10 0,0 0),(1 1,1 9,9 9,9 1,1 1)),POLYGON((-9 0,-9 10,-1 10,-1 0,-9 0)))");
+ }
+
+ public void testSpatialiteWKB_Z() throws ParseException {
+ // PointZ
+ checkWKBGeometry("01010000A0E6100000000000000000F03F00000000000000400000000000000840",
+ "POINT Z(1 2 3)");
+ // LineStringZ
+ checkWKBGeometry("01020000A0E610000002000000000000000000F03F00000000000000400000000000000840000000000000104000000000000014400000000000001840",
+ "LINESTRING Z(1 2 3, 4 5 6)");
+ // PolygonZ
+ checkWKBGeometry("01030000A0E6100000020000000500000000000000000000000000000000000000000000000000594000000000000000000000000000002440000000000000594000000000000024400000000000002440000000000000594000000000000024400000000000000000000000000000594000000000000000000000000000000000000000000000594005000000000000000000F03F000000000000F03F0000000000005940000000000000F03F000000000000224000000000000059400000000000002240000000000000224000000000000059400000000000002240000000000000F03F000000000000 [...]
+ "POLYGON Z((0 0 100,0 10 100,10 10 100,10 0 100,0 0 100),(1 1 100,1 9 100,9 9 100,9 1 100,1 1 100))");
+ // MultiPointZ
+ checkWKBGeometry("01040000A0E61000000200000001010000800000000000000000000000000000F03F00000000000000400101000080000000000000084000000000000010400000000000001440",
+ "MULTIPOINTS Z(0 1 2, 3 4 5)");
+ // MultiLineStringZ
+ checkWKBGeometry("01050000A0E6100000020000000102000080020000000000000000000000000000000000F03F000000000000004000000000000008400000000000001040000000000000144001020000800200000000000000000018400000000000001C400000000000002040000000000000224000000000000024400000000000002640",
+ "MULTILINESTRING Z((0 1 2,3 4 5),(6 7 8,9 10 11))");
+ // MultiPolygonZ
+ checkWKBGeometry("01060000A0E6100000020000000103000080020000000500000000000000000000000000000000000000000000000000594000000000000000000000000000002440000000000000594000000000000024400000000000002440000000000000594000000000000024400000000000000000000000000000594000000000000000000000000000000000000000000000594005000000000000000000F03F000000000000F03F0000000000005940000000000000F03F0000000000002240000000000000594000000000000022400000000000002240000000000000594000000000000022400000000000 [...]
+ "MULTIPOLYGON Z(((0 0 100,0 10 100,10 10 100,10 0 100,0 0 100),(1 1 100,1 9 100,9 9 100,9 1 100,1 1 100)),((-9 0 50,-9 10 50,-1 10 50,-1 0 50,-9 0 50)))");
+ // GeometryCollectionZ
+ }
+
+
+ public void testSpatialiteWKB_M() throws ParseException {
+ // PointM
+ checkWKBGeometry("0101000060E6100000000000000000F03F00000000000000400000000000000840",
+ "POINT M(1 2 3)");
+ // LineStringM
+ checkWKBGeometry("0102000060E610000002000000000000000000F03F00000000000000400000000000000840000000000000104000000000000014400000000000001840",
+ "LINESTRING M(1 2 3,4 5 6)");
+ // PolygonM
+ checkWKBGeometry("0103000060E6100000020000000500000000000000000000000000000000000000000000000000594000000000000000000000000000002440000000000000594000000000000024400000000000002440000000000000594000000000000024400000000000000000000000000000594000000000000000000000000000000000000000000000594005000000000000000000F03F000000000000F03F0000000000005940000000000000F03F000000000000224000000000000059400000000000002240000000000000224000000000000059400000000000002240000000000000F03F000000000000 [...]
+ "POLYGON M((0 0 100,0 10 100,10 10 100,10 0 100,0 0 100),(1 1 100,1 9 100,9 9 100,9 1 100,1 1 100))");
+ // MultiPointM
+ checkWKBGeometry("01040000A0E61000000200000001010000800000000000000000000000000000F03F00000000000000400101000080000000000000084000000000000010400000000000001440",
+ "MULTIPOINT M(0 1 2,3 4 5)");
+ // MultiLineStringM
+ checkWKBGeometry("0105000060E6100000020000000102000040020000000000000000000000000000000000F03F000000000000004000000000000008400000000000001040000000000000144001020000400200000000000000000018400000000000001C400000000000002040000000000000224000000000000024400000000000002640",
+ "MULTILINESTRING M((0 1 2,3 4 5),(6 7 8,9 10 11))");
+ // MultiPolygonM
+ checkWKBGeometry("0106000060E6100000020000000103000040020000000500000000000000000000000000000000000000000000000000594000000000000000000000000000002440000000000000594000000000000024400000000000002440000000000000594000000000000024400000000000000000000000000000594000000000000000000000000000000000000000000000594005000000000000000000F03F000000000000F03F0000000000005940000000000000F03F0000000000002240000000000000594000000000000022400000000000002240000000000000594000000000000022400000000000 [...]
+ "MULTIPOLYGON M(((0 0 100,0 10 100,10 10 100,10 0 100,0 0 100),(1 1 100,1 9 100,9 9 100,9 1 100,1 1 100)),((-9 0 50,-9 10 50,-1 10 50,-1 0 50,-9 0 50)))");
+ // GeometryCollectionM
+ //checkWKBGeometry("0107000020E61000000900000001010000000000000000000000000000000000F03F01010000000000000000000000000000000000F03F01010000000000000000000040000000000000084001020000000200000000000000000000400000000000000840000000000000104000000000000014400102000000020000000000000000000000000000000000F03F000000000000004000000000000008400102000000020000000000000000001040000000000000144000000000000018400000000000001C400103000000020000000500000000000000000000000000000000000000000000000000 [...]
+ // "MULTIPOLYGONM(((0 0 100,0 10 100,10 10 100,10 0 100,0 0 100),(1 1 100,1 9 100,9 9 100,9 1 100,1 1 100)),((-9 0 50,-9 10 50,-1 10 50,-1 0 50,-9 0 50)))");
+ }
+
+ public void testSpatialiteWKB_ZM() throws ParseException {
+ // PointZM
+ checkWKBGeometry("01010000E0E6100000000000000000F03F000000000000004000000000000008400000000000006940",
+ "POINT ZM (1 2 3 200)");
+ // LineStringZM
+ checkWKBGeometry("01020000E0E610000002000000000000000000F03F0000000000000040000000000000084000000000000069400000000000001040000000000000144000000000000018400000000000006940",
+ "LINESTRING ZM (1 2 3 200,4 5 6 200)");
+ // PolygonZM
+ checkWKBGeometry("01030000E0E610000002000000050000000000000000000000000000000000000000000000000059400000000000006940000000000000000000000000000024400000000000005940000000000000694000000000000024400000000000002440000000000000594000000000000069400000000000002440000000000000000000000000000059400000000000006940000000000000000000000000000000000000000000005940000000000000694005000000000000000000F03F000000000000F03F00000000000059400000000000006940000000000000F03F0000000000002240000000000000 [...]
+ "POLYGON ZM ((0 0 100 200,0 10 100 200,10 10 100 200,10 0 100 200,0 0 100 200),(1 1 100 200,1 9 100 200,9 9 100 200,9 1 100 200,1 1 100 200))");
+ // MultiPointZM
+ checkWKBGeometry("01040000E0E61000000200000001010000C00000000000000000000000000000F03F0000000000000040000000000000694001010000C00000000000000840000000000000104000000000000014400000000000006940",
+ "MULTIPOINT ZM (0 1 2 200,3 4 5 200)");
+ // MultiLineStringZM
+ checkWKBGeometry("01050000E0E61000000200000001020000C0020000000000000000000000000000000000F03F00000000000000400000000000006940000000000000084000000000000010400000000000001440000000000000694001020000C00200000000000000000018400000000000001C40000000000000204000000000000069400000000000002240000000000000244000000000000026400000000000006940",
+ "MULTILINESTRING ZM ((0 1 2 200,3 4 5 200),(6 7 8 200,9 10 11 200))");
+ // MultiPolygonZM
+ checkWKBGeometry("01060000E0E61000000200000001030000C002000000050000000000000000000000000000000000000000000000000059400000000000006940000000000000000000000000000024400000000000005940000000000000694000000000000024400000000000002440000000000000594000000000000069400000000000002440000000000000000000000000000059400000000000006940000000000000000000000000000000000000000000005940000000000000694005000000000000000000F03F000000000000F03F00000000000059400000000000006940000000000000F03F0000000000 [...]
+ "MULTIPOLYGON ZM (((0 0 100 200,0 10 100 200,10 10 100 200,10 0 100 200,0 0 100 200),(1 1 100 200,1 9 100 200,9 9 100 200,9 1 100 200,1 1 100 200)),((-9 0 50 200,-9 10 50 200,-1 10 50 200,-1 0 50 200,-9 0 50 200)))");
+ // GeometryCollectionZM
+ //checkWKBGeometry("0107000020E61000000900000001010000000000000000000000000000000000F03F01010000000000000000000000000000000000F03F01010000000000000000000040000000000000084001020000000200000000000000000000400000000000000840000000000000104000000000000014400102000000020000000000000000000000000000000000F03F000000000000004000000000000008400102000000020000000000000000001040000000000000144000000000000018400000000000001C400103000000020000000500000000000000000000000000000000000000000000000000 [...]
+ // "MULTIPOLYGONM(((0 0 100,0 10 100,10 10 100,10 0 100,0 0 100),(1 1 100,1 9 100,9 9 100,9 1 100,1 1 100)),((-9 0 50,-9 10 50,-1 10 50,-1 0 50,-9 0 50)))");
+ }
+
+ /**
+ * Not yet implemented satisfactorily.
+ *
+ * @throws ParseException
+ */
+ public void XXtestIllFormedWKB() throws ParseException
+ {
+ // WKB is missing LinearRing entry
+ checkWKBGeometry("00000000030000000140590000000000004069000000000000", "POLYGON ((100 200, 100 200, 100 200, 100 200)");
+ }
+
+
+ private static CoordinateSequenceComparator comp2 = new CoordinateSequenceComparator(2);
+
+ private void checkWKBGeometry(String wkbHex, String expectedWKT) throws ParseException
+ {
+ WKBReader wkbReader = new WKBReader(geomFactory);
+ byte[] wkb = WKBReader.hexToBytes(wkbHex);
+ Geometry g2 = wkbReader.read(wkb);
+
+ Geometry expected = rdr.read(expectedWKT);
+
+ boolean isEqual = (expected.compareTo(g2, comp2) == 0);
+ if (!isEqual) {System.out.println(g2);System.out.println(expected);}
+ assertTrue(isEqual);
+
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/WKBTest.java b/modules/core/src/test/java/org/locationtech/jts/io/WKBTest.java
new file mode 100644
index 0000000..1cb616c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/WKBTest.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.CoordinateSequenceComparator;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests the {@link WKBReader} and {@link WKBWriter}.
+ * Tests all geometries with both 2 and 3 dimensions and both byte orderings.
+ */
+public class WKBTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(WKBTest.class);
+ }
+
+ private GeometryFactory geomFactory = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(geomFactory);
+
+ public WKBTest(String name)
+ {
+ super(name);
+ }
+
+ public void testFirst()
+ throws IOException, ParseException
+ {
+ runWKBTest("MULTIPOINT ((0 0), (1 4), (100 200))");
+ }
+
+ public void testPointPCS() throws IOException, ParseException {
+ runWKBTestPackedCoordinate("POINT (1 2)");
+ }
+
+ public void testPoint() throws IOException, ParseException {
+ runWKBTest("POINT (1 2)");
+ }
+
+ public void testLineString()
+ throws IOException, ParseException
+ {
+ runWKBTest("LINESTRING (1 2, 10 20, 100 200)");
+ }
+ public void testPolygon()
+ throws IOException, ParseException
+ {
+ runWKBTest("POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0))");
+ }
+ public void testPolygonWithHole()
+ throws IOException, ParseException
+ {
+ runWKBTest("POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0), (1 1, 1 10, 10 10, 10 1, 1 1) )");
+ }
+ public void testMultiPoint()
+ throws IOException, ParseException
+ {
+ runWKBTest("MULTIPOINT ((0 0), (1 4), (100 200))");
+ }
+ public void testMultiLineString()
+ throws IOException, ParseException
+ {
+ runWKBTest("MULTILINESTRING ((0 0, 1 10), (10 10, 20 30), (123 123, 456 789))");
+ }
+ public void testMultiPolygon()
+ throws IOException, ParseException
+ {
+ runWKBTest("MULTIPOLYGON ( ((0 0, 100 0, 100 100, 0 100, 0 0), (1 1, 1 10, 10 10, 10 1, 1 1) ), ((200 200, 200 250, 250 250, 250 200, 200 200)) )");
+ }
+
+ public void testGeometryCollection()
+ throws IOException, ParseException
+ {
+ runWKBTest("GEOMETRYCOLLECTION ( POINT ( 1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0)) )");
+ }
+
+ public void testNestedGeometryCollection()
+ throws IOException, ParseException
+ {
+ runWKBTest("GEOMETRYCOLLECTION ( POINT (20 20), GEOMETRYCOLLECTION ( POINT ( 1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 100 0, 100 100, 0 100, 0 0)) ) )");
+ }
+ public void testLineStringEmpty()
+ throws IOException, ParseException
+ {
+ runWKBTest("LINESTRING EMPTY");
+ }
+
+ public void testBigPolygon()
+ throws IOException, ParseException
+ {
+ GeometricShapeFactory shapeFactory = new GeometricShapeFactory(geomFactory);
+ shapeFactory.setBase(new Coordinate(0,0));
+ shapeFactory.setSize(1000);
+ shapeFactory.setNumPoints(1000);
+ Geometry geom = shapeFactory.createRectangle();
+ runWKBTest(geom, 2, false);
+ }
+
+ public void testPolygonEmpty()
+ throws IOException, ParseException
+ {
+ runWKBTest("POLYGON EMPTY");
+ }
+ public void testMultiPointEmpty()
+ throws IOException, ParseException
+ {
+ runWKBTest("MULTIPOINT EMPTY");
+ }
+ public void testMultiLineStringEmpty()
+ throws IOException, ParseException
+ {
+ runWKBTest("MULTILINESTRING EMPTY");
+ }
+ public void testMultiPolygonEmpty()
+ throws IOException, ParseException
+ {
+ runWKBTest("MULTIPOLYGON EMPTY");
+ }
+ public void testGeometryCollectionEmpty()
+ throws IOException, ParseException
+ {
+ runWKBTest("GEOMETRYCOLLECTION EMPTY");
+ }
+
+ private void runWKBTest(String wkt) throws IOException, ParseException
+ {
+ runWKBTestCoordinateArray(wkt);
+ runWKBTestPackedCoordinate(wkt);
+ }
+
+ private void runWKBTestPackedCoordinate(String wkt) throws IOException, ParseException {
+ GeometryFactory geomFactory = new GeometryFactory(
+ new PackedCoordinateSequenceFactory(PackedCoordinateSequenceFactory.DOUBLE, 2));
+ WKTReader rdr = new WKTReader(geomFactory);
+ Geometry g = rdr.read(wkt);
+
+ // Since we are using a PCS of dim=2, only check 2-dimensional storage
+ runWKBTest(g, 2, true);
+ runWKBTest(g, 2, false);
+ }
+
+ private void runWKBTestCoordinateArray(String wkt) throws IOException, ParseException {
+ GeometryFactory geomFactory = new GeometryFactory();
+ WKTReader rdr = new WKTReader(geomFactory);
+ Geometry g = rdr.read(wkt);
+
+ // CoordinateArrays support dimension 3, so test both dimensions
+ runWKBTest(g, 2, true);
+ runWKBTest(g, 2, false);
+ runWKBTest(g, 3, true);
+ runWKBTest(g, 3, false);
+ }
+
+ private void runWKBTest(Geometry g, int dimension, boolean toHex)
+ throws IOException, ParseException
+ {
+ setZ(g);
+ runWKBTest(g, dimension, ByteOrderValues.LITTLE_ENDIAN, toHex);
+ runWKBTest(g, dimension, ByteOrderValues.BIG_ENDIAN, toHex);
+ }
+
+ private void runWKBTest(Geometry g, int dimension, int byteOrder, boolean toHex)
+ throws IOException, ParseException
+ {
+ runGeometry(g, dimension, byteOrder, toHex, 100);
+ runGeometry(g, dimension, byteOrder, toHex, 0);
+ runGeometry(g, dimension, byteOrder, toHex, 101010);
+ runGeometry(g, dimension, byteOrder, toHex, -1);
+ }
+
+ private void setZ(Geometry g)
+ {
+ g.apply(new AverageZFilter());
+ }
+
+ //static Comparator comp2D = new Coordinate.DimensionalComparator();
+ //static Comparator comp3D = new Coordinate.DimensionalComparator(3);
+
+ static CoordinateSequenceComparator comp2 = new CoordinateSequenceComparator(2);
+ static CoordinateSequenceComparator comp3 = new CoordinateSequenceComparator(3);
+
+ /**
+ * Use single WKB reader, to ensure it can be used for multiple input geometries
+ */
+ WKBReader wkbReader = new WKBReader(geomFactory);
+
+ void runGeometry(Geometry g, int dimension, int byteOrder, boolean toHex, int srid)
+ throws IOException, ParseException
+ {
+ boolean includeSRID = false;
+ if (srid >= 0) {
+ includeSRID = true;
+ g.setSRID(srid);
+ }
+
+ WKBWriter wkbWriter = new WKBWriter(dimension, byteOrder, includeSRID);
+ byte[] wkb = wkbWriter.write(g);
+ String wkbHex = null;
+ if (toHex)
+ wkbHex = WKBWriter.toHex(wkb);
+
+ if (toHex)
+ wkb = WKBReader.hexToBytes(wkbHex);
+ Geometry g2 = wkbReader.read(wkb);
+
+ CoordinateSequenceComparator comp = (dimension == 2) ? comp2 : comp3;
+ boolean isEqual = (g.compareTo(g2, comp) == 0);
+ assertTrue(isEqual);
+
+ if (includeSRID) {
+ boolean isSRIDEqual = g.getSRID() == g2.getSRID();
+ assertTrue(isSRIDEqual);
+ }
+ }
+}
+
+class AverageZFilter implements CoordinateFilter
+{
+ public void filter(Coordinate coord)
+ {
+ coord.z = (coord.x + coord.y) / 2;
+ }
+}
+
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/WKBWriterTest.java b/modules/core/src/test/java/org/locationtech/jts/io/WKBWriterTest.java
new file mode 100644
index 0000000..277f382
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/WKBWriterTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+
+import junit.framework.TestCase;
+
+public class WKBWriterTest extends TestCase {
+
+ public WKBWriterTest(String name) {
+ super(name);
+ }
+
+ public void testSRID() throws Exception {
+ GeometryFactory gf = new GeometryFactory();
+ Point p1 = gf.createPoint(new Coordinate(1,2));
+ p1.setSRID(1234);
+
+ //first write out without srid set
+ WKBWriter w = new WKBWriter();
+ byte[] wkb = w.write(p1);
+
+ //check the 3rd bit of the second byte, should be unset
+ byte b = (byte) (wkb[1] & 0x20);
+ assertEquals(0, b);
+
+ //read geometry back in
+ WKBReader r = new WKBReader(gf);
+ Point p2 = (Point) r.read(wkb);
+
+ assertTrue(p1.equalsExact(p2));
+ assertEquals(0, p2.getSRID());
+
+ //not write out with srid set
+ w = new WKBWriter(2, true);
+ wkb = w.write(p1);
+
+ //check the 3rd bit of the second byte, should be set
+ b = (byte) (wkb[1] & 0x20);
+ assertEquals(0x20, b);
+
+ int srid = ((int) (wkb[5] & 0xff) << 24) | ( (int) (wkb[6] & 0xff) << 16)
+ | ( (int) (wkb[7] & 0xff) << 8) | (( int) (wkb[8] & 0xff) );
+
+ assertEquals(1234, srid);
+
+ r = new WKBReader(gf);
+ p2 = (Point) r.read(wkb);
+
+ //read the geometry back in
+ assertTrue(p1.equalsExact(p2));
+ assertEquals(1234, p2.getSRID());
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderExpTest.java b/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderExpTest.java
new file mode 100644
index 0000000..d76fe21
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderExpTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * Tests the {@link WKTReader} with exponential notation.
+ */
+public class WKTReaderExpTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(WKTReaderExpTest.class);
+ }
+
+ private GeometryFactory fact = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(fact);
+
+ public WKTReaderExpTest(String name)
+ {
+ super(name);
+ }
+
+ public void testGoodBasicExp() throws IOException, ParseException
+ {
+ readGoodCheckCoordinate("POINT ( 1e01 -1E02)", 1E01, -1E02);
+ }
+
+ public void testGoodWithExpSign() throws IOException, ParseException
+ {
+ readGoodCheckCoordinate("POINT ( 1e-04 1E-05)", 1e-04, 1e-05);
+ }
+
+ public void testBadExpFormat() throws IOException, ParseException
+ {
+ readBad("POINT (1e0a1 1X02)");
+ }
+
+ public void testBadExpPlusSign() throws IOException, ParseException
+ {
+ readBad("POINT (1e+01 1X02)");
+ }
+
+ public void testBadPlusSign() throws IOException, ParseException
+ {
+ readBad("POINT ( +1e+01 1X02)");
+ }
+
+ private void readGoodCheckCoordinate(String wkt, double x, double y)
+ throws IOException, ParseException
+ {
+ Geometry g = rdr.read(wkt);
+ Coordinate pt = g.getCoordinate();
+ assertEquals(pt.x, x, 0.0001);
+ assertEquals(pt.y, y, 0.0001);
+ }
+
+ private void readBad(String wkt)
+ throws IOException
+ {
+ boolean threwParseEx = false;
+ try {
+ Geometry g = rdr.read(wkt);
+ }
+ catch (ParseException ex) {
+ System.out.println(ex.getMessage());
+ threwParseEx = true;
+ }
+ assertTrue(threwParseEx);
+ }
+}
+
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderParseErrorTest.java b/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderParseErrorTest.java
new file mode 100644
index 0000000..c9ab9d1
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderParseErrorTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * Tests the {@link WKTReader} with various errors
+ */
+public class WKTReaderParseErrorTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(WKTReaderParseErrorTest.class);
+ }
+
+ private GeometryFactory fact = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(fact);
+
+ public WKTReaderParseErrorTest(String name)
+ {
+ super(name);
+ }
+
+ public void testExtraLParen() throws IOException, ParseException
+ {
+ readBad("POINT (( 1e01 -1E02)");
+ }
+
+ public void testMissingOrdinate() throws IOException, ParseException
+ {
+ readBad("POINT ( 1e01 )");
+ }
+
+ public void testBadChar() throws IOException, ParseException
+ {
+ readBad("POINT ( # 1e-04 1E-05)");
+ }
+
+ public void testBadExpFormat() throws IOException, ParseException
+ {
+ readBad("POINT (1e0a1 1X02)");
+ }
+
+ public void testBadExpPlusSign() throws IOException, ParseException
+ {
+ readBad("POINT (1e+01 1X02)");
+ }
+
+ public void testBadPlusSign() throws IOException, ParseException
+ {
+ readBad("POINT ( +1e+01 1X02)");
+ }
+
+ private void readBad(String wkt)
+ throws IOException
+ {
+ boolean threwParseEx = false;
+ try {
+ Geometry g = rdr.read(wkt);
+ }
+ catch (ParseException ex) {
+ System.out.println(ex.getMessage());
+ threwParseEx = true;
+ }
+ assertTrue(threwParseEx);
+ }
+}
+
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderTest.java b/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderTest.java
new file mode 100644
index 0000000..79ba27e
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/WKTReaderTest.java
@@ -0,0 +1,149 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.io;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.PrecisionModel;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test for {@link WKTReader}
+ *
+ * @version 1.7
+ */
+public class WKTReaderTest extends TestCase {
+
+ WKTWriter writer = new WKTWriter();
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(suite());
+ }
+
+ public WKTReaderTest(String name) { super(name); }
+
+ public static Test suite() { return new TestSuite(WKTReaderTest.class); }
+
+ public void testReadNaN() throws Exception {
+ assertEquals("POINT (10 10)", writer.write(reader.read("POINT (10 10 NaN)")));
+ assertEquals("POINT (10 10)", writer.write(reader.read("POINT (10 10 nan)")));
+ assertEquals("POINT (10 10)", writer.write(reader.read("POINT (10 10 NAN)")));
+}
+
+ public void testReadPoint() throws Exception {
+ assertEquals("POINT (10 10)", writer.write(reader.read("POINT (10 10)")));
+ assertEquals("POINT EMPTY", writer.write(reader.read("POINT EMPTY")));
+}
+
+ public void testReadLineString() throws Exception {
+ assertEquals("LINESTRING (10 10, 20 20, 30 40)", writer.write(reader.read("LINESTRING (10 10, 20 20, 30 40)")));
+ assertEquals("LINESTRING EMPTY", writer.write(reader.read("LINESTRING EMPTY")));
+ }
+
+ public void testReadLinearRing() throws Exception {
+ try {
+ reader.read("LINEARRING (10 10, 20 20, 30 40, 10 99)");
+ }
+ catch (IllegalArgumentException e) {
+ assertTrue(e.getMessage().indexOf("not form a closed linestring") > -1);
+ }
+ assertEquals("LINEARRING (10 10, 20 20, 30 40, 10 10)", writer.write(reader.read("LINEARRING (10 10, 20 20, 30 40, 10 10)")));
+ assertEquals("LINEARRING EMPTY", writer.write(reader.read("LINEARRING EMPTY")));
+ }
+
+ public void testReadPolygon() throws Exception {
+ assertEquals("POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", writer.write(reader.read("POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))")));
+ assertEquals("POLYGON EMPTY", writer.write(reader.read("POLYGON EMPTY")));
+ }
+
+ public void testReadMultiPoint() throws Exception {
+ assertEquals("MULTIPOINT ((10 10), (20 20))", writer.write(reader.read("MULTIPOINT ((10 10), (20 20))")));
+ assertEquals("MULTIPOINT EMPTY", writer.write(reader.read("MULTIPOINT EMPTY")));
+ }
+
+ public void testReadMultiLineString() throws Exception {
+ assertEquals("MULTILINESTRING ((10 10, 20 20), (15 15, 30 15))", writer.write(reader.read("MULTILINESTRING ((10 10, 20 20), (15 15, 30 15))")));
+ assertEquals("MULTILINESTRING EMPTY", writer.write(reader.read("MULTILINESTRING EMPTY")));
+ }
+
+ public void testReadMultiPolygon() throws Exception {
+ assertEquals("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))", writer.write(reader.read("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))")));
+ assertEquals("MULTIPOLYGON EMPTY", writer.write(reader.read("MULTIPOLYGON EMPTY")));
+ }
+
+ public void testReadGeometryCollection() throws Exception {
+ assertEquals("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))", writer.write(reader.read("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))")));
+ assertEquals("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING EMPTY, LINESTRING (15 15, 20 20))", writer.write(reader.read("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING EMPTY, LINESTRING (15 15, 20 20))")));
+ assertEquals("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING (10 10, 20 20, 30 40, 10 10), LINESTRING (15 15, 20 20))", writer.write(reader.read("GEOMETRYCOLLECTION (POINT (10 10), LINEARRING (10 10, 20 20, 30 40, 10 10), LINESTRING (15 15, 20 20))")));
+ assertEquals("GEOMETRYCOLLECTION EMPTY", writer.write(reader.read("GEOMETRYCOLLECTION EMPTY")));
+ }
+
+ public void testReadPointZM() throws Exception {
+ assertEquals(new Coordinate(1, 2, 3), reader.read("POINT(1 2 3)").getCoordinate());
+ assertEquals(new Coordinate(1, 2, 3), reader.read("POINTZ(1 2 3)").getCoordinate());
+ assertEquals(new Coordinate(1, 2, 3), reader.read("POINT Z(1 2 3)").getCoordinate());
+ assertEquals(new Coordinate(1, 2, 3), reader.read("POINTM(1 2 3)").getCoordinate());
+ assertEquals(new Coordinate(1, 2, 3), reader.read("POINT M(1 2 3)").getCoordinate());
+ assertEquals(new Coordinate(1, 2, 3), reader.read("POINTZM(1 2 3 4)").getCoordinate());
+ assertEquals(new Coordinate(1, 2, 3), reader.read("POINT ZM(1 2 3 4)").getCoordinate());
+ assertEquals(new Coordinate(1, 2, 3), reader.read("Point Zm(1 2 3 4)").getCoordinate());
+ }
+
+ public void testReadLineStringZM() throws Exception {
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LINESTRING(1 2 3, 4 5 6)").getCoordinates()[1]);
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LINESTRINGZ(1 2 3, 4 5 6)").getCoordinates()[1]);
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LINESTRING Z(1 2 3, 4 5 6)").getCoordinates()[1]);
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LINESTRINGM(1 2 3, 4 5 6)").getCoordinates()[1]);
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LINESTRING M(1 2 3, 4 5 6)").getCoordinates()[1]);
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LINESTRINGZM(1 2 3 10, 4 5 6 10)").getCoordinates()[1]);
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LINESTRING ZM(1 2 3 10, 4 5 6 10)").getCoordinates()[1]);
+ assertEquals(new Coordinate(4, 5, 6), reader.read("LineString Zm(1 2 3 10, 4 5 6 10)").getCoordinates()[1]);
+ }
+
+ public void testReadPolygonZM() throws Exception {
+ assertEquals(new Coordinate(7, 8, 9), reader.read("POLYGON((1 2 3, 4 5 6, 7 8 9, 1 2 3))").getCoordinates()[2]);
+ assertEquals(new Coordinate(7, 8, 9), reader.read("POLYGONZ((1 2 3, 4 5 6, 7 8 9, 1 2 3))").getCoordinates()[2]);
+ assertEquals(new Coordinate(7, 8, 9), reader.read("POLYGON Z((1 2 3, 4 5 6, 7 8 9, 1 2 3))").getCoordinates()[2]);
+ assertEquals(new Coordinate(7, 8, 9), reader.read("POLYGONM((1 2 3, 4 5 6, 7 8 9, 1 2 3))").getCoordinates()[2]);
+ assertEquals(new Coordinate(7, 8, 9), reader.read("POLYGON M((1 2 3, 4 5 6, 7 8 9, 1 2 3))").getCoordinates()[2]);
+ assertEquals(new Coordinate(7, 8, 9), reader.read("POLYGONZM((1 2 3 10, 4 5 6 11, 7 8 9 12, 1 2 3 13))").getCoordinates()[2]);
+ assertEquals(new Coordinate(7, 8, 9), reader.read("POLYGON ZM((1 2 3 10, 4 5 6 11, 7 8 9 12, 1 2 3 13))").getCoordinates()[2]);
+ assertEquals(new Coordinate(7, 8, 9), reader.read("Polygon Zm((1 2 3 10, 4 5 6 11, 7 8 9 12, 1 2 3 13))").getCoordinates()[2]);
+ }
+
+ public void testReadMultiPolygonZM() throws Exception {
+ assertEquals(new Coordinate(7, 8, 9), reader.read("MultiPolygon Zm(((1 2 3 10, 4 5 6 11, 7 8 9 12, 1 2 3 13)))").getCoordinates()[2]);
+ }
+
+ public void testReadLargeNumbers() throws Exception {
+ PrecisionModel precisionModel = new PrecisionModel(1E9);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+ Geometry point1 = reader.read("POINT (123456789.01234567890 10)");
+ Point point2 = geometryFactory.createPoint(new Coordinate(123456789.01234567890, 10));
+ assertEquals(point1.getCoordinate().x, point2.getCoordinate().x, 1E-7);
+ assertEquals(point1.getCoordinate().y, point2.getCoordinate().y, 1E-7);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/WKTWriterTest.java b/modules/core/src/test/java/org/locationtech/jts/io/WKTWriterTest.java
new file mode 100644
index 0000000..ca4bd62
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/WKTWriterTest.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.io;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test for {@link WKTWriter}.
+ *
+ * @version 1.7
+ */
+public class WKTWriterTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTWriter writer = new WKTWriter();
+ WKTWriter writer3D = new WKTWriter(3);
+
+ public static void main(String args[]) {
+ TestRunner.run(suite());
+ }
+
+ public WKTWriterTest(String name) { super(name); }
+
+ public static Test suite() { return new TestSuite(WKTWriterTest.class); }
+
+ public void testWritePoint() {
+ Point point = geometryFactory.createPoint(new Coordinate(10, 10));
+ assertEquals("POINT (10 10)", writer.write(point).toString());
+ }
+
+ public void testWriteLineString() {
+ Coordinate[] coordinates = { new Coordinate(10, 10, 0),
+ new Coordinate(20, 20, 0),
+ new Coordinate(30, 40, 0) };
+ LineString lineString = geometryFactory.createLineString(coordinates);
+ assertEquals("LINESTRING (10 10, 20 20, 30 40)", writer.write(lineString).toString());
+ }
+
+ public void testWritePolygon() throws Exception {
+ Coordinate[] coordinates = { new Coordinate(10, 10, 0),
+ new Coordinate(10, 20, 0),
+ new Coordinate(20, 20, 0),
+ new Coordinate(20, 15, 0),
+ new Coordinate(10, 10, 0) };
+ LinearRing linearRing = geometryFactory.createLinearRing(coordinates);
+ Polygon polygon = geometryFactory.createPolygon(linearRing, new LinearRing[] { });
+ assertEquals("POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", writer.write(polygon).toString());
+ }
+
+ public void testWriteMultiPoint() {
+ Point[] points = { geometryFactory.createPoint(new Coordinate(10, 10, 0)),
+ geometryFactory.createPoint(new Coordinate(20, 20, 0)) };
+ MultiPoint multiPoint = geometryFactory.createMultiPoint(points);
+ assertEquals("MULTIPOINT ((10 10), (20 20))", writer.write(multiPoint).toString());
+ }
+
+ public void testWriteMultiLineString() {
+ Coordinate[] coordinates1 = { new Coordinate(10, 10, 0),
+ new Coordinate(20, 20, 0) };
+ LineString lineString1 = geometryFactory.createLineString(coordinates1);
+ Coordinate[] coordinates2 = { new Coordinate(15, 15, 0),
+ new Coordinate(30, 15, 0) };
+ LineString lineString2 = geometryFactory.createLineString(coordinates2);
+ LineString[] lineStrings = {lineString1, lineString2};
+ MultiLineString multiLineString = geometryFactory.createMultiLineString(lineStrings);
+ assertEquals("MULTILINESTRING ((10 10, 20 20), (15 15, 30 15))", writer.write(multiLineString).toString());
+ }
+
+ public void testWriteMultiPolygon() throws Exception {
+ Coordinate[] coordinates1 = { new Coordinate(10, 10, 0),
+ new Coordinate(10, 20, 0),
+ new Coordinate(20, 20, 0),
+ new Coordinate(20, 15, 0),
+ new Coordinate(10, 10, 0) };
+ LinearRing linearRing1 = geometryFactory.createLinearRing(coordinates1);
+ Polygon polygon1 = geometryFactory.createPolygon(linearRing1, new LinearRing[] { });
+ Coordinate[] coordinates2 = { new Coordinate(60, 60, 0),
+ new Coordinate(70, 70, 0),
+ new Coordinate(80, 60, 0),
+ new Coordinate(60, 60, 0) };
+ LinearRing linearRing2 = geometryFactory.createLinearRing(coordinates2);
+ Polygon polygon2 = geometryFactory.createPolygon(linearRing2, new LinearRing[] { });
+ Polygon[] polygons = {polygon1, polygon2};
+ MultiPolygon multiPolygon = geometryFactory.createMultiPolygon(polygons);
+// System.out.println("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))");
+// System.out.println(writer.write(multiPolygon).toString());
+ assertEquals("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))", writer.write(multiPolygon).toString());
+ }
+
+ public void testWriteGeometryCollection() {
+ Point point1 = geometryFactory.createPoint(new Coordinate(10, 10));
+ Point point2 = geometryFactory.createPoint(new Coordinate(30, 30));
+ Coordinate[] coordinates = { new Coordinate(15, 15, 0),
+ new Coordinate(20, 20, 0) };
+ LineString lineString1 = geometryFactory.createLineString(coordinates);
+ Geometry[] geometries = {point1, point2, lineString1};
+ GeometryCollection geometryCollection = geometryFactory.createGeometryCollection(geometries);
+ assertEquals("GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))", writer.write(geometryCollection).toString());
+ }
+
+ public void testWriteLargeNumbers1() {
+ PrecisionModel precisionModel = new PrecisionModel(1E9);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ Point point1 = geometryFactory.createPoint(new Coordinate(123456789012345678d, 10E9));
+ assertEquals("POINT (123456789012345680 10000000000)", point1.toText());
+ }
+
+ public void testWriteLargeNumbers2() {
+ PrecisionModel precisionModel = new PrecisionModel(1E9);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ Point point1 = geometryFactory.createPoint(new Coordinate(1234d, 10E9));
+ assertEquals("POINT (1234 10000000000)", point1.toText());
+ }
+
+ public void testWriteLargeNumbers3() {
+ PrecisionModel precisionModel = new PrecisionModel(1E9);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ Point point1 = geometryFactory.createPoint(new Coordinate(123456789012345678000000E9d, 10E9));
+ assertEquals("POINT (123456789012345690000000000000000 10000000000)", point1.toText());
+ }
+
+ public void testWrite3D() {
+ GeometryFactory geometryFactory = new GeometryFactory();
+ Point point = geometryFactory.createPoint(new Coordinate(1, 1, 1));
+ String wkt = writer3D.write(point);
+ assertEquals("POINT (1 1 1)", wkt);
+ }
+
+ public void testWrite3D_withNaN() {
+ GeometryFactory geometryFactory = new GeometryFactory();
+ Coordinate[] coordinates = { new Coordinate(1, 1),
+ new Coordinate(2, 2, 2) };
+ LineString line = geometryFactory.createLineString(coordinates);
+ String wkt = writer3D.write(line);
+ assertEquals("LINESTRING (1 1, 2 2 2)", wkt);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/GMLReaderTestCase.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/GMLReaderTestCase.java
new file mode 100644
index 0000000..49d7801
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/GMLReaderTestCase.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.FileReader;
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.xml.sax.SAXException;
+
+import junit.framework.TestCase;
+
+public class GMLReaderTestCase extends TestCase
+{
+
+ private static final String TEST_DIR = "bin/data/";
+
+ public GMLReaderTestCase(String arg0) {
+ super(arg0);
+ // TODO Auto-generated constructor stub
+ }
+
+ protected static PrecisionModel precisionModel = new PrecisionModel(1000);
+ protected static GeometryFactory geometryFactory = new GeometryFactory(precisionModel);
+
+ public void testPointRead() throws SAXException, IOException, ParserConfigurationException{
+ FileReader fr = new FileReader(TEST_DIR + "points.xml");
+
+ GMLReader gr = new GMLReader();
+ Geometry g = gr.read(fr,geometryFactory);
+
+ GeometryCollection gc = (GeometryCollection)g;
+ assertTrue(gc.getNumGeometries() == 25);
+
+ for(int i=0;i<25;i++){
+ Point p = (Point) gc.getGeometryN(i);
+ assertNotNull(p);
+ }
+ }
+
+ public void testLineStringRead() throws SAXException, IOException, ParserConfigurationException{
+ FileReader fr = new FileReader(TEST_DIR + "linestrings.xml");
+
+ GMLReader gr = new GMLReader();
+ Geometry g = gr.read(fr,geometryFactory);
+
+ GeometryCollection gc = (GeometryCollection)g;
+ assertTrue(gc.getNumGeometries() == 25);
+
+ for(int i=0;i<25;i++){
+ LineString ls = (LineString) gc.getGeometryN(i);
+ assertNotNull(ls);
+ }
+ }
+
+ public void testPolygonRead() throws SAXException, IOException, ParserConfigurationException{
+ FileReader fr = new FileReader(TEST_DIR + "polygons.xml");
+
+ GMLReader gr = new GMLReader();
+ Geometry g = gr.read(fr,geometryFactory);
+
+ GeometryCollection gc = (GeometryCollection)g;
+ assertTrue(gc.getNumGeometries() == 25);
+
+ for(int i=0;i<25;i++){
+ Polygon p = (Polygon) gc.getGeometryN(i);
+ assertNotNull(p);
+ }
+ }
+
+ public void testMultiPointRead() throws SAXException, IOException, ParserConfigurationException{
+ FileReader fr = new FileReader(TEST_DIR + "multipoints.xml");
+
+ GMLReader gr = new GMLReader();
+ Geometry g = gr.read(fr,geometryFactory);
+
+ GeometryCollection gc = (GeometryCollection)g;
+ assertTrue(gc.getNumGeometries() == 25);
+
+ for(int i=0;i<25;i++){
+ MultiPoint p = (MultiPoint) gc.getGeometryN(i);
+ assertNotNull(p);
+ }
+ }
+
+ public void testMultiLineStringRead() throws SAXException, IOException, ParserConfigurationException{
+ FileReader fr = new FileReader(TEST_DIR + "multilinestrings.xml");
+
+ GMLReader gr = new GMLReader();
+ Geometry g = gr.read(fr,geometryFactory);
+
+ GeometryCollection gc = (GeometryCollection)g;
+ assertTrue(gc.getNumGeometries() == 25);
+
+ for(int i=0;i<25;i++){
+ MultiLineString ls = (MultiLineString) gc.getGeometryN(i);
+ assertNotNull(ls);
+ }
+ }
+
+ public void testMultiPolygonRead() throws SAXException, IOException, ParserConfigurationException{
+ FileReader fr = new FileReader(TEST_DIR + "multipolygons.xml");
+
+ GMLReader gr = new GMLReader();
+ Geometry g = gr.read(fr,geometryFactory);
+
+ GeometryCollection gc = (GeometryCollection)g;
+ assertTrue(gc.getNumGeometries() == 25);
+
+ for(int i=0;i<25;i++){
+ MultiPolygon p = (MultiPolygon) gc.getGeometryN(i);
+ assertNotNull(p);
+ }
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticLineStringTest.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticLineStringTest.java
new file mode 100644
index 0000000..6028f09
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticLineStringTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.generator.LineStringGenerator;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineString;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Round trip testing for GML reading and writing.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class StaticLineStringTest extends WritingTestCase {
+
+ /**
+ * @param arg
+ */
+ public StaticLineStringTest(String arg) {
+ super(arg);
+ }
+
+ /**
+ * Round Trip test for a single line string
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleLineStringRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ LineStringGenerator pg = new LineStringGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberPoints(10);
+
+ LineString pt = (LineString) pg.create();
+
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single line string with lots of points
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleLineStringManyPointRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ LineStringGenerator pg = new LineStringGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setGenerationAlgorithm(LineStringGenerator.HORZ);
+ pg.setNumberPoints(1000);
+
+ LineString pt = (LineString) pg.create();
+
+ checkRoundTrip(pt);
+ }
+}
+
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiLineStringTest.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiLineStringTest.java
new file mode 100644
index 0000000..53cde1f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiLineStringTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.generator.LineStringGenerator;
+import org.locationtech.jts.generator.MultiGenerator;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.MultiLineString;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Round trip testing for GML reading and writing.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class StaticMultiLineStringTest extends WritingTestCase {
+
+ /**
+ * @param arg
+ */
+ public StaticMultiLineStringTest(String arg) {
+ super(arg);
+ }
+
+ /**
+ * Round Trip test for a single line string
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleMultiLineStringRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ LineStringGenerator pgc = new LineStringGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ pgc.setNumberPoints(10);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiLineString pt = (MultiLineString) pg.create();
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single line string with lots of points
+ * @throws IOException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ */
+ public void testSingleMultiLineStringManyPointRoundTrip() throws IOException, SAXException, ParserConfigurationException{
+
+ LineStringGenerator pgc = new LineStringGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ pgc.setNumberPoints(1000);
+ pgc.setGenerationAlgorithm(LineStringGenerator.HORZ);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiLineString pt = (MultiLineString) pg.create();
+ checkRoundTrip(pt);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiPointTest.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiPointTest.java
new file mode 100644
index 0000000..41d50dd
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiPointTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.generator.MultiGenerator;
+import org.locationtech.jts.generator.PointGenerator;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.MultiPoint;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Round trip testing for GML reading and writing.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class StaticMultiPointTest extends WritingTestCase {
+
+ /**
+ * @param arg
+ */
+ public StaticMultiPointTest(String arg) {
+ super(arg);
+ }
+
+ /**
+ * Round Trip test for a single MultiPoint
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleMultiPointRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ PointGenerator pgc = new PointGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiPoint pt = (MultiPoint) pg.create();
+ checkRoundTrip(pt);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiPolygonTest.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiPolygonTest.java
new file mode 100644
index 0000000..3f38c5d
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticMultiPolygonTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.generator.MultiGenerator;
+import org.locationtech.jts.generator.PolygonGenerator;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Round trip testing for GML reading and writing.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class StaticMultiPolygonTest extends WritingTestCase {
+
+ /**
+ * @param arg
+ */
+ public StaticMultiPolygonTest(String arg) {
+ super(arg);
+ }
+
+ /**
+ * Round Trip test for a single MultiPolygon
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleMultiPolygonNoHoleRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ PolygonGenerator pgc = new PolygonGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ pgc.setNumberPoints(10);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiPolygon pt = (MultiPolygon) pg.create();
+
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single MultiPolygon with lots of points
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleMultiPolygonManyPointsNoHoleRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+
+ PolygonGenerator pgc = new PolygonGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ pgc.setGenerationAlgorithm(PolygonGenerator.BOX);
+ pgc.setNumberPoints(1000);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiPolygon pt = (MultiPolygon) pg.create();
+
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single MultiPolygon
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleMultiPolygonHolesRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+
+ PolygonGenerator pgc = new PolygonGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ pgc.setGenerationAlgorithm(PolygonGenerator.BOX);
+ pgc.setNumberPoints(10);
+ pgc.setNumberHoles(4);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiPolygon pt = (MultiPolygon) pg.create();
+
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single MultiPolygon with lots of points
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleMultiPolygonManyPointsHolesRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+
+ PolygonGenerator pgc = new PolygonGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ pgc.setGenerationAlgorithm(PolygonGenerator.BOX);
+ pgc.setNumberPoints(1000);
+ pgc.setNumberHoles(4);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiPolygon pt = (MultiPolygon) pg.create();
+// System.out.println((pt==null?"NULL":pt.toString()));
+
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single MultiPolygon with lots of points
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSingleMultiPolygonManyPointsManyHolesRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+
+ PolygonGenerator pgc = new PolygonGenerator();
+ pgc.setGeometryFactory(geometryFactory);
+ pgc.setGenerationAlgorithm(PolygonGenerator.BOX);
+ pgc.setNumberPoints(100);
+ pgc.setNumberHoles(100);
+ MultiGenerator pg = new MultiGenerator(pgc);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberGeometries(3);
+ pg.setGeometryFactory(geometryFactory);
+
+ MultiPolygon pt = (MultiPolygon) pg.create();
+// System.out.println((pt==null?"NULL":pt.toString()));
+
+ checkRoundTrip(pt);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticPointTest.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticPointTest.java
new file mode 100644
index 0000000..f101c73
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticPointTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.generator.PointGenerator;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Point;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Round trip testing for GML reading and writing.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class StaticPointTest extends WritingTestCase {
+
+ /**
+ * @param arg
+ */
+ public StaticPointTest(String arg) {
+ super(arg);
+ }
+
+ /**
+ * Round Trip test for a single point
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSinglePointRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ PointGenerator pg = new PointGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+
+ Point pt = (Point) pg.create();
+ checkRoundTrip(pt);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticPolygonTest.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticPolygonTest.java
new file mode 100644
index 0000000..5513d56
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/StaticPolygonTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.generator.PolygonGenerator;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Polygon;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Round trip testing for GML reading and writing.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ */
+public class StaticPolygonTest extends WritingTestCase {
+
+ /**
+ * @param arg
+ */
+ public StaticPolygonTest(String arg) {
+ super(arg);
+ }
+
+ /**
+ * Round Trip test for a single polygon
+ * @throws IOException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ */
+ public void testSinglePolygonNoHoleRoundTrip() throws IOException, SAXException, ParserConfigurationException{
+ PolygonGenerator pg = new PolygonGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberPoints(10);
+
+ Polygon pt = (Polygon) pg.create();
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single polygon with lots of points
+ * @throws IOException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ */
+ public void testSinglePolygonManyPointsNoHoleRoundTrip() throws IOException, SAXException, ParserConfigurationException{
+ PolygonGenerator pg = new PolygonGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setGenerationAlgorithm(PolygonGenerator.BOX);
+ pg.setNumberPoints(1000);
+
+ Polygon pt = (Polygon) pg.create();
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single polygon
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSinglePolygonHolesRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ PolygonGenerator pg = new PolygonGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setNumberPoints(10);
+ pg.setNumberHoles(4);
+
+ Polygon pt = (Polygon) pg.create();
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single polygon with lots of points
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSinglePolygonManyPointsHolesRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ PolygonGenerator pg = new PolygonGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setGenerationAlgorithm(PolygonGenerator.BOX);
+ pg.setNumberPoints(1000);
+ pg.setNumberHoles(4);
+
+ Polygon pt = (Polygon) pg.create();
+ checkRoundTrip(pt);
+ }
+
+ /**
+ * Round Trip test for a single polygon with lots of points
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void testSinglePolygonManyPointsManyHolesRoundTrip() throws SAXException, IOException, ParserConfigurationException{
+ PolygonGenerator pg = new PolygonGenerator();
+ pg.setGeometryFactory(geometryFactory);
+ pg.setBoundingBox(new Envelope(0,10,0,10));
+ pg.setGenerationAlgorithm(PolygonGenerator.BOX);
+ pg.setNumberPoints(100);
+ pg.setNumberHoles(100);
+
+ Polygon pt = (Polygon) pg.create();
+ checkRoundTrip(pt);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/WritingTestCase.java b/modules/core/src/test/java/org/locationtech/jts/io/gml2/WritingTestCase.java
new file mode 100644
index 0000000..24db2da
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/WritingTestCase.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.io.gml2;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.xml.sax.SAXException;
+
+import junit.framework.TestCase;
+
+/**
+ * Test Case framework for GML unit tests.
+ *
+ * @author David Zwiers, Vivid Solutions.
+ * @author Martin Davis
+ */
+public abstract class WritingTestCase extends TestCase
+{
+
+ /**
+ * @param arg
+ */
+ public WritingTestCase(String arg){
+ super(arg);
+ }
+
+ protected StringWriter sw = null;
+
+ protected Writer getWriter(){
+ sw = new StringWriter();
+ sw.write("<?xml version='1.0' encoding='UTF-8'?>\n");
+ return sw;
+ }
+ protected Reader getReader() throws IOException{
+ sw.flush();
+ sw.close();
+ String s = sw.toString();
+
+// System.out.println(s);
+
+ return new StringReader(s);
+ }
+
+ protected static PrecisionModel precisionModel = new PrecisionModel(1000);
+ protected static GeometryFactory geometryFactory = new GeometryFactory(precisionModel);
+
+ protected void checkRoundTrip(Geometry g)
+ throws SAXException, IOException, ParserConfigurationException
+ {
+ GMLWriter out = new GMLWriter();
+ out.setPrefix(null);
+ out.setNamespace(true);
+ out.setSrsName("foo");
+ // this markup is not currently work with GMLReader
+// out.setCustomElements(new String[] { "<test>1</test>" } );
+ out.write(g, getWriter());
+
+ //System.out.println(sw.toString());
+
+ GMLReader in = new GMLReader();
+ Geometry g2 = in.read(getReader(), geometryFactory);
+
+ // System.out.println((pt==null?"NULL":pt.toString()));
+ // System.out.println((pt2==null?"NULL":pt2.toString()));
+ assertTrue("The input Geometry is not the same as the output Geometry", g
+ .equalsExact(g2));
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/gml2/geometry.xsd b/modules/core/src/test/java/org/locationtech/jts/io/gml2/geometry.xsd
new file mode 100644
index 0000000..f2d3d43
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/gml2/geometry.xsd
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="2.1.2">
+ <annotation>
+ <appinfo>geometry.xsd v2.1.2 2002-07</appinfo>
+ <documentation xml:lang="en">
+ GML Geometry schema. Copyright (c) 2001,2002 OGC, All Rights Reserved.
+ </documentation>
+ </annotation>
+ <!-- bring in the XLink attributes -->
+ <import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlinks.xsd"/>
+ <!-- ==============================================================
+ global declarations
+ =================================================================== -->
+ <element name="_Geometry" type="gml:AbstractGeometryType" abstract="true"/>
+ <element name="_GeometryCollection" type="gml:GeometryCollectionType" abstract="true" substitutionGroup="gml:_Geometry"/>
+ <element name="geometryMember" type="gml:GeometryAssociationType"/>
+ <element name="pointMember" type="gml:PointMemberType" substitutionGroup="gml:geometryMember"/>
+ <element name="lineStringMember" type="gml:LineStringMemberType" substitutionGroup="gml:geometryMember"/>
+ <element name="polygonMember" type="gml:PolygonMemberType" substitutionGroup="gml:geometryMember"/>
+ <element name="outerBoundaryIs" type="gml:LinearRingMemberType"/>
+ <element name="innerBoundaryIs" type="gml:LinearRingMemberType"/>
+ <!-- primitive geometry elements -->
+ <element name="Point" type="gml:PointType" substitutionGroup="gml:_Geometry"/>
+ <element name="LineString" type="gml:LineStringType" substitutionGroup="gml:_Geometry"/>
+ <element name="LinearRing" type="gml:LinearRingType" substitutionGroup="gml:_Geometry"/>
+ <element name="Polygon" type="gml:PolygonType" substitutionGroup="gml:_Geometry"/>
+ <element name="Box" type="gml:BoxType"/>
+ <!-- aggregate geometry elements -->
+ <element name="MultiGeometry" type="gml:GeometryCollectionType" substitutionGroup="gml:_Geometry"/>
+ <element name="MultiPoint" type="gml:MultiPointType" substitutionGroup="gml:_Geometry"/>
+ <element name="MultiLineString" type="gml:MultiLineStringType" substitutionGroup="gml:_Geometry"/>
+ <element name="MultiPolygon" type="gml:MultiPolygonType" substitutionGroup="gml:_Geometry"/>
+ <!-- coordinate elements -->
+ <element name="coord" type="gml:CoordType"/>
+ <element name="coordinates" type="gml:CoordinatesType"/>
+ <!-- this attribute gives the location where an element is defined -->
+ <attribute name="remoteSchema" type="anyURI"/>
+ <!-- ==============================================================
+ abstract supertypes
+ =================================================================== -->
+ <complexType name="AbstractGeometryType" abstract="true">
+ <annotation>
+ <documentation>
+ All geometry elements are derived from this abstract supertype;
+ a geometry element may have an identifying attribute (gid).
+ It may be associated with a spatial reference system.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="anyType">
+ <attribute name="gid" type="ID" use="optional"/>
+ <attribute name="srsName" type="anyURI" use="optional"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <complexType name="AbstractGeometryCollectionBaseType" abstract="true">
+ <annotation>
+ <documentation>
+ This abstract base type for geometry collections just makes the
+ srsName attribute mandatory.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:AbstractGeometryType">
+ <attribute name="gid" type="ID" use="optional"/>
+ <attribute name="srsName" type="anyURI" use="required"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <attributeGroup name="AssociationAttributeGroup">
+ <annotation>
+ <documentation>
+ These attributes can be attached to any element, thus allowing it
+ to act as a pointer. The 'remoteSchema' attribute allows an element
+ that carries link attributes to indicate that the element is declared
+ in a remote schema rather than by the schema that constrains the
+ current document instance.
+ </documentation>
+ </annotation>
+ <attributeGroup ref="xlink:simpleLink"/>
+ <attribute ref="gml:remoteSchema" use="optional"/>
+ </attributeGroup>
+ <complexType name="GeometryAssociationType">
+ <annotation>
+ <documentation>
+ An instance of this type (e.g. a geometryMember) can either
+ enclose or point to a primitive geometry element. When serving
+ as a simple link that references a remote geometry instance,
+ the value of the gml:remoteSchema attribute can be used to
+ locate a schema fragment that constrains the target instance.
+ </documentation>
+ </annotation>
+ <sequence minOccurs="0">
+ <element ref="gml:_Geometry"/>
+ </sequence>
+ <!-- <attributeGroup ref="gml:AssociationAttributeGroup"/> -->
+ <attributeGroup ref="xlink:simpleLink"/>
+ <attribute ref="gml:remoteSchema" use="optional"/>
+ </complexType>
+ <complexType name="PointMemberType">
+ <annotation>
+ <documentation>Restricts the geometry member to being a Point instance.</documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:GeometryAssociationType">
+ <sequence minOccurs="0">
+ <element ref="gml:Point"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <complexType name="LineStringMemberType">
+ <annotation>
+ <documentation>Restricts the geometry member to being a LineString instance.</documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:GeometryAssociationType">
+ <sequence minOccurs="0">
+ <element ref="gml:LineString"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <complexType name="PolygonMemberType">
+ <annotation>
+ <documentation>Restricts the geometry member to being a Polygon instance.</documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:GeometryAssociationType">
+ <sequence minOccurs="0">
+ <element ref="gml:Polygon"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <complexType name="LinearRingMemberType">
+ <annotation>
+ <documentation>Restricts the outer or inner boundary of a polygon instance
+ to being a LinearRing.</documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:GeometryAssociationType">
+ <sequence minOccurs="0">
+ <element ref="gml:LinearRing"/>
+ </sequence>
+ <attributeGroup ref="gml:AssociationAttributeGroup"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <!-- ==============================================================
+ primitive geometry types
+ =================================================================== -->
+ <complexType name="PointType">
+ <annotation>
+ <documentation>
+ A Point is defined by a single coordinate tuple.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="gml:AbstractGeometryType">
+ <sequence>
+ <choice>
+ <element ref="gml:coord"/>
+ <element ref="gml:coordinates"/>
+ </choice>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="LineStringType">
+ <annotation>
+ <documentation>
+ A LineString is defined by two or more coordinate tuples, with
+ linear interpolation between them.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="gml:AbstractGeometryType">
+ <sequence>
+ <choice>
+ <element ref="gml:coord" minOccurs="2" maxOccurs="unbounded"/>
+ <element ref="gml:coordinates"/>
+ </choice>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="LinearRingType">
+ <annotation>
+ <documentation>
+ A LinearRing is defined by four or more coordinate tuples, with
+ linear interpolation between them; the first and last coordinates
+ must be coincident.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="gml:AbstractGeometryType">
+ <sequence>
+ <choice>
+ <element ref="gml:coord" minOccurs="4" maxOccurs="unbounded"/>
+ <element ref="gml:coordinates"/>
+ </choice>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="BoxType">
+ <annotation>
+ <documentation>
+ The Box structure defines an extent using a pair of coordinate tuples.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="gml:AbstractGeometryType">
+ <sequence>
+ <choice>
+ <element ref="gml:coord" minOccurs="2" maxOccurs="2"/>
+ <element ref="gml:coordinates"/>
+ </choice>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="PolygonType">
+ <annotation>
+ <documentation>
+ A Polygon is defined by an outer boundary and zero or more inner
+ boundaries which are in turn defined by LinearRings.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="gml:AbstractGeometryType">
+ <sequence>
+ <element ref="gml:outerBoundaryIs"/>
+ <element ref="gml:innerBoundaryIs" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <!-- ==============================================================
+ aggregate geometry types
+ =================================================================== -->
+ <complexType name="GeometryCollectionType">
+ <annotation>
+ <documentation>
+ A geometry collection must include one or more geometries, referenced
+ through geometryMember elements. User-defined geometry collections
+ that accept GML geometry classes as members must instantiate--or
+ derive from--this type.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="gml:AbstractGeometryCollectionBaseType">
+ <sequence>
+ <element ref="gml:geometryMember" maxOccurs="unbounded"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="MultiPointType">
+ <annotation>
+ <documentation>
+ A MultiPoint is defined by one or more Points, referenced through
+ pointMember elements.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:GeometryCollectionType">
+ <sequence>
+ <element ref="gml:pointMember" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="gid" type="ID" use="optional"/>
+ <attribute name="srsName" type="anyURI" use="required"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <complexType name="MultiLineStringType">
+ <annotation>
+ <documentation>
+ A MultiLineString is defined by one or more LineStrings, referenced
+ through lineStringMember elements.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:GeometryCollectionType">
+ <sequence>
+ <element ref="gml:lineStringMember" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="gid" type="ID" use="optional"/>
+ <attribute name="srsName" type="anyURI" use="required"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <complexType name="MultiPolygonType">
+ <annotation>
+ <documentation>
+ A MultiPolygon is defined by one or more Polygons, referenced through
+ polygonMember elements.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <restriction base="gml:GeometryCollectionType">
+ <sequence>
+ <element ref="gml:polygonMember" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="gid" type="ID" use="optional"/>
+ <attribute name="srsName" type="anyURI" use="required"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ <!-- ==============================================================
+ There are two ways to represent coordinates: (1) as a sequence
+ of <coord> elements that encapsulate tuples, or (2) using a
+ single <coordinates> string.
+ =================================================================== -->
+ <complexType name="CoordType">
+ <annotation>
+ <documentation>
+ Represents a coordinate tuple in one, two, or three dimensions.
+ </documentation>
+ </annotation>
+ <sequence>
+ <element name="X" type="decimal"/>
+ <element name="Y" type="decimal" minOccurs="0"/>
+ <element name="Z" type="decimal" minOccurs="0"/>
+ </sequence>
+ </complexType>
+ <complexType name="CoordinatesType">
+ <annotation>
+ <documentation>
+ Coordinates can be included in a single string, but there is no
+ facility for validating string content. The value of the 'cs' attribute
+ is the separator for coordinate values, and the value of the 'ts'
+ attribute gives the tuple separator (a single space by default); the
+ default values may be changed to reflect local usage.
+ </documentation>
+ </annotation>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="decimal" type="string" use="optional" default="."/>
+ <attribute name="cs" type="string" use="optional" default=","/>
+ <attribute name="ts" type="string" use="optional" default=" "/>
+ </extension>
+ </simpleContent>
+ </complexType>
+</schema>
diff --git a/modules/core/src/test/java/org/locationtech/jts/io/kml/KMLWriterTest.java b/modules/core/src/test/java/org/locationtech/jts/io/kml/KMLWriterTest.java
new file mode 100644
index 0000000..49105df
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/io/kml/KMLWriterTest.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.io.kml;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+public class KMLWriterTest extends TestCase
+{
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(KMLWriterTest.class);
+ }
+
+ public KMLWriterTest(String name) { super(name); }
+
+ public void testPoint()
+ {
+ checkEqual("POINT (1 1)",
+ "<Point><coordinates>1.0,1.0</coordinates></Point>");
+ }
+
+ public void testLine()
+ {
+ checkEqual("LINESTRING (1 1, 2 2)",
+ "<LineString><coordinates>1.0,1.0 2.0,2.0</coordinates></LineString>");
+ }
+
+ public void testPolygon()
+ {
+ checkEqual("POLYGON ((1 1, 2 1, 2 2, 1 2, 1 1))",
+ "<Polygon><outerBoundaryIs><LinearRing><coordinates>1.0,1.0 2.0,1.0 2.0,2.0 1.0,2.0 1.0,1.0</coordinates></LinearRing></outerBoundaryIs></Polygon>");
+ }
+
+ public void testPolygonWithHole()
+ {
+ checkEqual("POLYGON ((1 9, 9 9, 9 1, 1 1, 1 9), (2 8, 8 8, 8 2, 2 2, 2 8))",
+ "<Polygon><outerBoundaryIs><LinearRing><coordinates>1.0,9.0 9.0,9.0 9.0,1.0 1.0,1.0 1.0,9.0</coordinates></LinearRing></outerBoundaryIs><innerBoundaryIs><LinearRing><coordinates>2.0,8.0 8.0,8.0 8.0,2.0 2.0,2.0 2.0,8.0</coordinates></LinearRing></innerBoundaryIs></Polygon>");
+ }
+
+ public void testMultiPoint()
+ {
+ checkEqual("MULTIPOINT ((1 1), (2 2))",
+ "<MultiGeometry><Point><coordinates>1.0,1.0</coordinates></Point><Point><coordinates>2.0,2.0</coordinates></Point></MultiGeometry>");
+ }
+
+ public void testMultiLineString()
+ {
+ checkEqual("MULTILINESTRING ((2 9, 2 2), (5 5, 8 5))",
+ "<MultiGeometry><LineString><coordinates>2.0,9.0 2.0,2.0</coordinates></LineString><LineString><coordinates>5.0,5.0 8.0,5.0</coordinates></LineString></MultiGeometry>");
+ }
+
+ public void testMultiPolygon()
+ {
+ checkEqual("MULTIPOLYGON (((2 9, 5 9, 5 5, 2 5, 2 9)), ((6 4, 8 4, 8 2, 6 2, 6 4)))",
+ "<MultiGeometry><Polygon><outerBoundaryIs><LinearRing><coordinates>2.0,9.0 5.0,9.0 5.0,5.0 2.0,5.0 2.0,9.0</coordinates></LinearRing></outerBoundaryIs></Polygon><Polygon><outerBoundaryIs><LinearRing><coordinates>6.0,4.0 8.0,4.0 8.0,2.0 6.0,2.0 6.0,4.0</coordinates></LinearRing></outerBoundaryIs></Polygon></MultiGeometry>");
+ }
+
+ public void testGeometryCollection()
+ {
+ checkEqual("GEOMETRYCOLLECTION (LINESTRING (1 9, 1 2, 3 2), POLYGON ((3 9, 5 9, 5 7, 3 7, 3 9)), POINT (5 5))",
+ "<MultiGeometry><LineString><coordinates>1.0,9.0 1.0,2.0 3.0,2.0</coordinates></LineString><Polygon><outerBoundaryIs><LinearRing><coordinates>3.0,9.0 5.0,9.0 5.0,7.0 3.0,7.0 3.0,9.0</coordinates></LinearRing></outerBoundaryIs></Polygon><Point><coordinates>5.0,5.0</coordinates></Point></MultiGeometry>");
+ }
+
+ public void testExtrudeAltitudeLineString()
+ {
+ KMLWriter kmlWriter = new KMLWriter();
+ kmlWriter.setExtrude(true);
+ kmlWriter.setAltitudeMode(KMLWriter.ALTITUDE_MODE_ABSOLUTE);
+ checkEqual(kmlWriter, "LINESTRING (1 1, 2 2)",
+ "<LineString><extrude>1</extrude><altitudeMode>absolute</altitudeMode><coordinates>1.0,1.0 2.0,2.0</coordinates></LineString>");
+ }
+
+ public void testExtrudeTesselateLineString()
+ {
+ KMLWriter kmlWriter = new KMLWriter();
+ kmlWriter.setExtrude(true);
+ kmlWriter.setTesselate(true);
+ //kmlWriter.setAltitudeMode(KMLWriter.ALTITUDE_MODE_ABSOLUTE);
+ checkEqual(kmlWriter, "LINESTRING (1 1, 2 2)",
+ "<LineString><extrude>1</extrude><tesselate>1</tesselate><coordinates>1.0,1.0 2.0,2.0</coordinates></LineString>");
+ }
+
+ public void testExtrudeAltitudePolygon()
+ {
+ KMLWriter kmlWriter = new KMLWriter();
+ kmlWriter.setExtrude(true);
+ kmlWriter.setAltitudeMode(KMLWriter.ALTITUDE_MODE_ABSOLUTE);
+ checkEqual(kmlWriter, "POLYGON ((1 1, 2 1, 2 2, 1 2, 1 1))",
+ "<Polygon><extrude>1</extrude><altitudeMode>absolute</altitudeMode><outerBoundaryIs><LinearRing><coordinates>1.0,1.0 2.0,1.0 2.0,2.0 1.0,2.0 1.0,1.0</coordinates></LinearRing></outerBoundaryIs></Polygon>");
+ }
+
+ public void testExtrudeGeometryCollection()
+ {
+ KMLWriter kmlWriter = new KMLWriter();
+ kmlWriter.setExtrude(true);
+ checkEqual(kmlWriter, "GEOMETRYCOLLECTION (LINESTRING (1 9, 1 2, 3 2), POLYGON ((3 9, 5 9, 5 7, 3 7, 3 9)), POINT (5 5))",
+ "<MultiGeometry><LineString><extrude>1</extrude><coordinates>1.0,9.0 1.0,2.0 3.0,2.0</coordinates></LineString><Polygon><extrude>1</extrude><outerBoundaryIs><LinearRing><coordinates>3.0,9.0 5.0,9.0 5.0,7.0 3.0,7.0 3.0,9.0</coordinates></LinearRing></outerBoundaryIs></Polygon><Point><extrude>1</extrude><coordinates>5.0,5.0</coordinates></Point></MultiGeometry>");
+ }
+
+ public void testPrecision()
+ {
+ KMLWriter kmlWriter = new KMLWriter();
+ kmlWriter.setPrecision(1);
+ checkEqual(kmlWriter, "LINESTRING (1.0001 1.1234, 2.5555 2.99999)",
+ " <LineString><coordinates>1,1.1 2.6,3</coordinates></LineString>");
+ }
+
+
+ private void checkEqual(String wkt, String expectedKML) {
+ KMLWriter kmlWriter = new KMLWriter();
+ checkEqual(kmlWriter, wkt, expectedKML);
+ }
+
+ private void checkEqual(KMLWriter kmlWriter, String wkt, String expectedKML) {
+ try {
+ Geometry geom = rdr.read(wkt);
+ checkEqual(kmlWriter, geom, expectedKML);
+ } catch (ParseException e) {
+ throw new RuntimeException("ParseException: " + e.getMessage());
+ }
+ }
+
+ private void checkEqual(KMLWriter kmlWriter, Geometry geom, String expectedKML) {
+ String kml = kmlWriter.write(geom);
+ String kmlNorm = normalizeKML(kml);
+ String expectedKMLNorm = normalizeKML(expectedKML);
+ boolean isEqual = kmlNorm.equalsIgnoreCase(expectedKMLNorm);
+ if (! isEqual) {
+ System.out.println("\nGenerated KML: " + kmlNorm + "\n Expected KML: " + expectedKMLNorm);
+ }
+ assertTrue(isEqual);
+ }
+
+ /**
+ * Normalizes an XML string by converting all whitespace to a single blank char.
+ *
+ * @param expectedKML
+ * @return
+ */
+ private String normalizeKML(String kml) {
+ String condenseSpace = kml.replaceAll("\\s+", " ").trim();
+ String removeRedundantSpace = condenseSpace.replaceAll("> <", "><");
+ return removeRedundantSpace;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/linearref/AbstractIndexedLineTest.java b/modules/core/src/test/java/org/locationtech/jts/linearref/AbstractIndexedLineTest.java
new file mode 100644
index 0000000..19c92f3
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/linearref/AbstractIndexedLineTest.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Base class for linear referencing class unit tests.
+ */
+public abstract class AbstractIndexedLineTest extends TestCase {
+
+ private WKTReader reader = new WKTReader();
+
+ public AbstractIndexedLineTest(String name) {
+ super(name);
+ }
+
+ public void testFirst()
+ {
+ runOffsetTest("LINESTRING (0 0, 20 20)", "POINT(20 20)", 0.0, "POINT (20 20)");
+ }
+
+ public void testML()
+ {
+ runIndicesOfThenExtract("MULTILINESTRING ((0 0, 10 10), (20 20, 30 30))",
+ "MULTILINESTRING ((1 1, 10 10), (20 20, 25 25))");
+ }
+
+ public void testPartOfSegmentNoVertex()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 10 10, 20 20)",
+ "LINESTRING (1 1, 9 9)");
+ }
+
+ public void testPartOfSegmentContainingVertex()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 10 10, 20 20)",
+ "LINESTRING (5 5, 10 10, 15 15)");
+ }
+
+ /**
+ * Tests that duplicate coordinates are handled correctly.
+ */
+ public void testPartOfSegmentContainingDuplicateCoords()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 10 10, 10 10, 20 20)",
+ "LINESTRING (5 5, 10 10, 10 10, 15 15)");
+ }
+
+ /**
+ * Following tests check that correct portion of loop is identified.
+ * This requires that the correct vertex for (0,0) is selected.
+ */
+
+ public void testLoopWithStartSubLine()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 0 10, 10 10, 10 0, 0 0)",
+ "LINESTRING (0 0, 0 10, 10 10)");
+ }
+
+ public void testLoopWithEndingSubLine()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 0 10, 10 10, 10 0, 0 0)",
+ "LINESTRING (10 10, 10 0, 0 0)");
+ }
+
+ // test a subline equal to the parent loop
+ public void testLoopWithIdenticalSubLine()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 0 10, 10 10, 10 0, 0 0)",
+ "LINESTRING (0 0, 0 10, 10 10, 10 0, 0 0)");
+ }
+
+ // test a zero-length subline equal to the start point
+ public void testZeroLenSubLineAtStart()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 0 10, 10 10, 10 0, 0 0)",
+ "LINESTRING (0 0, 0 0)");
+ }
+
+ // test a zero-length subline equal to a mid point
+ public void testZeroLenSubLineAtMidVertex()
+ {
+ runIndicesOfThenExtract("LINESTRING (0 0, 0 10, 10 10, 10 0, 0 0)",
+ "LINESTRING (10 10, 10 10)");
+ }
+
+ public void testIndexOfAfterSquare()
+ {
+ runIndexOfAfterTest("LINESTRING (0 0, 0 10, 10 10, 10 0, 0 0)",
+ "POINT (0 0)");
+ }
+
+ public void testIndexOfAfterRibbon()
+ {
+ runIndexOfAfterTest("LINESTRING (0 0, 0 60, 50 60, 50 20, -20 20)",
+ "POINT (0 20)");
+ runIndexOfAfterTest("LINESTRING (0 0, 0 60, 50 60, 50 20, -20 20)",
+ "POINT (0 20)", "POINT (30 60)");
+ }
+
+ public void testIndexOfAfterBeyondEndRibbon()
+ {
+ runIndexOfAfterTest("LINESTRING (0 0, 0 60, 50 60, 50 20, -20 20)",
+ "POINT (-30 20)", "POINT (-20 20)");
+ }
+
+ public void testOffsetStartPoint()
+ {
+ runOffsetTest("LINESTRING (0 0, 10 10, 20 20)", "POINT(0 0)", 1.0, "POINT (-0.7071067811865475 0.7071067811865475)");
+ runOffsetTest("LINESTRING (0 0, 10 10, 20 20)", "POINT(0 0)", -1.0, "POINT (0.7071067811865475 -0.7071067811865475)");
+ runOffsetTest("LINESTRING (0 0, 10 10, 20 20)", "POINT(10 10)", 5.0, "POINT (6.464466094067262 13.535533905932738)");
+ runOffsetTest("LINESTRING (0 0, 10 10, 20 20)", "POINT(10 10)", -5.0, "POINT (13.535533905932738 6.464466094067262)");
+ }
+
+ public void testOffsetStartPointRepeatedPoint()
+ {
+ runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(0 0)", 1.0, "POINT (-0.7071067811865475 0.7071067811865475)");
+ runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(0 0)", -1.0, "POINT (0.7071067811865475 -0.7071067811865475)");
+ // These tests work for LengthIndexedLine, but not LocationIndexedLine
+ //runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(10 10)", 5.0, "POINT (6.464466094067262 13.535533905932738)");
+ //runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(10 10)", -5.0, "POINT (13.535533905932738 6.464466094067262)");
+ }
+
+ public void testOffsetEndPoint()
+ {
+ runOffsetTest("LINESTRING (0 0, 20 20)", "POINT(20 20)", 0.0, "POINT (20 20)");
+ runOffsetTest("LINESTRING (0 0, 13 13, 20 20)", "POINT(20 20)", 0.0, "POINT (20 20)");
+ runOffsetTest("LINESTRING (0 0, 10 0, 20 0)", "POINT(20 0)", 1.0, "POINT (20 1)");
+ runOffsetTest("LINESTRING (0 0, 20 0)", "POINT(10 0)", 1.0, "POINT (10 1)"); // point on last segment
+ runOffsetTest("MULTILINESTRING ((0 0, 10 0), (10 0, 20 0))", "POINT(10 0)", -1.0, "POINT (10 -1)");
+ runOffsetTest("MULTILINESTRING ((0 0, 10 0), (10 0, 20 0))", "POINT(20 0)", 1.0, "POINT (20 1)");
+ }
+
+ protected Geometry read(String wkt)
+ {
+ try {
+ return reader.read(wkt);
+ }
+ catch (ParseException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ protected void runIndicesOfThenExtract(String inputStr,
+ String subLineStr)
+// throws Exception
+ {
+ Geometry input = read(inputStr);
+ Geometry subLine = read(subLineStr);
+ Geometry result = indicesOfThenExtract(input, subLine);
+ checkExpected(result, subLineStr);
+ }
+
+ protected void checkExpected(Geometry result, String expected)
+ {
+ Geometry subLine = read(expected);
+ boolean isEqual = result.equalsExact(subLine, 1.0e-5);
+ if (! isEqual) {
+ System.out.println("Computed result is: " + result);
+ }
+ assertTrue(isEqual);
+ }
+
+ protected abstract Geometry indicesOfThenExtract(Geometry input, Geometry subLine);
+
+/*
+ // example of indicesOfThenLocate method
+ private Geometry indicesOfThenLocate(LineString input, LineString subLine)
+ {
+ LocationIndexedLine indexedLine = new LocationIndexedLine(input);
+ LineStringLocation[] loc = indexedLine.indicesOf(subLine);
+ Geometry result = indexedLine.locate(loc[0], loc[1]);
+ return result;
+ }
+*/
+
+ protected void runIndexOfAfterTest(String inputStr,
+ String testPtWKT)
+// throws Exception
+ {
+ Geometry input = read(inputStr);
+ Geometry testPoint = read(testPtWKT);
+ Coordinate testPt = testPoint.getCoordinate();
+ boolean resultOK = indexOfAfterCheck(input, testPt);
+ assertTrue(resultOK);
+ }
+
+ protected void runIndexOfAfterTest(String inputStr,
+ String testPtWKT, String afterPtWKT)
+// throws Exception
+ {
+ Geometry input = read(inputStr);
+ Geometry testPoint = read(testPtWKT);
+ Coordinate testPt = testPoint.getCoordinate();
+ Geometry afterPoint = read(afterPtWKT);
+ Coordinate afterPt = afterPoint.getCoordinate();
+ boolean resultOK = indexOfAfterCheck(input, testPt, afterPt);
+ assertTrue(resultOK);
+ }
+
+ /**
+ * Checks that the point computed by <tt>indexOfAfter</tt>
+ * is the same as the input point.
+ * (This should be the case for all except pathological cases,
+ * such as the input test point being beyond the end of the line).
+ *
+ * @param input
+ * @param testPt
+ * @return true if the result of indexOfAfter is the same as the input point
+ */
+ protected abstract boolean indexOfAfterCheck(Geometry input, Coordinate testPt);
+
+ protected abstract boolean indexOfAfterCheck(Geometry input, Coordinate testPt, Coordinate afterPt);
+
+ static final double TOLERANCE_DIST = 0.001;
+
+ protected void runOffsetTest(String inputWKT,
+ String testPtWKT, double offsetDistance, String expectedPtWKT)
+// throws Exception
+ {
+ Geometry input = read(inputWKT);
+ Geometry testPoint = read(testPtWKT);
+ Geometry expectedPoint = read(expectedPtWKT);
+ Coordinate testPt = testPoint.getCoordinate();
+ Coordinate expectedPt = expectedPoint.getCoordinate();
+ Coordinate offsetPt = extractOffsetAt(input, testPt, offsetDistance);
+
+ boolean isOk = offsetPt.distance(expectedPt) < TOLERANCE_DIST;
+ if (! isOk)
+ System.out.println("Expected = " + expectedPoint + " Actual = " + offsetPt);
+ assertTrue(isOk);
+ }
+
+ protected abstract Coordinate extractOffsetAt(Geometry input, Coordinate testPt, double offsetDistance);
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/linearref/LengthIndexedLineTest.java b/modules/core/src/test/java/org/locationtech/jts/linearref/LengthIndexedLineTest.java
new file mode 100644
index 0000000..174e810
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/linearref/LengthIndexedLineTest.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Tests the {@link LengthIndexedLine} class
+ */
+public class LengthIndexedLineTest
+ extends AbstractIndexedLineTest
+{
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(LengthIndexedLineTest.class);
+ }
+
+ public LengthIndexedLineTest(String name) {
+ super(name);
+ }
+
+ public void testExtractLineBothIndicesAtEndpointXXX()
+ {
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (20 0, 25 0, 30 0))",
+ -10, 10, "LINESTRING (10 0, 10 0)");
+ }
+
+
+ public void testExtractLineBeyondRange()
+ {
+ checkExtractLine("LINESTRING (0 0, 10 10)", -100, 100, "LINESTRING (0 0, 10 10)");
+ }
+
+ public void testExtractLineReverse()
+ {
+ checkExtractLine("LINESTRING (0 0, 10 0)", 9, 1, "LINESTRING (9 0, 1 0)");
+ }
+
+ public void testExtractLineReverseMulti()
+ {
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (20 0, 25 0, 30 0))",
+ 19, 1, "MULTILINESTRING ((29 0, 25 0, 20 0), (10 0, 1 0))");
+ }
+
+ public void testExtractLineNegative()
+ {
+ checkExtractLine("LINESTRING (0 0, 10 0)", -9, -1, "LINESTRING (1 0, 9 0)");
+ }
+
+ public void testExtractLineNegativeReverse()
+ {
+ checkExtractLine("LINESTRING (0 0, 10 0)", -1, -9, "LINESTRING (9 0, 1 0)");
+ }
+
+ public void testExtractLineIndexAtEndpoint()
+ {
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (20 0, 25 0, 30 0))",
+ 10, -1, "LINESTRING (20 0, 25 0, 29 0)");
+ }
+
+ /**
+ * Tests that leading and trailing zero-length sublines are trimmed in the computed result,
+ * and that zero-length extracts return the lowest extracted zero-length line
+ */
+ public void testExtractLineIndexAtEndpointWithZeroLenComponents()
+ {
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (10 0, 10 0), (20 0, 25 0, 30 0))",
+ 10, -1, "LINESTRING (20 0, 25 0, 29 0)");
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (10 0, 10 0), (20 0, 25 0, 30 0))",
+ 5, 10, "LINESTRING (5 0, 10 0)");
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (10 0, 10 0), (10 0, 10 0), (20 0, 25 0, 30 0))",
+ 10, 10, "LINESTRING (10 0, 10 0)");
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (10 0, 10 0), (10 0, 10 0), (10 0, 10 0), (20 0, 25 0, 30 0))",
+ 10, -10, "LINESTRING (10 0, 10 0)");
+ }
+
+ public void testExtractLineBothIndicesAtEndpoint()
+ {
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (20 0, 25 0, 30 0))",
+ 10, 10, "LINESTRING (10 0, 10 0)");
+ }
+
+ public void testExtractLineBothIndicesAtEndpointNegative()
+ {
+ checkExtractLine("MULTILINESTRING ((0 0, 10 0), (20 0, 25 0, 30 0))",
+ -10, 10, "LINESTRING (10 0, 10 0)");
+ }
+
+ /**
+ * From GEOS Ticket #323
+ */
+ public void testProjectExtractPoint()
+ {
+ Geometry linearGeom = read("MULTILINESTRING ((0 2, 0 0), (-1 1, 1 1))");
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ double index = indexedLine.project(new Coordinate(1, 0));
+ Coordinate pt = indexedLine.extractPoint(index);
+ assertTrue(pt.equals(new Coordinate(0, 0)));
+ }
+
+ public void testExtractPointBeyondRange()
+ {
+ Geometry linearGeom = read("LINESTRING (0 0, 10 10)");
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ Coordinate pt = indexedLine.extractPoint(100);
+ assertTrue(pt.equals(new Coordinate(10, 10)));
+
+ Coordinate pt2 = indexedLine.extractPoint(0);
+ assertTrue(pt2.equals(new Coordinate(0, 0)));
+ }
+
+ public void testProjectPointWithDuplicateCoords()
+ {
+ Geometry linearGeom = read("LINESTRING (0 0, 10 0, 10 0, 20 0)");
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ double projIndex = indexedLine.project(new Coordinate(10, 1));
+ assertTrue(projIndex == 10.0);
+ }
+
+ /**
+ * These tests work for LengthIndexedLine, but not LocationIndexedLine
+ *
+ */
+ public void testOffsetStartPointRepeatedPoint()
+ {
+ runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(0 0)", 1.0, "POINT (-0.7071067811865475 0.7071067811865475)");
+ runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(0 0)", -1.0, "POINT (0.7071067811865475 -0.7071067811865475)");
+ runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(10 10)", 5.0, "POINT (6.464466094067262 13.535533905932738)");
+ runOffsetTest("LINESTRING (0 0, 10 10, 10 10, 20 20)", "POINT(10 10)", -5.0, "POINT (13.535533905932738 6.464466094067262)");
+ }
+
+ /**
+ * Tests that z values are interpolated
+ *
+ */
+ public void testComputeZ()
+ {
+ Geometry linearGeom = read("LINESTRING (0 0 0, 10 10 10)");
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ double projIndex = indexedLine.project(new Coordinate(5, 5));
+ Coordinate projPt = indexedLine.extractPoint(projIndex);
+// System.out.println(projPt);
+ assertTrue(projPt.equals3D(new Coordinate(5, 5, 5)));
+ }
+
+ /**
+ * Tests that if the input does not have Z ordinates, neither does the output.
+ *
+ */
+ public void testComputeZNaN()
+ {
+ Geometry linearGeom = read("LINESTRING (0 0, 10 10 10)");
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ double projIndex = indexedLine.project(new Coordinate(5, 5));
+ Coordinate projPt = indexedLine.extractPoint(projIndex);
+ assertTrue(Double.isNaN(projPt.z ));
+ }
+
+ private void checkExtractLine(String wkt, double start, double end, String expected)
+ {
+ Geometry linearGeom = read(wkt);
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ Geometry result = indexedLine.extractLine(start, end);
+ checkExpected(result, expected);
+ }
+
+ protected Geometry indicesOfThenExtract(Geometry linearGeom, Geometry subLine)
+ {
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ double[] loc = indexedLine.indicesOf(subLine);
+ Geometry result = indexedLine.extractLine(loc[0], loc[1]);
+ return result;
+ }
+
+ protected boolean indexOfAfterCheck(Geometry linearGeom, Coordinate testPt)
+ {
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+
+ // check locations are consecutive
+ double loc1 = indexedLine.indexOf(testPt);
+ double loc2 = indexedLine.indexOfAfter(testPt, loc1);
+ if (loc2 <= loc1) return false;
+
+ // check extracted points are the same as the input
+ Coordinate pt1 = indexedLine.extractPoint(loc1);
+ Coordinate pt2 = indexedLine.extractPoint(loc2);
+ if (! pt1.equals2D(testPt)) return false;
+ if (! pt2.equals2D(testPt)) return false;
+
+ return true;
+ }
+
+ protected boolean indexOfAfterCheck(Geometry linearGeom, Coordinate testPt, Coordinate checkPt)
+ {
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+
+ // check that computed location is after check location
+ double checkLoc = indexedLine.indexOf(checkPt);
+ double testLoc = indexedLine.indexOfAfter(testPt, checkLoc);
+ if (testLoc < checkLoc) return false;
+
+ return true;
+ }
+
+ protected Coordinate extractOffsetAt(Geometry linearGeom, Coordinate testPt, double offsetDistance)
+ {
+ LengthIndexedLine indexedLine = new LengthIndexedLine(linearGeom);
+ double index = indexedLine.indexOf(testPt);
+ return indexedLine.extractPoint(index, offsetDistance);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/linearref/LinearLocationTest.java b/modules/core/src/test/java/org/locationtech/jts/linearref/LinearLocationTest.java
new file mode 100644
index 0000000..822778e
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/linearref/LinearLocationTest.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * Tests methods involving only {@link LinearLocation}s
+ *
+ * @author Martin Davis
+ *
+ */
+public class LinearLocationTest
+ extends TestCase
+{
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(LinearLocationTest.class);
+ }
+
+ public LinearLocationTest(String name) { super(name); }
+
+ public void testZeroLengthLineString() throws Exception
+ {
+ Geometry line = reader.read("LINESTRING (10 0, 10 0)");
+ LocationIndexedLine indexedLine = new LocationIndexedLine(line);
+ LinearLocation loc0 = indexedLine.indexOf(new Coordinate(11, 0));
+ assertTrue(loc0.compareTo(new LinearLocation(1, 0.0)) == 0);
+ }
+
+ public void testRepeatedCoordsLineString() throws Exception
+ {
+ Geometry line = reader.read("LINESTRING (10 0, 10 0, 20 0)");
+ LocationIndexedLine indexedLine = new LocationIndexedLine(line);
+ LinearLocation loc0 = indexedLine.indexOf(new Coordinate(11, 0));
+ assertTrue(loc0.compareTo(new LinearLocation(1, 0.1)) == 0);
+ }
+
+ public void testSameSegmentLineString() throws Exception
+ {
+ Geometry line = reader.read("LINESTRING (0 0, 10 0, 20 0, 30 0)");
+ LocationIndexedLine indexedLine = new LocationIndexedLine(line);
+
+ LinearLocation loc0 = indexedLine.indexOf(new Coordinate(0, 0));
+ LinearLocation loc0_5 = indexedLine.indexOf(new Coordinate(5, 0));
+ LinearLocation loc1 = indexedLine.indexOf(new Coordinate (10, 0));
+ LinearLocation loc2 = indexedLine.indexOf(new Coordinate (20, 0));
+ LinearLocation loc2_5 = indexedLine.indexOf(new Coordinate (25, 0));
+ LinearLocation loc3 = indexedLine.indexOf(new Coordinate (30, 0));
+
+ assertTrue(loc0.isOnSameSegment(loc0));
+ assertTrue(loc0.isOnSameSegment(loc0_5));
+ assertTrue(loc0.isOnSameSegment(loc1));
+ assertTrue(! loc0.isOnSameSegment(loc2));
+ assertTrue(! loc0.isOnSameSegment(loc2_5));
+ assertTrue(! loc0.isOnSameSegment(loc3));
+
+ assertTrue(loc0_5.isOnSameSegment(loc0));
+ assertTrue(loc0_5.isOnSameSegment(loc1));
+ assertTrue(! loc0_5.isOnSameSegment(loc2));
+ assertTrue(! loc0_5.isOnSameSegment(loc3));
+
+ assertTrue(! loc2.isOnSameSegment(loc0));
+ assertTrue(loc2.isOnSameSegment(loc1));
+ assertTrue(loc2.isOnSameSegment(loc2));
+ assertTrue(loc2.isOnSameSegment(loc3));
+
+ assertTrue(loc2_5.isOnSameSegment(loc3));
+
+ assertTrue(! loc3.isOnSameSegment(loc0));
+ assertTrue(loc3.isOnSameSegment(loc2));
+ assertTrue(loc3.isOnSameSegment(loc2_5));
+ assertTrue(loc3.isOnSameSegment(loc3));
+
+ }
+ public void testSameSegmentMultiLineString() throws Exception
+ {
+ Geometry line = reader.read("MULTILINESTRING ((0 0, 10 0, 20 0), (20 0, 30 0))");
+ LocationIndexedLine indexedLine = new LocationIndexedLine(line);
+
+ LinearLocation loc0 = indexedLine.indexOf(new Coordinate(0, 0));
+ LinearLocation loc0_5 = indexedLine.indexOf(new Coordinate(5, 0));
+ LinearLocation loc1 = indexedLine.indexOf(new Coordinate (10, 0));
+ LinearLocation loc2 = indexedLine.indexOf(new Coordinate (20, 0));
+ LinearLocation loc2B = new LinearLocation(1, 0, 0.0);
+
+ LinearLocation loc2_5 = indexedLine.indexOf(new Coordinate (25, 0));
+ LinearLocation loc3 = indexedLine.indexOf(new Coordinate (30, 0));
+
+ assertTrue(loc0.isOnSameSegment(loc0));
+ assertTrue(loc0.isOnSameSegment(loc0_5));
+ assertTrue(loc0.isOnSameSegment(loc1));
+ assertTrue(! loc0.isOnSameSegment(loc2));
+ assertTrue(! loc0.isOnSameSegment(loc2_5));
+ assertTrue(! loc0.isOnSameSegment(loc3));
+
+ assertTrue(loc0_5.isOnSameSegment(loc0));
+ assertTrue(loc0_5.isOnSameSegment(loc1));
+ assertTrue(! loc0_5.isOnSameSegment(loc2));
+ assertTrue(! loc0_5.isOnSameSegment(loc3));
+
+ assertTrue(! loc2.isOnSameSegment(loc0));
+ assertTrue(loc2.isOnSameSegment(loc1));
+ assertTrue(loc2.isOnSameSegment(loc2));
+ assertTrue(! loc2.isOnSameSegment(loc3));
+ assertTrue(loc2B.isOnSameSegment(loc3));
+
+ assertTrue(loc2_5.isOnSameSegment(loc3));
+
+ assertTrue(! loc3.isOnSameSegment(loc0));
+ assertTrue(! loc3.isOnSameSegment(loc2));
+ assertTrue(loc3.isOnSameSegment(loc2B));
+ assertTrue(loc3.isOnSameSegment(loc2_5));
+ assertTrue(loc3.isOnSameSegment(loc3));
+ }
+
+ public void testGetSegmentMultiLineString() throws Exception
+ {
+ Geometry line = reader.read("MULTILINESTRING ((0 0, 10 0, 20 0), (20 0, 30 0))");
+ LocationIndexedLine indexedLine = new LocationIndexedLine(line);
+
+ LinearLocation loc0 = indexedLine.indexOf(new Coordinate(0, 0));
+ LinearLocation loc0_5 = indexedLine.indexOf(new Coordinate(5, 0));
+ LinearLocation loc1 = indexedLine.indexOf(new Coordinate (10, 0));
+ LinearLocation loc2 = indexedLine.indexOf(new Coordinate (20, 0));
+ LinearLocation loc2B = new LinearLocation(1, 0, 0.0);
+
+ LinearLocation loc2_5 = indexedLine.indexOf(new Coordinate (25, 0));
+ LinearLocation loc3 = indexedLine.indexOf(new Coordinate (30, 0));
+
+ LineSegment seg0 = new LineSegment(new Coordinate(0,0), new Coordinate(10, 0));
+ LineSegment seg1 = new LineSegment(new Coordinate(10,0), new Coordinate(20, 0));
+ LineSegment seg2 = new LineSegment(new Coordinate(20,0), new Coordinate(30, 0));
+
+ assertTrue(loc0.getSegment(line).equals(seg0));
+ assertTrue(loc0_5.getSegment(line).equals(seg0));
+
+ assertTrue(loc1.getSegment(line).equals(seg1));
+ assertTrue(loc2.getSegment(line).equals(seg1));
+
+ assertTrue(loc2_5.getSegment(line).equals(seg2));
+ assertTrue(loc3.getSegment(line).equals(seg2));
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/linearref/LocationIndexedLineTest.java b/modules/core/src/test/java/org/locationtech/jts/linearref/LocationIndexedLineTest.java
new file mode 100644
index 0000000..cfcd97b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/linearref/LocationIndexedLineTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.linearref;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ * Tests the {@link LocationIndexedLine} class
+ */
+public class LocationIndexedLineTest
+ extends AbstractIndexedLineTest {
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(LocationIndexedLineTest.class);
+ }
+
+ public LocationIndexedLineTest(String name) {
+ super(name);
+ }
+
+ public void testMultiLineStringSimple()
+ throws Exception
+ {
+ runExtractLine("MULTILINESTRING ((0 0, 10 10), (20 20, 30 30))",
+ new LinearLocation(0, 0, .5),
+ new LinearLocation(1, 0, .5),
+ "MULTILINESTRING ((5 5, 10 10), (20 20, 25 25))");
+ }
+
+ public void testMultiLineString2()
+ throws Exception
+ {
+ runExtractLine("MULTILINESTRING ((0 0, 10 10), (20 20, 30 30))",
+ new LinearLocation(0, 0, 1.0),
+ new LinearLocation(1, 0, .5),
+ "MULTILINESTRING ((10 10, 10 10), (20 20, 25 25))");
+ }
+
+ private void runExtractLine(String wkt,
+ LinearLocation start, LinearLocation end, String expected)
+ {
+ Geometry geom = read(wkt);
+ LocationIndexedLine lil = new LocationIndexedLine(geom);
+ Geometry result = lil.extractLine(start, end);
+ //System.out.println(result);
+ checkExpected(result, expected);
+ }
+
+ protected Geometry indicesOfThenExtract(Geometry input, Geometry subLine)
+ {
+ LocationIndexedLine indexedLine = new LocationIndexedLine(input);
+ LinearLocation[] loc = indexedLine.indicesOf(subLine);
+ Geometry result = indexedLine.extractLine(loc[0], loc[1]);
+ return result;
+ }
+
+ protected boolean indexOfAfterCheck(Geometry linearGeom, Coordinate testPt)
+ {
+ LocationIndexedLine indexedLine = new LocationIndexedLine(linearGeom);
+
+ // check locations are consecutive
+ LinearLocation loc1 = indexedLine.indexOf(testPt);
+ LinearLocation loc2 = indexedLine.indexOfAfter(testPt, loc1);
+ if (loc2.compareTo(loc1) <= 0 ) return false;
+
+ // check extracted points are the same as the input
+ Coordinate pt1 = indexedLine.extractPoint(loc1);
+ Coordinate pt2 = indexedLine.extractPoint(loc2);
+ if (! pt1.equals2D(testPt)) return false;
+ if (! pt2.equals2D(testPt)) return false;
+
+ return true;
+ }
+
+ protected boolean indexOfAfterCheck(Geometry linearGeom, Coordinate testPt, Coordinate afterPt)
+ {
+ LocationIndexedLine indexedLine = new LocationIndexedLine(linearGeom);
+
+ // check that computed location is after check location
+ LinearLocation afterLoc = indexedLine.indexOf(afterPt);
+ LinearLocation testLoc = indexedLine.indexOfAfter(testPt, afterLoc);
+ if (testLoc.compareTo(afterLoc) < 0 ) return false;
+
+ return true;
+ }
+
+ protected Coordinate extractOffsetAt(Geometry linearGeom, Coordinate testPt, double offsetDistance)
+ {
+ LocationIndexedLine indexedLine = new LocationIndexedLine(linearGeom);
+ LinearLocation index = indexedLine.indexOf(testPt);
+ return indexedLine.extractPoint(index, offsetDistance);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/math/DDBasicTest.java b/modules/core/src/test/java/org/locationtech/jts/math/DDBasicTest.java
new file mode 100644
index 0000000..2c85ade
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/math/DDBasicTest.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.math;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests basic arithmetic operations for {@link DD}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DDBasicTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(DDBasicTest.class);
+ }
+
+ public DDBasicTest(String name) { super(name); }
+
+ public void testNaN()
+ {
+ assertTrue(DD.valueOf(1).divide(DD.valueOf(0)).isNaN());
+ assertTrue(DD.valueOf(1).multiply(DD.NaN).isNaN());
+ }
+
+
+ public void testAddMult2()
+ {
+ checkAddMult2(new DD(3));
+ checkAddMult2(DD.PI);
+ }
+
+ public void testMultiplyDivide()
+ {
+ checkMultiplyDivide(DD.PI, DD.E, 1e-30);
+ checkMultiplyDivide(DD.TWO_PI, DD.E, 1e-30);
+ checkMultiplyDivide(DD.PI_2, DD.E, 1e-30);
+ checkMultiplyDivide(new DD(39.4), new DD(10), 1e-30);
+ }
+
+ public void testDivideMultiply()
+ {
+ checkDivideMultiply(DD.PI, DD.E, 1e-30);
+ checkDivideMultiply(new DD(39.4), new DD(10), 1e-30);
+ }
+
+ public void testSqrt()
+ {
+ // the appropriate error bound is determined empirically
+ checkSqrt(DD.PI, 1e-30);
+ checkSqrt(DD.E, 1e-30);
+ checkSqrt(new DD(999.0), 1e-28);
+ }
+
+ private void checkSqrt(DD x, double errBound)
+ {
+ DD sqrt = x.sqrt();
+ DD x2 = sqrt.multiply(sqrt);
+ checkErrorBound("Sqrt", x, x2, errBound);
+ }
+
+ public void testTrunc()
+ {
+ checkTrunc(DD.valueOf(1e16).subtract(DD.valueOf(1)),
+ DD.valueOf(1e16).subtract(DD.valueOf(1)));
+ // the appropriate error bound is determined empirically
+ checkTrunc(DD.PI, DD.valueOf(3));
+ checkTrunc(DD.valueOf(999.999), DD.valueOf(999));
+
+ checkTrunc(DD.E.negate(), DD.valueOf(-2));
+ checkTrunc(DD.valueOf(-999.999), DD.valueOf(-999));
+ }
+
+ private void checkTrunc(DD x, DD expected)
+ {
+ DD trunc = x.trunc();
+ boolean isEqual = trunc.equals(expected);
+ assertTrue(isEqual);
+ }
+
+ public void testPow()
+ {
+ checkPow(0, 3, 16 * DD.EPS);
+ checkPow(14, 3, 16 * DD.EPS);
+ checkPow(3, -5, 16 * DD.EPS);
+ checkPow(-3, 5, 16 * DD.EPS);
+ checkPow(-3, -5, 16 * DD.EPS);
+ checkPow(0.12345, -5, 1e5 * DD.EPS);
+ }
+
+ public void testReciprocal()
+ {
+ // error bounds are chosen to be "close enough" (i.e. heuristically)
+
+ // for some reason many reciprocals are exact
+ checkReciprocal(3.0, 0);
+ checkReciprocal(99.0, 1e-29);
+ checkReciprocal(999.0, 0);
+ checkReciprocal(314159269.0, 0);
+ }
+
+ public void testBinom()
+ {
+ checkBinomialSquare(100.0, 1.0);
+ checkBinomialSquare(1000.0, 1.0);
+ checkBinomialSquare(10000.0, 1.0);
+ checkBinomialSquare(100000.0, 1.0);
+ checkBinomialSquare(1000000.0, 1.0);
+ checkBinomialSquare(1e8, 1.0);
+ checkBinomialSquare(1e10, 1.0);
+ checkBinomialSquare(1e14, 1.0);
+ // Following call will fail, because it requires 32 digits of precision
+// checkBinomialSquare(1e16, 1.0);
+
+ checkBinomialSquare(1e14, 291.0);
+ checkBinomialSquare(5e14, 291.0);
+ checkBinomialSquare(5e14, 345291.0);
+ }
+
+ private void checkAddMult2(DD dd)
+ {
+ DD sum = dd.add(dd);
+ DD prod = dd.multiply(new DD(2.0));
+ checkErrorBound("AddMult2", sum, prod, 0.0);
+ }
+
+ private void checkMultiplyDivide(DD a, DD b, double errBound)
+ {
+ DD a2 = a.multiply(b).divide(b);
+ checkErrorBound("MultiplyDivide", a, a2, errBound);
+ }
+
+ private void checkDivideMultiply(DD a, DD b, double errBound)
+ {
+ DD a2 = a.divide(b).multiply(b);
+ checkErrorBound("DivideMultiply", a, a2, errBound);
+ }
+
+ private DD delta(DD x, DD y)
+ {
+ return x.subtract(y).abs();
+ }
+
+ private void checkErrorBound(String tag, DD x, DD y, double errBound)
+ {
+ DD err = x.subtract(y).abs();
+ //System.out.println(tag + " err=" + err);
+ boolean isWithinEps = err.doubleValue() <= errBound;
+ assertTrue(isWithinEps);
+ }
+
+ /**
+ * Computes (a+b)^2 in two different ways and compares the result.
+ * For correct results, a and b should be integers.
+ *
+ * @param a
+ * @param b
+ */
+ void checkBinomialSquare(double a, double b)
+ {
+ // binomial square
+ DD add = new DD(a);
+ DD bdd = new DD(b);
+ DD aPlusb = add.add(bdd);
+ DD abSq = aPlusb.multiply(aPlusb);
+// System.out.println("(a+b)^2 = " + abSq);
+
+ // expansion
+ DD a2dd = add.multiply(add);
+ DD b2dd = bdd.multiply(bdd);
+ DD ab = add.multiply(bdd);
+ DD sum = b2dd.add(ab).add(ab);
+
+// System.out.println("2ab+b^2 = " + sum);
+
+ DD diff = abSq.subtract(a2dd);
+// System.out.println("(a+b)^2 - a^2 = " + diff);
+
+ DD delta = diff.subtract(sum);
+
+ //System.out.println();
+ //System.out.println("A = " + a + ", B = " + b);
+ //System.out.println("[DD] 2ab+b^2 = " + sum
+ // + " (a+b)^2 - a^2 = " + diff
+ // + " delta = " + delta);
+ printBinomialSquareDouble(a,b);
+
+ boolean isSame = diff.equals(sum);
+ assertTrue(isSame);
+ boolean isDeltaZero = delta.isZero();
+ assertTrue(isDeltaZero);
+ }
+
+ void printBinomialSquareDouble(double a, double b)
+ {
+ double sum = 2*a*b + b*b;
+ double diff = (a + b) * (a + b) - a*a;
+ //System.out.println("[double] 2ab+b^2= " + sum
+ // + " (a+b)^2-a^2= " + diff
+ // + " delta= " + (sum - diff));
+ }
+
+ public void testBinomial2()
+ {
+ checkBinomial2(100.0, 1.0);
+ checkBinomial2(1000.0, 1.0);
+ checkBinomial2(10000.0, 1.0);
+ checkBinomial2(100000.0, 1.0);
+ checkBinomial2(1000000.0, 1.0);
+ checkBinomial2(1e8, 1.0);
+ checkBinomial2(1e10, 1.0);
+ checkBinomial2(1e14, 1.0);
+
+ checkBinomial2(1e14, 291.0);
+
+ checkBinomial2(5e14, 291.0);
+ checkBinomial2(5e14, 345291.0);
+ }
+
+ void checkBinomial2(double a, double b)
+ {
+ // binomial product
+ DD add = new DD(a);
+ DD bdd = new DD(b);
+ DD aPlusb = add.add(bdd);
+ DD aSubb = add.subtract(bdd);
+ DD abProd = aPlusb.multiply(aSubb);
+// System.out.println("(a+b)^2 = " + abSq);
+
+ // expansion
+ DD a2dd = add.multiply(add);
+ DD b2dd = bdd.multiply(bdd);
+
+// System.out.println("2ab+b^2 = " + sum);
+
+ // this should equal b^2
+ DD diff = abProd.subtract(a2dd).negate();
+// System.out.println("(a+b)^2 - a^2 = " + diff);
+
+ DD delta = diff.subtract(b2dd);
+
+ //System.out.println();
+ //System.out.println("A = " + a + ", B = " + b);
+ //System.out.println("[DD] (a+b)(a-b) = " + abProd
+ // + " -((a^2 - b^2) - a^2) = " + diff
+ // + " delta = " + delta);
+// printBinomialSquareDouble(a,b);
+
+ boolean isSame = diff.equals(b2dd);
+ assertTrue(isSame);
+ boolean isDeltaZero = delta.isZero();
+ assertTrue(isDeltaZero);
+ }
+
+
+ private void checkReciprocal(double x, double errBound)
+ {
+ DD xdd = new DD(x);
+ DD rr = xdd.reciprocal().reciprocal();
+
+ double err = xdd.subtract(rr).doubleValue();
+
+ //System.out.println("DD Recip = " + xdd
+ // + " DD delta= " + err
+ // + " double recip delta= " + (x - 1.0/(1.0/x)) );
+
+ assertTrue(err <= errBound);
+ }
+
+ private void checkPow(double x, int exp, double errBound)
+ {
+ DD xdd = new DD(x);
+ DD pow = xdd.pow(exp);
+ //System.out.println("Pow(" + x + ", " + exp + ") = " + pow);
+ DD pow2 = slowPow(xdd, exp);
+
+ double err = pow.subtract(pow2).doubleValue();
+
+ boolean isOK = err < errBound;
+ if (! isOK)
+ System.out.println("Test slowPow value " + pow2);
+
+ assertTrue(err <= errBound);
+ }
+
+ private DD slowPow(DD x, int exp)
+ {
+ if (exp == 0)
+ return DD.valueOf(1.0);
+
+ int n = Math.abs(exp);
+ // MD - could use binary exponentiation for better precision & speed
+ DD pow = new DD(x);
+ for (int i = 1; i < n; i++) {
+ pow = pow.multiply(x);
+ }
+ if (exp < 0) {
+ return pow.reciprocal();
+ }
+ return pow;
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/math/DDComputeTest.java b/modules/core/src/test/java/org/locationtech/jts/math/DDComputeTest.java
new file mode 100644
index 0000000..778138e
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/math/DDComputeTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.math;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Various tests involving computing known mathematical quantities
+ * using the basic {@link DD} arithmetic operations.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DDComputeTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(DDComputeTest.class);
+ }
+
+ public DDComputeTest(String name) { super(name); }
+
+ public void testEByTaylorSeries()
+ {
+ //System.out.println("--------------------------------");
+ //System.out.println("Computing e by Taylor series");
+ DD testE = computeEByTaylorSeries();
+ double err = Math.abs(testE.subtract(DD.E).doubleValue());
+ //System.out.println("Difference from DoubleDouble.E = " + err);
+ assertTrue(err < 64 * DD.EPS);
+ }
+
+ /**
+ * Uses Taylor series to compute e
+ *
+ * e = 1 + 1 + 1/2! + 1/3! + 1/4! + ...
+ *
+ * @return an approximation to e
+ */
+ private DD computeEByTaylorSeries()
+ {
+ DD s = DD.valueOf(2.0);
+ DD t = DD.valueOf(1.0);
+ double n = 1.0;
+ int i = 0;
+
+ while (t.doubleValue() > DD.EPS) {
+ i++;
+ n += 1.0;
+ t = t.divide(DD.valueOf(n));
+ s = s.add(t);
+ //System.out.println(i + ": " + s);
+ }
+ return s;
+ }
+
+ public void testPiByMachin()
+ {
+ //System.out.println("--------------------------------");
+ //System.out.println("Computing Pi by Machin's rule");
+ DD testE = computePiByMachin();
+ double err = Math.abs(testE.subtract(DD.PI).doubleValue());
+ //System.out.println("Difference from DoubleDouble.PI = " + err);
+ assertTrue(err < 8 * DD.EPS);
+ }
+
+
+ /**
+ * Uses Machin's arctangent formula to compute Pi:
+ *
+ * Pi / 4 = 4 arctan(1/5) - arctan(1/239)
+ *
+ * @return an approximation to Pi
+ */
+ private DD computePiByMachin()
+ {
+ DD t1 = DD.valueOf(1.0).divide(DD.valueOf(5.0));
+ DD t2 = DD.valueOf(1.0).divide(DD.valueOf(239.0));
+
+ DD pi4 = (DD.valueOf(4.0)
+ .multiply(arctan(t1)))
+ .subtract(arctan(t2));
+ DD pi = DD.valueOf(4.0).multiply(pi4);
+ //System.out.println("Computed value = " + pi);
+ return pi;
+ }
+
+ /**
+ * Computes the arctangent based on the Taylor series expansion
+ *
+ * arctan(x) = x - x^3 / 3 + x^5 / 5 - x^7 / 7 + ...
+ *
+ * @param x the argument
+ * @return an approximation to the arctangent of the input
+ */
+ private DD arctan(DD x)
+ {
+ DD t = x;
+ DD t2 = t.sqr();
+ DD at = new DD(0.0);
+ DD two = new DD(2.0);
+ int k = 0;
+ DD d = new DD(1.0);
+ int sign = 1;
+ while (t.doubleValue() > DD.EPS) {
+ k++;
+ if (sign < 0)
+ at = at.subtract(t.divide(d));
+ else
+ at = at.add(t.divide(d));
+
+ d = d.add(two);
+ t = t.multiply(t2);
+ sign = -sign;
+ }
+ //System.out.println("Computed DD.atan(): " + at
+ // + " Math.atan = " + Math.atan(x.doubleValue()));
+ return at;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/math/DDIOTest.java b/modules/core/src/test/java/org/locationtech/jts/math/DDIOTest.java
new file mode 100644
index 0000000..b69935f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/math/DDIOTest.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.math;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests I/O for {@link DD}s.
+ *
+ * @author mbdavis
+ *
+ */
+public class DDIOTest extends TestCase {
+ public static void main(String args[]) {
+ TestRunner.run(DDIOTest.class);
+ }
+
+ public DDIOTest(String name) {
+ super(name);
+ }
+
+
+ public void testStandardNotation()
+ {
+ // standard cases
+ checkStandardNotation(1.0, "1.0");
+ checkStandardNotation(0.0, "0.0");
+
+ // cases where hi is a power of 10 and lo is negative
+ checkStandardNotation(DD.valueOf(1e12).subtract(DD.valueOf(1)), "999999999999.0");
+ checkStandardNotation(DD.valueOf(1e14).subtract(DD.valueOf(1)), "99999999999999.0");
+ checkStandardNotation(DD.valueOf(1e16).subtract(DD.valueOf(1)), "9999999999999999.0");
+
+ DD num8Dec = DD.valueOf(-379363639).divide(
+ DD.valueOf(100000000));
+ checkStandardNotation(num8Dec, "-3.79363639");
+
+ checkStandardNotation(new DD(-3.79363639, 8.039137357367426E-17),
+ "-3.7936363900000000000000000");
+
+ checkStandardNotation(DD.valueOf(34).divide(
+ DD.valueOf(1000)), "0.034");
+ checkStandardNotation(1.05e3, "1050.0");
+ checkStandardNotation(0.34, "0.34000000000000002442490654175344");
+ checkStandardNotation(DD.valueOf(34).divide(
+ DD.valueOf(100)), "0.34");
+ checkStandardNotation(14, "14.0");
+ }
+
+ private void checkStandardNotation(double x, String expectedStr) {
+ checkStandardNotation(DD.valueOf(x), expectedStr);
+ }
+
+ private void checkStandardNotation(DD x, String expectedStr) {
+ String xStr = x.toStandardNotation();
+ //System.out.println("Standard Notation: " + xStr);
+ assertEquals(expectedStr, xStr);
+ }
+
+ public void testSciNotation() {
+ checkSciNotation(0.0, "0.0E0");
+ checkSciNotation(1.05e10, "1.05E10");
+ checkSciNotation(0.34, "3.4000000000000002442490654175344E-1");
+ checkSciNotation(
+ DD.valueOf(34).divide(DD.valueOf(100)), "3.4E-1");
+ checkSciNotation(14, "1.4E1");
+ }
+
+ private void checkSciNotation(double x, String expectedStr) {
+ checkSciNotation(DD.valueOf(x), expectedStr);
+ }
+
+ private void checkSciNotation(DD x, String expectedStr) {
+ String xStr = x.toSciNotation();
+ //System.out.println("Sci Notation: " + xStr);
+ assertEquals(xStr, expectedStr);
+ }
+
+ public void testParse() {
+ checkParse("1.05e10", 1.05E10, 1e-32);
+ checkParse("-1.05e10", -1.05E10, 1e-32);
+ checkParse("1.05e-10", DD.valueOf(105.).divide(
+ DD.valueOf(100.)).divide(DD.valueOf(1.0E10)), 1e-32);
+ checkParse("-1.05e-10", DD.valueOf(105.).divide(
+ DD.valueOf(100.)).divide(DD.valueOf(1.0E10))
+ .negate(), 1e-32);
+
+ /**
+ * The Java double-precision constant 1.4 gives rise to a value which
+ * differs from the exact binary representation down around the 17th decimal
+ * place. Thus it will not compare exactly to the DoubleDouble
+ * representation of the same number. To avoid this, compute the expected
+ * value using full DD precision.
+ */
+ checkParse("1.4",
+ DD.valueOf(14).divide(DD.valueOf(10)), 1e-30);
+
+ // 39.5D can be converted to an exact FP representation
+ checkParse("39.5", 39.5, 1e-30);
+ checkParse("-39.5", -39.5, 1e-30);
+ }
+
+ private void checkParse(String str, double expectedVal, double errBound) {
+ checkParse(str, new DD(expectedVal), errBound);
+ }
+
+ private void checkParse(String str, DD expectedVal,
+ double relErrBound) {
+ DD xdd = DD.parse(str);
+ double err = xdd.subtract(expectedVal).doubleValue();
+ double relErr = err / xdd.doubleValue();
+
+ //System.out.println("Parsed= " + xdd + " rel err= " + relErr);
+
+ assertTrue(err <= relErrBound);
+ }
+
+ public void testParseError() {
+ checkParseError("-1.05E2w");
+ checkParseError("%-1.05E2w");
+ checkParseError("-1.0512345678t");
+ }
+
+ private void checkParseError(String str) {
+ boolean foundParseError = false;
+ try {
+ DD.parse(str);
+ } catch (NumberFormatException ex) {
+ foundParseError = true;
+ }
+ assertTrue(foundParseError);
+ }
+
+ public void testRepeatedSqrt()
+ {
+ writeRepeatedSqrt(DD.valueOf(1.0));
+ writeRepeatedSqrt(DD.valueOf(.999999999999));
+ writeRepeatedSqrt(DD.PI.divide(DD.valueOf(10)));
+ }
+
+ /**
+ * This routine simply tests for robustness of the toString function.
+ *
+ * @param xdd
+ */
+ void writeRepeatedSqrt(DD xdd)
+ {
+ int count = 0;
+ while (xdd.doubleValue() > 1e-300) {
+ count++;
+
+ double x = xdd.doubleValue();
+ DD xSqrt = xdd.sqrt();
+ String s = xSqrt.toString();
+// System.out.println(count + ": " + s);
+
+ DD xSqrt2 = DD.parse(s);
+ DD xx = xSqrt2.multiply(xSqrt2);
+ double err = Math.abs(xx.doubleValue() - x);
+ //assertTrue(err < 1e-10);
+
+ xdd = xSqrt;
+
+ // square roots converge on 1 - stop when very close
+ DD distFrom1DD = xSqrt.subtract(DD.valueOf(1.0));
+ double distFrom1 = distFrom1DD.doubleValue();
+ if (Math.abs(distFrom1) < 1.0e-40)
+ break;
+ }
+ }
+
+ public void testRepeatedSqr()
+ {
+ writeRepeatedSqr(DD.valueOf(.9));
+ writeRepeatedSqr(DD.PI.divide(DD.valueOf(10)));
+ }
+
+ /**
+ * This routine simply tests for robustness of the toString function.
+ *
+ * @param xdd
+ */
+ void writeRepeatedSqr(DD xdd)
+ {
+ if (xdd.ge(DD.valueOf(1)))
+ throw new IllegalArgumentException("Argument must be < 1");
+
+ int count = 0;
+ while (xdd.doubleValue() > 1e-300) {
+ count++;
+ if (count == 100)
+ count = count;
+ double x = xdd.doubleValue();
+ DD xSqr = xdd.sqr();
+ String s = xSqr.toString();
+ //System.out.println(count + ": " + s);
+
+ DD xSqr2 = DD.parse(s);
+
+ xdd = xSqr;
+ }
+ }
+
+ public void testIOSquaresStress() {
+ for (int i = 1; i < 10000; i++) {
+ writeAndReadSqrt(i);
+ }
+ }
+
+ /**
+ * Tests that printing values with many decimal places works.
+ * This tests the correctness and robustness of both output and input.
+ *
+ * @param x
+ */
+ void writeAndReadSqrt(double x) {
+ DD xdd = DD.valueOf(x);
+ DD xSqrt = xdd.sqrt();
+ String s = xSqrt.toString();
+// System.out.println(s);
+
+ DD xSqrt2 = DD.parse(s);
+ DD xx = xSqrt2.multiply(xSqrt2);
+ String xxStr = xx.toString();
+// System.out.println("==> " + xxStr);
+
+ DD xx2 = DD.parse(xxStr);
+ double err = Math.abs(xx2.doubleValue() - x);
+ assertTrue(err < 1e-10);
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/math/DDTest.java b/modules/core/src/test/java/org/locationtech/jts/math/DDTest.java
new file mode 100644
index 0000000..3838b34
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/math/DDTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.math;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests basic accessor and mutator operations for {@link DD}s.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DDTest
+ extends TestCase
+{
+ private static final double VALUE_DBL = 2.2;
+
+ public static void main(String args[]) {
+ TestRunner.run(DDTest.class);
+ }
+
+ public DDTest(String name) { super(name); }
+
+ public void testSetValueDouble()
+ {
+ assertTrue(VALUE_DBL == (new DD(1)).setValue(VALUE_DBL).doubleValue());
+ }
+ public void testSetValueDD()
+ {
+ assertTrue((new DD(VALUE_DBL)).equals((new DD(1)).setValue(new DD(2.2))));
+ assertTrue(DD.PI.equals((new DD(1)).setValue(DD.PI)));
+ }
+ public void testCopy()
+ {
+ assertTrue((new DD(VALUE_DBL)).equals(DD.copy(new DD(VALUE_DBL))));
+ assertTrue(DD.PI.equals(DD.copy(DD.PI)));
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/math/Vector2DTest.java b/modules/core/src/test/java/org/locationtech/jts/math/Vector2DTest.java
new file mode 100644
index 0000000..4a6a992
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/math/Vector2DTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.math;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+public class Vector2DTest extends TestCase {
+
+ private static final double TOLERANCE = 1E-5;
+
+ public static void main(String args[]) {
+ TestRunner.run(Vector2DTest.class);
+ }
+
+ public Vector2DTest(String name) { super(name); }
+
+ public void testLength()
+ {
+ assertEquals(Vector2D.create(0,1).length(), 1.0, TOLERANCE);
+ assertEquals(Vector2D.create(0,-1).length(), 1.0, TOLERANCE);
+ assertEquals(Vector2D.create(1,1).length(), Math.sqrt(2.0), TOLERANCE);
+ assertEquals(Vector2D.create(3,4).length(), 5, TOLERANCE);
+ }
+
+ public void testIsParallel() throws Exception
+ {
+ assertTrue(Vector2D.create(0,1).isParallel(Vector2D.create(0,2)));
+ assertTrue(Vector2D.create(1,1).isParallel(Vector2D.create(2,2)));
+ assertTrue(Vector2D.create(-1,-1).isParallel(Vector2D.create(2,2)));
+
+ assertTrue(! Vector2D.create(1,-1).isParallel(Vector2D.create(2,2)));
+ }
+
+ public void testToCoordinate()
+ {
+ assertEquals(Vector2D.create(
+ Vector2D.create(1,2).toCoordinate()),
+ Vector2D.create(1,2), TOLERANCE);
+ }
+
+ void assertEquals(Vector2D v1, Vector2D v2)
+ {
+ assertTrue(v1.equals(v2));
+ }
+
+ void assertEquals(Vector2D v1, Vector2D v2, double tolerance)
+ {
+ assertEquals(v1.getX(), v2.getX(), tolerance);
+ assertEquals(v1.getY(), v2.getY(), tolerance);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/noding/SegmentPointComparatorFullTest.java b/modules/core/src/test/java/org/locationtech/jts/noding/SegmentPointComparatorFullTest.java
new file mode 100644
index 0000000..25ade5e
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/noding/SegmentPointComparatorFullTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.PrecisionModel;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Test IntersectionSegment#compareNodePosition using an exhaustive set
+ * of test cases
+ *
+ * @version 1.7
+ */
+public class SegmentPointComparatorFullTest
+ extends TestCase
+{
+
+ private PrecisionModel pm = new PrecisionModel(1.0);
+
+ public SegmentPointComparatorFullTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(SegmentPointComparatorFullTest.class);
+ }
+
+ public void testQuadrant0()
+ {
+ checkSegment(100, 0);
+ checkSegment(100, 50);
+ checkSegment(100, 100);
+ checkSegment(100, 150);
+ checkSegment(0, 100);
+ }
+
+ public void testQuadrant4()
+ {
+ checkSegment(100, -50);
+ checkSegment(100, -100);
+ checkSegment(100, -150);
+ checkSegment(0, -100);
+ }
+
+ public void testQuadrant1()
+ {
+ checkSegment(-100, 0);
+ checkSegment(-100, 50);
+ checkSegment(-100, 100);
+ checkSegment(-100, 150);
+ }
+
+ public void testQuadrant2()
+ {
+ checkSegment(-100, 0);
+ checkSegment(-100, -50);
+ checkSegment(-100, -100);
+ checkSegment(-100, -150);
+ }
+
+ private void checkSegment(double x, double y)
+ {
+ Coordinate seg0 = new Coordinate(0, 0);
+ Coordinate seg1 = new Coordinate(x, y);
+ LineSegment seg = new LineSegment(seg0, seg1);
+
+ for (int i = 0; i < 4; i++) {
+ double dist = i;
+
+ double gridSize = 1 / pm.getScale();
+
+ checkPointsAtDistance(seg, dist, dist + 1.0 * gridSize);
+ checkPointsAtDistance(seg, dist, dist + 2.0 * gridSize);
+ checkPointsAtDistance(seg, dist, dist + 3.0 * gridSize);
+ checkPointsAtDistance(seg, dist, dist + 4.0 * gridSize);
+ }
+ }
+
+ private Coordinate computePoint(LineSegment seg, double dist)
+ {
+ double dx = seg.p1.x - seg.p0.x;
+ double dy = seg.p1.y - seg.p0.y;
+ double len = seg.getLength();
+ Coordinate pt = new Coordinate(dist * dx / len, dist * dy / len);
+ pm.makePrecise(pt);
+ return pt;
+ }
+
+ private void checkPointsAtDistance(LineSegment seg, double dist0, double dist1)
+ {
+ Coordinate p0 = computePoint(seg, dist0);
+ Coordinate p1 = computePoint(seg, dist1);
+ if (p0.equals(p1)) {
+ checkNodePosition(seg, p0, p1, 0);
+ }
+ else {
+ checkNodePosition(seg, p0, p1, -1);
+ checkNodePosition(seg, p1, p0, 1);
+ }
+ }
+
+ private void checkNodePosition(LineSegment seg, Coordinate p0, Coordinate p1, int expectedPositionValue)
+ {
+ int octant = Octant.octant(seg.p0, seg.p1);
+ int posValue = SegmentPointComparator.compare(octant, p0, p1);
+ //System.out.println(octant + " " + p0 + " " + p1 + " " + posValue);
+ assertTrue(posValue == expectedPositionValue);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/noding/SegmentPointComparatorTest.java b/modules/core/src/test/java/org/locationtech/jts/noding/SegmentPointComparatorTest.java
new file mode 100644
index 0000000..efe6135
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/noding/SegmentPointComparatorTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding;
+
+import org.locationtech.jts.geom.Coordinate;
+
+import junit.framework.TestCase;
+
+/**
+ * Test IntersectionSegment#compareNodePosition
+ *
+ * @version 1.7
+ */
+public class SegmentPointComparatorTest
+ extends TestCase
+{
+
+ public SegmentPointComparatorTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(SegmentPointComparatorTest.class);
+ }
+
+ public void testOctant0()
+ {
+ checkNodePosition(0, 1, 1, 2, 2, -1);
+ checkNodePosition(0, 1, 0, 1, 1, -1);
+ }
+
+ private void checkNodePosition(int octant,
+ double x0, double y0,
+ double x1, double y1,
+ int expectedPositionValue
+ )
+ {
+ int posValue = SegmentPointComparator.compare(octant,
+ new Coordinate(x0, y0),
+ new Coordinate(x1, y1)
+ );
+ assertTrue(posValue == expectedPositionValue);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/noding/snapround/SnapRoundingTest.java b/modules/core/src/test/java/org/locationtech/jts/noding/snapround/SnapRoundingTest.java
new file mode 100644
index 0000000..0fb5f9b
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/noding/snapround/SnapRoundingTest.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.noding.snapround;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Test Snap Rounding
+ *
+ * @version 1.7
+ */
+public class SnapRoundingTest extends TestCase {
+
+ WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(SnapRoundingTest.class);
+ }
+
+ public SnapRoundingTest(String name) { super(name); }
+
+ public void testPolyWithCloseNode() {
+ String[] polyWithCloseNode = {
+ "POLYGON ((20 0, 20 160, 140 1, 160 160, 160 1, 20 0))"
+ };
+ runRounding(polyWithCloseNode);
+ }
+
+ public void testLineStringLongShort() {
+ String[] geoms = {
+ "LINESTRING (0 0, 2 0)",
+ "LINESTRING (0 0, 10 -1)"
+ };
+ runRounding(geoms);
+ }
+
+ public void testBadLines1() {
+ String[] badLines1 = {
+ "LINESTRING ( 171 157, 175 154, 170 154, 170 155, 170 156, 170 157, 171 158, 171 159, 172 160, 176 156, 171 156, 171 159, 176 159, 172 155, 170 157, 174 161, 174 156, 173 156, 172 156 )"
+ };
+ runRounding(badLines1);
+ }
+ public void testBadLines2() {
+ String[] badLines2 = {
+ "LINESTRING ( 175 222, 176 222, 176 219, 174 221, 175 222, 177 220, 174 220, 174 222, 177 222, 175 220, 174 221 )"
+ };
+ runRounding(badLines2);
+ }
+ public void testCollapse1() {
+ String[] collapse1 = {
+ "LINESTRING ( 362 177, 375 164, 374 164, 372 161, 373 163, 372 165, 373 164, 442 58 )"
+ };
+ runRounding(collapse1);
+ }
+
+ public void testCollapse2() {
+ String[] collapse2 = {
+ "LINESTRING ( 393 175, 391 173, 390 175, 391 174, 391 173 )"
+ };
+ runRounding(collapse2);
+ }
+
+ public void testBadNoding1() {
+ String[] badNoding1 = {
+ "LINESTRING ( 76 47, 81 52, 81 53, 85 57, 88 62, 89 64, 57 80, 82 55, 101 74, 76 99, 92 67, 94 68, 99 71, 103 75, 139 111 )"
+ };
+ runRounding(badNoding1);
+ }
+
+ public void testBadNoding1Extract() {
+ String[] badNoding1Extract = {
+ "LINESTRING ( 82 55, 101 74 )",
+ "LINESTRING ( 94 68, 99 71 )",
+ "LINESTRING ( 85 57, 88 62 )"
+ };
+ runRounding(badNoding1Extract);
+ }
+ public void testBadNoding1ExtractShift() {
+ String[] badNoding1ExtractShift = {
+ "LINESTRING ( 0 0, 19 19 )",
+ "LINESTRING ( 12 13, 17 16 )",
+ "LINESTRING ( 3 2, 6 7 )"
+ };
+ runRounding(badNoding1ExtractShift);
+ }
+
+ static final double SNAP_TOLERANCE = 1.0;
+
+ void runRounding(String[] wkt)
+ {
+ List geoms = fromWKT(wkt);
+ PrecisionModel pm = new PrecisionModel(SNAP_TOLERANCE);
+ GeometryNoder noder = new GeometryNoder(pm);
+ noder.setValidate(true);
+ List nodedLines = noder.node(geoms);
+/*
+ for (Iterator it = nodedLines.iterator(); it.hasNext(); ) {
+ System.out.println(it.next());
+ }
+ */
+ assertTrue(isSnapped(nodedLines, SNAP_TOLERANCE));
+ }
+
+ List fromWKT(String[] wkts)
+ {
+ List geomList = new ArrayList();
+ for (int i = 0; i < wkts.length; i++) {
+ try {
+ geomList.add(rdr.read(wkts[i]));
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return geomList;
+ }
+
+ boolean isSnapped(List lines, double tol)
+ {
+ for (int i = 0; i < lines.size(); i++) {
+ LineString line = (LineString) lines.get(i);
+ for (int j = 0; j < line.getNumPoints(); j++) {
+ Coordinate v = line.getCoordinateN(j);
+ if (! isSnapped(v, lines)) return false;
+
+ }
+ }
+ return true;
+ }
+
+ private boolean isSnapped(Coordinate v, List lines)
+ {
+ for (int i = 0; i < lines.size(); i++) {
+ LineString line = (LineString) lines.get(i);
+ for (int j = 0; j < line.getNumPoints() - 1; j++) {
+ Coordinate p0 = line.getCoordinateN(j);
+ Coordinate p1 = line.getCoordinateN(j+1);
+ if (! isSnapped(v, p0, p1)) return false;
+ }
+ }
+ return true;
+ }
+
+ private boolean isSnapped(Coordinate v, Coordinate p0, Coordinate p1)
+ {
+ if (v.equals2D(p0)) return true;
+ if (v.equals2D(p1)) return true;
+ LineSegment seg = new LineSegment(p0, p1);
+ double dist = seg.distance(v);
+ if (dist < SNAP_TOLERANCE / 2.05) return false;
+ return true;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/BoundaryTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/BoundaryTest.java
new file mode 100644
index 0000000..0e98ace
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/BoundaryTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests {@link BoundaryOp} with different {@link BoundaryNodeRule}s.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class BoundaryTest
+ extends TestCase
+{
+ private static final double TOLERANCE = 0.00005;
+
+ public static void main(String args[]) {
+ TestRunner.run(BoundaryTest.class);
+ }
+
+ private GeometryFactory fact = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(fact);
+
+ public BoundaryTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * For testing only.
+ *
+ * @throws Exception
+ */
+ public void test1()
+ throws Exception
+ {
+ String a = "MULTILINESTRING ((0 0, 10 10), (10 10, 20 20))";
+ // under MultiValent, the common point is the only point on the boundary
+ runBoundaryTest(a, BoundaryNodeRule.MULTIVALENT_ENDPOINT_BOUNDARY_RULE,
+ "POINT (10 10)" );
+ }
+
+ public void test2LinesTouchAtEndpoint2()
+ throws Exception
+ {
+ String a = "MULTILINESTRING ((0 0, 10 10), (10 10, 20 20))";
+
+ // under Mod-2, the common point is not on the boundary
+ runBoundaryTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE,
+ "MULTIPOINT ((0 0), (20 20))" );
+ // under Endpoint, the common point is on the boundary
+ runBoundaryTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE,
+ "MULTIPOINT ((0 0), (10 10), (20 20))" );
+ // under MonoValent, the common point is not on the boundary
+ runBoundaryTest(a, BoundaryNodeRule.MONOVALENT_ENDPOINT_BOUNDARY_RULE,
+ "MULTIPOINT ((0 0), (20 20))" );
+ // under MultiValent, the common point is the only point on the boundary
+ runBoundaryTest(a, BoundaryNodeRule.MULTIVALENT_ENDPOINT_BOUNDARY_RULE,
+ "POINT (10 10)" );
+ }
+
+ public void test3LinesTouchAtEndpoint2()
+ throws Exception
+ {
+ String a = "MULTILINESTRING ((0 0, 10 10), (10 10, 20 20), (10 10, 10 20))";
+
+ // under Mod-2, the common point is on the boundary (3 mod 2 = 1)
+ runBoundaryTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE,
+ "MULTIPOINT ((0 0), (10 10), (10 20), (20 20))" );
+ // under Endpoint, the common point is on the boundary (it is an endpoint)
+ runBoundaryTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE,
+ "MULTIPOINT ((0 0), (10 10), (10 20), (20 20))" );
+ // under MonoValent, the common point is not on the boundary (it has valence > 1)
+ runBoundaryTest(a, BoundaryNodeRule.MONOVALENT_ENDPOINT_BOUNDARY_RULE,
+ "MULTIPOINT ((0 0), (10 20), (20 20))" );
+ // under MultiValent, the common point is the only point on the boundary
+ runBoundaryTest(a, BoundaryNodeRule.MULTIVALENT_ENDPOINT_BOUNDARY_RULE,
+ "POINT (10 10)" );
+ }
+
+ public void testMultiLineStringWithRingTouchAtEndpoint()
+ throws Exception
+ {
+ String a = "MULTILINESTRING ((100 100, 20 20, 200 20, 100 100), (100 200, 100 100))";
+
+ // under Mod-2, the ring has no boundary, so the line intersects the interior ==> not simple
+ runBoundaryTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE,
+ "MULTIPOINT ((100 100), (100 200))" );
+ // under Endpoint, the ring has a boundary point, so the line does NOT intersect the interior ==> simple
+ runBoundaryTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE,
+ "MULTIPOINT ((100 100), (100 200))" );
+ }
+
+ public void testRing()
+ throws Exception
+ {
+ String a = "LINESTRING (100 100, 20 20, 200 20, 100 100)";
+
+ // rings are simple under all rules
+ runBoundaryTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE,
+ "MULTIPOINT EMPTY");
+ runBoundaryTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE,
+ "POINT (100 100)" );
+ }
+
+
+
+ private void runBoundaryTest(String wkt, BoundaryNodeRule bnRule, String wktExpected)
+ throws ParseException
+ {
+ Geometry g = rdr.read(wkt);
+ Geometry expected = rdr.read(wktExpected);
+
+ BoundaryOp op = new BoundaryOp(g, bnRule);
+ Geometry boundary = op.getBoundary();
+ boundary.normalize();
+// System.out.println("Computed Boundary = " + boundary);
+ assertTrue(boundary.equalsExact(expected));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/IsSimpleTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/IsSimpleTest.java
new file mode 100644
index 0000000..2329d6d
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/IsSimpleTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests {@link IsSimpleOp} with different {@link BoundaryNodeRule}s.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class IsSimpleTest
+ extends TestCase
+{
+ private static final double TOLERANCE = 0.00005;
+
+ public static void main(String args[]) {
+ TestRunner.run(IsSimpleTest.class);
+ }
+
+ private GeometryFactory fact = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(fact);
+
+ public IsSimpleTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * 2 LineStrings touching at an endpoint
+ * @throws Exception
+ */
+ public void test2TouchAtEndpoint() throws Exception {
+ String a = "MULTILINESTRING((0 1, 1 1, 2 1), (0 0, 1 0, 2 1))";
+ runIsSimpleTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE, true,
+ new Coordinate(2, 1));
+ runIsSimpleTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, true,
+ new Coordinate(2, 1));
+ }
+
+ /**
+ * 3 LineStrings touching at an endpoint.
+ *
+ * @throws Exception
+ */
+ public void test3TouchAtEndpoint() throws Exception {
+ String a = "MULTILINESTRING ((0 1, 1 1, 2 1), (0 0, 1 0, 2 1), (0 2, 1 2, 2 1))";
+
+ // rings are simple under all rules
+ runIsSimpleTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE, true,
+ new Coordinate(2, 1));
+ runIsSimpleTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, true,
+ new Coordinate(2, 1));
+ }
+
+ public void testCross() throws Exception {
+ String a = "MULTILINESTRING ((20 120, 120 20), (20 20, 120 120))";
+ runIsSimpleTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE, false,
+ new Coordinate(70, 70));
+ runIsSimpleTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, false,
+ new Coordinate(70, 70));
+ }
+
+
+ public void testMultiLineStringWithRingTouchAtEndpoint()
+ throws Exception
+ {
+ String a = "MULTILINESTRING ((100 100, 20 20, 200 20, 100 100), (100 200, 100 100))";
+
+ // under Mod-2, the ring has no boundary, so the line intersects the interior ==> not simple
+ runIsSimpleTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE, false, new Coordinate(100, 100) );
+ // under Endpoint, the ring has a boundary point, so the line does NOT intersect the interior ==> simple
+ runIsSimpleTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, true );
+ }
+
+ public void testRing()
+ throws Exception
+ {
+ String a = "LINESTRING (100 100, 20 20, 200 20, 100 100)";
+
+ // rings are simple under all rules
+ runIsSimpleTest(a, BoundaryNodeRule.MOD2_BOUNDARY_RULE, true );
+ runIsSimpleTest(a, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, true );
+ }
+
+
+ private void runIsSimpleTest(String wkt, BoundaryNodeRule bnRule, boolean expectedResult)
+ throws ParseException
+ {
+ runIsSimpleTest(wkt, bnRule, expectedResult, null);
+ }
+
+ private void runIsSimpleTest(String wkt, BoundaryNodeRule bnRule, boolean expectedResult,
+ Coordinate expectedLocation)
+ throws ParseException
+ {
+ Geometry g = rdr.read(wkt);
+ IsSimpleOp op = new IsSimpleOp(g, bnRule);
+ boolean isSimple = false;
+ isSimple = op.isSimple();
+ Coordinate nonSimpleLoc = op.getNonSimpleLocation();
+
+ // if geom is not simple, should have a valid location
+ assertTrue(isSimple || nonSimpleLoc != null);
+
+ assertTrue(expectedResult == isSimple);
+
+ if (! isSimple && expectedLocation != null) {
+ assertTrue(expectedLocation.distance(nonSimpleLoc) < TOLERANCE);
+ }
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferResultValidatorTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferResultValidatorTest.java
new file mode 100644
index 0000000..41c1375
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferResultValidatorTest.java
@@ -0,0 +1,59 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.operation.buffer.validate.BufferResultValidator;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class BufferResultValidatorTest extends TestCase {
+
+ WKTReader rdr = new WKTReader();
+
+ public BufferResultValidatorTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(BufferResultValidatorTest.class);
+ }
+
+ public void testRandomLineString_envDistanceFailure() throws Exception
+ {
+ String wkt = "LINESTRING (0 0, 0.0050121406740709 -0.0178116943078762, 0.023360713164988 -0.0154225740096356, 0.0242435510469024 -0.0324899203339147, 0.0085030847458749 -0.0391466037351922, -0.0049763942180625 -0.037881923003369, -0.0178369891369056 -0.0336509811666022, -0.0177592362824081 -0.0478222381025471, -0.0261518089363225 -0.059241313936419, -0.0341770463763633 -0.0645869491810857, -0.0427699646025609 -0.0602117910701216, -0.0465729748988988 -0.0703610553736549, -0.05723996951 [...]
+ runTest(wkt, 1.0);
+ }
+
+ void runTest(String wkt, double dist)
+ throws Exception
+ {
+ Geometry g = rdr.read(wkt);
+ Geometry buf = g.buffer(dist);
+ BufferResultValidator validator = new BufferResultValidator(g, dist, buf);
+
+ if (! validator.isValid()) {
+ String msg = validator.getErrorMessage();
+
+ //System.out.println(msg);
+ //System.out.println(WKTWriter.toPoint(validator.getErrorLocation()));
+ }
+ assertTrue(validator.isValid());
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferTest.java
new file mode 100644
index 0000000..0e24a4f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferTest.java
@@ -0,0 +1,478 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import org.locationtech.jts.geom.PrecisionModel;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class BufferTest extends TestCase {
+
+ public BufferTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(BufferTest.class);
+ }
+
+ public void testFirst() throws Exception
+ {
+ testMultiLineString_separateBuffers_floatingSingle();
+ }
+
+ public void testMultiLineString_depthFailure() throws Exception {
+ new BufferValidator(
+ 15,
+ "MULTILINESTRING ((1335558.59524 631743.01449, 1335572.28215 631775.89056, 1335573.2578018496 631782.1915185435), (1335573.2578018496 631782.1915185435, 1335576.62035 631803.90754), (1335558.59524 631743.01449, 1335573.2578018496 631782.1915185435), (1335573.2578018496 631782.1915185435, 1335580.70187 631802.08139))")
+ .setEmptyBufferExpected(false)
+ .test();
+ }
+ public void testMultiLineString_separateBuffers_floating() throws Exception {
+ new BufferValidator(
+ 0.01,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))")
+ .setBufferHolesExpected(false)
+ .setEmptyBufferExpected(false)
+ .test();
+ }
+ public void testMultiLineString2_buffersTouchToMakeHole_floating() throws Exception {
+ new BufferValidator(
+ 0.037,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))")
+ .setBufferHolesExpected(true)
+ .setEmptyBufferExpected(false)
+ .test();
+ }
+ public void testMultiLineString3_holeVanishes_floating() throws Exception {
+ new BufferValidator(
+ 0.16,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))")
+ .setBufferHolesExpected(false)
+ .setEmptyBufferExpected(false)
+ .test();
+ }
+ public void testMultiLineString4_reallyBigDistance_floating() throws Exception {
+ new BufferValidator(
+ 1E10,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))")
+ .setBufferHolesExpected(false)
+ .setEmptyBufferExpected(false)
+ .test();
+ }
+
+ public void testMultiLineString_separateBuffers_floatingSingle() throws Exception {
+ BufferValidator bv = new BufferValidator(
+ 0.01,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))",
+ false);
+
+ bv.setBufferHolesExpected(false);
+ bv.setEmptyBufferExpected(true);
+ bv.setPrecisionModel(new PrecisionModel(PrecisionModel.FLOATING_SINGLE));
+ bv.test();
+ }
+
+ public void testMultiLineString2_buffersTouchToMakeHole_floatingSingle() throws Exception {
+ new BufferValidator(
+ 0.037,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))",
+ false)
+ .setBufferHolesExpected(false)
+ .setEmptyBufferExpected(true)
+ .setPrecisionModel(new PrecisionModel(PrecisionModel.FLOATING_SINGLE))
+ .test();
+ }
+ public void testMultiLineString3_holeVanishes_floatingSingle() throws Exception {
+ new BufferValidator(
+ 0.16,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))",
+ false)
+ .setBufferHolesExpected(false)
+ .setEmptyBufferExpected(true)
+ .setPrecisionModel(new PrecisionModel(PrecisionModel.FLOATING_SINGLE))
+ .test();
+ }
+ public void testMultiLineString4_reallyBigDistance_floatingSingle() throws Exception {
+ new BufferValidator(
+ 1E10,
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))")
+ .setBufferHolesExpected(false)
+ .setEmptyBufferExpected(false)
+ .setPrecisionModel(new PrecisionModel(PrecisionModel.FLOATING_SINGLE))
+ .test();
+ }
+ public void testPolygon_MultipleHoles() throws Exception {
+ new BufferValidator(
+ 10.0,
+ "POLYGON (( 78 82, 78 282, 312 282, 312 82, 78 82 ), ( 117 242, 122 242, 122 248, 117 248, 117 242 ), ( 156 104, 288 104, 288 210, 156 210, 156 104 ))")
+ .setBufferHolesExpected(true)
+ .setEmptyBufferExpected(false)
+ .setPrecisionModel(new PrecisionModel(PrecisionModel.FLOATING))
+ .test();
+ }
+
+ public void test1() throws Exception {
+ new BufferValidator(
+ 0,
+ "POINT (100 100)")
+ .setEmptyBufferExpected(true)
+ .test();
+ }
+ public void test2() throws Exception {
+ new BufferValidator(
+ 0,
+ "LINESTRING (10 10, 100 100)")
+ .setEmptyBufferExpected(true)
+ .test();
+ }
+ public void test1a() throws Exception {
+ new BufferValidator(
+ -1,
+ "POINT (100 100)")
+ .setEmptyBufferExpected(true)
+ .test();
+ }
+ public void test2a() throws Exception {
+ new BufferValidator(
+ -1,
+ "LINESTRING (10 10, 100 100)")
+ .setEmptyBufferExpected(true)
+ .test();
+ }
+
+ public void test3() throws Exception {
+ new BufferValidator(
+ 10,
+ "LINESTRING (100 100, 200 100, 200 200, 100 200, 100 100)")
+ .test();
+ }
+
+ public void test4() throws Exception {
+ new BufferValidator(
+ 50,
+ "LINESTRING (40 40, 160 40, 100 180, 40 80)")
+ .test();
+ }
+ public void test5() throws Exception {
+ new BufferValidator(
+ 0,
+ "POLYGON ((80 300, 280 300, 280 300, 280 300, 280 80, 80 80, 80 300))")
+ .test();
+ }
+ public void test6() throws Exception {
+ new BufferValidator(
+ 10,
+ "POLYGON ((60 300, 60 160, 240 160, 240 300, 60 300))")
+ .test();
+ }
+ public void test7() throws Exception {
+ new BufferValidator(
+ 10,
+ "POLYGON ((80 300, 280 300, 280 80, 80 80, 80 300), (260 280, 180 200, 100 280, 100 100, 260 100, 260 280))")
+ .test();
+ }
+ public void test8() throws Exception {
+ new BufferValidator(
+ 200,
+ "POLYGON ((80 300, 280 300, 280 80, 80 80, 80 300), (260 280, 180 200, 100 280, 100 100, 260 100, 260 280))")
+ .test();
+ }
+ public void test9() throws Exception {
+ new BufferValidator(
+ -10,
+ "POLYGON ((80 300, 280 300, 280 80, 80 80, 80 300))")
+ .test();
+ }
+ public void test10() throws Exception {
+ new BufferValidator(
+ 10,
+ "POLYGON ((100 300, 300 300, 300 100, 100 100, 100 300), (220 220, 180 220, 180 180, 220 180, 220 220))")
+ .test();
+ }
+ public void test11() throws Exception {
+ new BufferValidator(
+ 5,
+ "POLYGON ((260 400, 220 300, 80 300, 180 220, 40 200, 180 160, 60 20, 200 80, 280 20, 260 140, 440 20, 340 180, 520 160, 280 220, 460 340, 300 300, 260 400), (260 320, 240 260, 220 220, 160 180, 220 160, 200 100, 260 160, 300 140, 320 180, 260 200, 260 320))")
+ .test();
+ }
+ public void test12() throws Exception {
+ new BufferValidator(
+ -17,
+ "POLYGON ((260 320, 240 260, 220 220, 160 180, 220 160, 260 160, 260 200, 260 320))")
+ .test();
+ }
+ public void test13() throws Exception {
+ new BufferValidator(
+ -17,
+ "POLYGON ((260 320, 240 260, 220 220, 260 160, 260 320))")
+ .test();
+ }
+ public void test14() throws Exception {
+ new BufferValidator(
+ -14,
+ "POLYGON ((260 320, 240 260, 220 220, 260 160, 260 320))")
+ .test();
+ }
+ public void test15() throws Exception {
+ new BufferValidator(
+ 26,
+ "LINESTRING (260 160, 260 200, 260 320, 240 260, 220 220)")
+ .test();
+ }
+ public void test16() throws Exception {
+ new BufferValidator(
+ -7,
+ "POLYGON ((260 400, 220 300, 80 300, 180 220, 40 200, 180 160, 60 20, 200 80, 280 20, 260 140, 440 20, 340 180, 520 160, 280 220, 460 340, 300 300, 260 400), (260 320, 240 260, 220 220, 160 180, 220 160, 200 100, 260 160, 300 140, 320 180, 260 200, 260 320))")
+ .test();
+ }
+ public void test17() throws Exception {
+ new BufferValidator(
+ -183,
+ "POLYGON ((32 136, 27 163, 30 236, 34 252, 49 291, 72 326, 83 339, 116 369, 155 391, 176 400, 219 414, 264 417, 279 416, 339 401, 353 395, 380 381, 394 372, 441 328, 458 303, 463 294, 480 251, 486 205, 486 183, 473 115, 469 105, 460 85, 454 74, 423 33, 382 2, 373 -3, 336 -19, 319 -24, 275 -31, 252 -32, 203 -27, 190 -24, 149 -10, 139 -5, 84 37, 76 46, 52 81, 36 121, 32 136))")
+ .test();
+ }
+ public void test18() throws Exception {
+ new BufferValidator(
+ 20,
+ "POLYGON((-4 225, -17 221, -16 223, -15 224, -13 227, -4 225))")
+ .test();
+ }
+ public void test19() throws Exception {
+ new BufferValidator(
+ 21,
+ "POLYGON ((184 369, 181 368, 180 368, 179 367, 176 366, 185 357, 184 369 ))")
+ .test();
+ }
+ public void test20() throws Exception {
+ new BufferValidator(
+ 1000,
+ "POLYGON ((13841 1031, 13851 903, 13853 885, 13853 875, 13856 862, 13859 831, 13670 900, 13841 1031))")
+ .test();
+ }
+ public void test21() throws Exception {
+ new BufferValidator(
+ 18,
+ "POLYGON ((164 84, 185 91, 190 75, 187 76, 182 77, 179 79, 178 79, 174 81, 173 81, 172 82, 169 83, 164 84 ))")
+ .test();
+ }
+ public void test22() throws Exception {
+ new BufferValidator(
+ 15,
+ "POLYGON ((224 271, 225 261, 214 258, 210 266, 212 267, 214 267, 217 268, 218 268, 219 268, 221 269, 222 270, 224 271 ))")
+ .test();
+ }
+ public void test23() throws Exception {
+ new BufferValidator(
+ 25,
+ "POLYGON ((484 76, 474 79, 492 122, 502 119, 501 117, 500 112, 499 111, 498 107, 497 104, 496 103, 494 98, 493 96, 491 92, 490 90, 489 86, 487 81, 486 79, 485 77, 484 76 ))")
+ .test();
+ }
+ public void test24() throws Exception {
+ new BufferValidator(
+ 160,
+ "POLYGON ((20 60, 20 20, 240 20, 40 21, 240 22, 40 22, 240 23, 240 60, 20 60))")
+ .test();
+ }
+ public void test25() throws Exception {
+ new BufferValidator(
+ -3,
+ "POLYGON ((233 195, 232 195, 231 194, 222 188, 226 187, 227 187, 229 187, 230 186, 232 186, 234 185, 236 184, 237 183, 238 182, 237 184, 236 185, 236 186, 235 187, 235 188, 234 189, 234 191, 234 192, 233 193, 233 195 ))")
+ .test();
+ }
+ public void test26() throws Exception {
+ new BufferValidator(
+ 6,
+ "LINESTRING (233 195, 232 195, 231 194, 222 188, 226 187, 227 187, 229 187, 230 186, 232 186, 234 185, 236 184, 237 183, 238 182, 237 184, 236 185, 236 186, 235 187, 235 188, 234 189, 234 191, 234 192, 233 193, 233 195 )")
+ .test();
+ }
+ public void test27() throws Exception {
+ new BufferValidator(
+ -30,
+ "POLYGON ((2330 1950, 2320 1950, 2310 1940, 2220 1880, 2260 1870, 2270 1870, 2290 1870, 2300 1860, 2320 1860, 2340 1850, 2360 1840, 2370 1830, 2380 1820, 2370 1840, 2360 1850, 2360 1860, 2350 1870, 2350 1880, 2340 1890, 2340 1910, 2340 1920, 2330 1930, 2330 1950 ))")
+ .test();
+ }
+ public void test28() throws Exception {
+ new BufferValidator(
+ 30,
+ "LINESTRING (2330 1950, 2320 1950, 2310 1940, 2220 1880, 2260 1870, 2270 1870, 2290 1870, 2300 1860, 2320 1860, 2340 1850, 2360 1840, 2370 1830, 2380 1820, 2370 1840, 2360 1850, 2360 1860, 2350 1870, 2350 1880, 2340 1890, 2340 1910, 2340 1920, 2330 1930, 2330 1950 )")
+ .test();
+ }
+ public void test29() throws Exception {
+ new BufferValidator(
+ 26,
+ "POLYGON ((440 -93, 440 -67, 475 -67, 471 -71, 469 -72, 468 -73, 467 -74, 463 -78, 459 -81, 458 -82, 454 -84, 453 -85, 452 -86, 450 -86, 449 -87, 448 -88, 444 -90, 443 -91, 441 -92, 440 -93 ))")
+ .test();
+ }
+ public void test30() throws Exception {
+ new BufferValidator(
+ 260,
+ "POLYGON ((4400 -930, 4400 -670, 4750 -670, 4710 -710, 4690 -720, 4680 -730, 4670 -740, 4630 -780, 4590 -810, 4580 -820, 4540 -840, 4530 -850, 4520 -860, 4500 -860, 4490 -870, 4480 -880, 4440 -900, 4430 -910, 4410 -920, 4400 -930 ))")
+ .test();
+ }
+ public void test31() throws Exception {
+ new BufferValidator(
+ 0.1,
+ "POLYGON ((635074.6769928858 6184832.427381967, 635075.6723193424 6184799.950949265, 634717.5983159657 6184655.107092909, 634701.0176852546 6184648.498845058, 634697.7188197445 6184647.20632975, 634694.416887708 6184645.922033237, 634691.1138635761 6184644.642692243, 634687.8077729489 6184643.371570057, 634684.498667351 6184642.107006015, 634681.1875340013 6184640.847368483, 634677.8742698929 6184639.595978798, 634674.5570551592 6184638.351118257, 634671.2386969016 6184637.11287392 [...]
+ .test();
+ }
+ public void test32() throws Exception {
+ new BufferValidator(
+ 30,
+ "MULTILINESTRING ((80 285, 85.5939933259177 234.65406006674084 ), (85.5939933259177 234.65406006674084, 98 123, 294 92, 344.3694502052736 126.0884157954882 ), (344.3694502052736 126.0884157954882, 393 159 ), (51 235, 85.5939933259177 234.65406006674084 ), (85.5939933259177 234.65406006674084, 251 233, 344.3694502052736 126.0884157954882 ), (344.3694502052736 126.0884157954882, 382 83 ))")
+ .test();
+ }
+ public void test33() throws Exception {
+ //Get side location conflict in #contains, but the geometry is invalid
+ // [Jon Aquino 10/29/2003]
+ // new BufferValidator(.0001, new
+ // PrecisionModel(PrecisionModel.FLOATING_SINGLE), "MULTIPOLYGON
+ // (((708258.754920656
+ // 2402197.91172757, 708257.029447455 2402206.56901508, 708652.961095455
+ // 2402312.65463437, 708657.068786251 2402304.6356364, 708258.754920656
+ // 2402197.91172757 )), ((708653.498611049 2402311.54647056,
+ // 708708.895756966 2402203.47250014, 708280.326454234 2402089.6337791,
+ // 708247.896591321 2402252.48269854, 708367.379593851 2402324.00761653,
+ // 708248.882609455 2402253.07294874, 708249.523621829 2402244.3124463,
+ // 708261.854734465 2402182.39086576, 708262.818392579 2402183.35452387,
+ // 708653.498611049 2402311.54647056 )))")
+ // .test();
+ }
+ public void test34() throws Exception {
+ new BufferValidator(
+ 1,
+ "GEOMETRYCOLLECTION (POLYGON ((0 10, 10 0, 10 10, 0 10), (4 8, 8 4, 8 8, 4 8)), LINESTRING (6 6, 20 20))")
+ .test();
+ }
+ public void test35() throws Exception {
+ new BufferValidator(
+ 20,
+ "GEOMETRYCOLLECTION (POINT (100 100), POLYGON ((400 260, 280 380, 240 220, 120 300, 120 100, 260 40, 200 160, 400 260)), LINESTRING (260 400, 220 280, 120 400, 20 280, 160 160, 60 40, 160 20, 360 140))")
+ .test();
+ }
+ public void test36() throws Exception {
+ new BufferValidator(
+ 20,
+ "GEOMETRYCOLLECTION (POINT (100 100), POLYGON ((400 260, 120 300, 120 100, 400 260)), LINESTRING (20 280, 160 160, 60 40))")
+ .test();
+ }
+ public void test37() throws Exception {
+ new BufferValidator(
+ 300,
+ "POLYGON ((-140 700, 880 1120, 1280 -120, 300 -600, -480 -480, -140 700), (0 360, 780 500, 240 -220, 0 360))")
+ .test();
+ }
+ public void test38() throws Exception {
+ new BufferValidator(
+ 300,
+ "POLYGON ((-140 700, 880 1120, 1280 -120, 300 -600, -480 -480, -140 700), (0 360, 240 -220, 780 500, 0 360))")
+ .test();
+ }
+ public void test39() throws Exception {
+ new BufferValidator(
+ 30,
+ "MULTIPOLYGON (((0 400, 440 400, 440 0, 0 0, 0 400),(380 360, 160 120, 260 80, 380 360)), ((360 320, 200 120, 240 100, 360 320)))")
+ .test();
+ }
+
+ public void testFloatingPrecision1() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (331771 5530174, 331776 5530175, 331782 5530177, 331787 5530177, 331791 5530178, 331796 5530178, 331800 5530178, 331805 5530177, 331811 5530176, 331817 5530175, 331823 5530173, 331828 5530171, 331832 5530169, 331835 5530167, 331839 5530163, 331843 5530160, 331846 5530157, 331849 5530154, 331853 5530150, 331855 5530145, 331857 5530141)")
+ .test();
+ }
+ public void testFloatingPrecision2() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (317091 5557033, 317079 5557042, 317067 5557053, 317055 5557065, 317045 5557078, 317037 5557091, 317029 5557098, 317016 5557108, 317002 5557118, 316990 5557129, 316986 5557131, 316978 5557133, 316968 5557133, 316965 5557131, 316954 5557120, 316952 5557115, 316951 5557108, 316949 5557092, 316948 5557076, 316946 5557063, 316944 5557057, 316937 5557042, 316924 5557029, 316911 5557019, 316896 5557009, 316881 5557001, 316865 5556997, 316849 5556992, 316834 5556988, 316817 55 [...]
+ .test();
+ }
+ public void testFloatingPrecision3() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (300181 5547255, 300183 5547252, 300203 5547253, 300209 5547261, 300237 5547277, 300262 5547286, 300280 5547292, 300288 5547297, 300293 5547303, 300297 5547311, 300299 5547319, 300299 5547334, 300306 5547349, 300320 5547367)")
+ .test();
+ }
+ public void testFloatingPrecision4() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (301546 5537924, 301547 5537922, 301551 5537919, 301555 5537919, 301559 5537918, 301565 5537918, 301569 5537917, 301573 5537915, 301580 5537912, 301583 5537909, 301587 5537906, 301594 5537900, 301598 5537897, 301601 5537893, 301605 5537889, 301608 5537885, 301609 5537880, 301612 5537876, 301614 5537873, 301616 5537869, 301620 5537865, 301624 5537860, 301632 5537852, 301640 5537842, 301643 5537836, 301644 5537829, 301644 5537822, 301646 5537815, 301647 5537808, 301650 55 [...]
+ .test();
+ }
+ public void testFloatingPrecision5() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (334797 5560136, 334781 5560129, 334777 5560128, 334762 5560122, 334760 5560121, 334752 5560116, 334745 5560109, 334742 5560103, 334741 5560098, 334736 5560087, 334731 5560082, 334726 5560081, 334708 5560072, 334691 5560063, 334674 5560052, 334660 5560048, 334655 5560048, 334633 5560049, 334621 5560046, 334616 5560043, 334596 5560034, 334586 5560025, 334573 5560009, 334562 5559982, 334549 5559943, 334543 5559923, 334538 5559905, 334535 5559887, 334530 5559869, 334536 55 [...]
+ .test();
+ }
+ public void testFloatingPrecision6() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (316640 5563099, 316639 5563114, 316642 5563132, 316644 5563137, 316650 5563144, 316653 5563147, 316663 5563159, 316665 5563164, 316667 5563172, 316667 5563193, 316668 5563209, 316672 5563214, 316678 5563228, 316679 5563230, 316679 5563236, 316678 5563252, 316676 5563256, 316671 5563270, 316669 5563289, 316667 5563304, 316666 5563308, 316656 5563323, 316646 5563336, 316639 5563347)")
+ .test();
+ }
+ public void testFloatingPrecision7() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (301178 5534835, 301189 5534837, 301218 5534837, 301229 5534836, 301237 5534836, 301245 5534838, 301268 5534838, 301273 5534837, 301279 5534838, 301286 5534838, 301289 5534839, 301296 5534842, 301302 5534844, 301306 5534846, 301309 5534850, 301313 5534853, 301316 5534856, 301319 5534868, 301320 5534873, 301323 5534877, 301326 5534882, 301334 5534896, 301340 5534902, 301344 5534908, 301348 5534913, 301352 5534919, 301357 5534925, 301363 5534932, 301369 5534937, 301375 55 [...]
+ .test();
+ }
+ public void testFloatingPrecision8() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (303722 5533544, 303713 5533542, 303706 5533539, 303697 5533537, 303694 5533534, 303677 5533527, 303673 5533525, 303670 5533524, 303669 5533523, 303664 5533519, 303654 5533513, 303647 5533507, 303644 5533506, 303634 5533504, 303633 5533504, 303627 5533502)")
+ .test();
+ }
+ public void testFloatingPrecision9() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (309969 5563538, 309955 5563542, 309941 5563548, 309913 5563562, 309896 5563569, 309883 5563576, 309868 5563586, 309855 5563594, 309841 5563603, 309830 5563614, 309818 5563624, 309805 5563635, 309791 5563645, 309778 5563654, 309766 5563663, 309752 5563672, 309722 5563692, 309709 5563699, 309681 5563713, 309667 5563721, 309651 5563728, 309631 5563734, 309615 5563739, 309602 5563747, 309589 5563756, 309578 5563766, 309566 5563775, 309554 5563785, 309542 5563796, 309538 55 [...]
+ .test();
+ }
+ public void testFloatingPrecision10() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (299331 5536963, 299335 5536956, 299335 5536953, 299336 5536949, 299338 5536942, 299345 5536933, 299349 5536927, 299352 5536924, 299358 5536922, 299364 5536919, 299369 5536916, 299375 5536912, 299380 5536908, 299387 5536905, 299391 5536904, 299395 5536902, 299399 5536899, 299402 5536896, 299405 5536892, 299415 5536886, 299425 5536882, 299435 5536880, 299449 5536874, 299455 5536869, 299461 5536865, 299468 5536862, 299474 5536859, 299480 5536855, 299491 5536846, 299497 55 [...]
+ .test();
+ }
+ public void testFloatingPrecision11() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (325089 5534737, 325089 5534733, 325093 5534723, 325099 5534718, 325118 5534712, 325129 5534709, 325147 5534709, 325164 5534732, 325164 5534740, 325162 5534746, 325159 5534749, 325144 5534760, 325143 5534763, 325145 5534782, 325162 5534800, 325184 5534812, 325187 5534815, 325190 5534831, 325196 5534852, 325205 5534867, 325214 5534876, 325219 5534878, 325239 5534880, 325251 5534890, 325259 5534892, 325282 5534887, 325294 5534883, 325314 5534864)")
+ .test();
+ }
+ public void testFloatingPrecision12() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (307468 5557827, 307467 5557842, 307466 5557854, 307463 5557874, 307459 5557889, 307454 5557902, 307447 5557922, 307440 5557944, 307428 5557965, 307417 5557986, 307411 5557996, 307404 5558020, 307398 5558031, 307390 5558056, 307387 5558066, 307384 5558084, 307383 5558093, 307385 5558102, 307389 5558110, 307394 5558116, 307404 5558121, 307421 5558122, 307443 5558121, 307464 5558127, 307486 5558133, 307502 5558142, 307508 5558150)")
+ .test();
+ }
+ public void testFloatingPrecision13() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (301395 5535820, 301412 5535803, 301416 5535798, 301420 5535786, 301423 5535782, 301427 5535778, 301432 5535771, 301437 5535768, 301444 5535763, 301447 5535760, 301452 5535757, 301459 5535754, 301462 5535753, 301468 5535750, 301473 5535747, 301481 5535742, 301487 5535739, 301494 5535734, 301499 5535730, 301508 5535725, 301514 5535721, 301521 5535716, 301527 5535714, 301533 5535711, 301538 5535707, 301542 5535703, 301554 5535693, 301559 5535688, 301563 5535681)")
+ .test();
+ }
+ public void testFloatingPrecision14() throws Exception {
+ new BufferValidator(
+ 100,
+ "LINESTRING (331384 5535032, 331397 5535031, 331415 5535025, 331426 5535022, 331436 5535016, 331451 5534999, 331460 5534994, 331468 5534993, 331474 5534996, 331479 5535001, 331482 5535015, 331486 5535019, 331493 5535018, 331504 5535011, 331508 5535011, 331519 5535022, 331526 5535023, 331542 5535019, 331547 5535016, 331549 5534994, 331558 5534975, 331562 5534968, 331565 5534966, 331571 5534967, 331575 5534970, 331576 5534978, 331575 5534987, 331568 5535005, 331564 5535022, 331565 55 [...]
+ .test();
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferValidator.java b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferValidator.java
new file mode 100644
index 0000000..ccba1e8
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferValidator.java
@@ -0,0 +1,266 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.operation.buffer.validate.BufferResultValidator;
+import org.locationtech.jts.util.StringUtil;
+
+import junit.framework.Assert;
+
+
+/**
+ * @version 1.7
+ */
+public class BufferValidator
+{
+
+
+ public static void main(String[] args) throws Exception {
+ Geometry g =
+ new WKTReader().read(
+ "MULTILINESTRING (( 635074.5418406526 6184832.4888257105, 635074.5681951842 6184832.571842485, 635074.6472587794 6184832.575795664 ), ( 635074.6657069515 6184832.53889932, 635074.6933792098 6184832.451929366, 635074.5642420045 6184832.474330718 ))");
+ //System.out.println(g);
+ //System.out.println(g.buffer(0.01, 100));
+ //System.out.println("END");
+ }
+
+
+ private static abstract class Test implements Comparable {
+ private String name;
+ public Test(String name) {
+ this(name, 2);
+ }
+ public Test(String name, int priority) {
+ this.name = name;
+ this.priority = priority;
+ }
+ public String getName() {
+ return name;
+ }
+ public String toString() {
+ return getName();
+ }
+ public abstract void test() throws Exception;
+ private int priority;
+ public int compareTo(Object o) {
+ return priority - ((Test) o).priority;
+ }
+ }
+
+ private Geometry original;
+ private double bufferDistance;
+ private Map nameToTestMap = new HashMap();
+ private Geometry buffer;
+ private static final int QUADRANT_SEGMENTS_1 = 100;
+ private static final int QUADRANT_SEGMENTS_2 = 50;
+ private String wkt;
+ private GeometryFactory geomFact = new GeometryFactory();
+ private WKTWriter wktWriter = new WKTWriter();
+ private WKTReader wktReader;
+
+
+ public BufferValidator(double bufferDistance, String wkt)
+ throws ParseException {
+ this(bufferDistance, wkt, true);
+ }
+
+ public BufferValidator(double bufferDistance, String wkt, boolean addContainsTest)
+ throws ParseException {
+ // SRID = 888 is to test that SRID is preserved in computed buffers
+ setFactory(new PrecisionModel(), 888);
+ this.bufferDistance = bufferDistance;
+ this.wkt = wkt;
+ if (addContainsTest) addContainsTest();
+ //addBufferResultValidatorTest();
+ }
+
+
+ public void test() throws Exception {
+ try {
+ Collection tests = nameToTestMap.values();
+ for (Iterator i = tests.iterator();
+ i.hasNext();
+ ) {
+ Test test = (Test) i.next();
+ test.test();
+ }
+ } catch (Exception e) {
+ throw new Exception(
+ supplement(e.toString()) + StringUtil.getStackTrace(e));
+ }
+ }
+ private String supplement(String message) throws ParseException {
+ String newMessage = "\n" + message + "\n";
+ newMessage += "Original: " + wktWriter.writeFormatted(getOriginal()) + "\n";
+ newMessage += "Buffer Distance: " + bufferDistance + "\n";
+ newMessage += "Buffer: " + wktWriter.writeFormatted(getBuffer()) + "\n";
+ return newMessage.substring(0, newMessage.length() - 1);
+ }
+
+ private BufferValidator addTest(Test test) {
+ nameToTestMap.put(test.getName(), test);
+ return this;
+ }
+ public BufferValidator setExpectedArea(final double expectedArea) {
+ return addTest(new Test("Area Test") {
+ public void test() throws Exception {
+ double tolerance =
+ Math.abs(
+ getBuffer().getArea()
+ - getOriginal()
+ .buffer(
+ bufferDistance,
+ QUADRANT_SEGMENTS_1 - QUADRANT_SEGMENTS_2)
+ .getArea());
+ Assert.assertEquals(
+ getName(),
+ expectedArea,
+ getBuffer().getArea(),
+ tolerance);
+ }
+ });
+ }
+
+ public BufferValidator setEmptyBufferExpected(final boolean emptyBufferExpected) {
+ return addTest(new Test("Empty Buffer Test", 1) {
+ public void test() throws Exception {
+ Assert.assertTrue(
+ supplement(
+ "Expected buffer "
+ + (emptyBufferExpected ? "" : "not ")
+ + "to be empty"),
+ emptyBufferExpected == getBuffer().isEmpty());
+ }
+ });
+ }
+
+ public BufferValidator setBufferHolesExpected(final boolean bufferHolesExpected) {
+ return addTest(new Test("Buffer Holes Test") {
+ public void test() throws Exception {
+ Assert.assertTrue(
+ supplement(
+ "Expected buffer "
+ + (bufferHolesExpected ? "" : "not ")
+ + "to have holes"),
+ hasHoles(getBuffer()) == bufferHolesExpected);
+ }
+ private boolean hasHoles(Geometry buffer) {
+ if (buffer.isEmpty()) {
+ return false;
+ }
+ if (buffer instanceof Polygon) {
+ return ((Polygon) buffer).getNumInteriorRing() > 0;
+ }
+ MultiPolygon multiPolygon = (MultiPolygon) buffer;
+ for (int i = 0; i < multiPolygon.getNumGeometries(); i++) {
+ if (hasHoles(multiPolygon.getGeometryN(i))) {
+ return true;
+ }
+ }
+ return false;
+ }
+ });
+ }
+
+ private Geometry getOriginal() throws ParseException {
+ if (original == null) {
+ original = wktReader.read(wkt);
+ }
+ return original;
+ }
+
+
+ public BufferValidator setPrecisionModel(PrecisionModel precisionModel) {
+ wktReader = new WKTReader(new GeometryFactory(precisionModel));
+ return this;
+ }
+
+ public BufferValidator setFactory(PrecisionModel precisionModel, int srid) {
+ wktReader = new WKTReader(new GeometryFactory(precisionModel, srid));
+ return this;
+ }
+
+ private Geometry getBuffer() throws ParseException {
+ if (buffer == null) {
+ buffer = getOriginal().buffer(bufferDistance, QUADRANT_SEGMENTS_1);
+ if (getBuffer().getClass() == GeometryCollection.class && getBuffer().isEmpty()) {
+ try {
+ //#contains doesn't work with GeometryCollections [Jon Aquino
+ // 10/29/2003]
+ buffer = wktReader.read("POINT EMPTY");
+ } catch (ParseException e) {
+ org.locationtech.jts.util.Assert.shouldNeverReachHere();
+ }
+ }
+ }
+ return buffer;
+ }
+
+ private void addContainsTest() {
+ addTest(new Test("Contains Test") {
+ public void test() throws Exception {
+ if (getOriginal().getClass() == GeometryCollection.class) {
+ return;
+ }
+ org.locationtech.jts.util.Assert.isTrue(getOriginal().isValid());
+ if (bufferDistance > 0) {
+ Assert.assertTrue(
+ supplement("Expected buffer to contain original"),
+ contains(getBuffer(), getOriginal()));
+ } else {
+ Assert.assertTrue(
+ supplement("Expected original to contain buffer"),
+ contains(getOriginal(), getBuffer()));
+ }
+ }
+ private boolean contains(Geometry a, Geometry b) {
+ //JTS doesn't currently handle empty geometries correctly [Jon Aquino
+ // 10/29/2003]
+ if (b.isEmpty()) {
+ return true;
+ }
+ boolean isContained = a.contains(b);
+ return isContained;
+ }
+ });
+ }
+
+ private void addBufferResultValidatorTest() {
+ addTest(new Test("BufferResultValidator Test") {
+ public void test() throws Exception {
+ if (getOriginal().getClass() == GeometryCollection.class) {
+ return;
+ }
+
+ Assert.assertTrue(
+ supplement("BufferResultValidator failure"),
+ BufferResultValidator.isValid(getOriginal(), bufferDistance, getBuffer()));
+ }
+ });
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/buffer/DepthSegmentTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/DepthSegmentTest.java
new file mode 100644
index 0000000..9b312bb
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/buffer/DepthSegmentTest.java
@@ -0,0 +1,62 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.buffer;
+
+import org.locationtech.jts.geom.LineSegment;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * @version 1.7
+ */
+public class DepthSegmentTest extends TestCase {
+
+ public DepthSegmentTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(DepthSegmentTest.class);
+ }
+
+ public void testContractTipToTail() throws Exception
+ {
+ SubgraphDepthLocater.DepthSegment ds0 = depthSeg(0.7, 0.2, 1.4, 0.9);
+ SubgraphDepthLocater.DepthSegment ds1 = depthSeg(0.3, 1.1, 0.7, 0.2);
+ checkContract(ds0, ds1);
+ }
+
+ public void testContract2() throws Exception
+ {
+ SubgraphDepthLocater.DepthSegment ds0 = depthSeg(0.1, 1.9, 0.5, 1.0);
+ SubgraphDepthLocater.DepthSegment ds1 = depthSeg(1.0, 0.9, 1.9, 1.4);
+ checkContract(ds0, ds1);
+ }
+
+ private void checkContract(
+ SubgraphDepthLocater.DepthSegment ds0,
+ SubgraphDepthLocater.DepthSegment ds1) {
+ // should never have ds1 < ds2 && ds2 < ds1
+ int cmp0 = ds0.compareTo(ds1);
+ int cmp1 = ds1.compareTo(ds0);
+ boolean isFail = cmp0 != 0 && cmp0 == cmp1;
+ assertTrue(! isFail);
+ }
+
+ private SubgraphDepthLocater.DepthSegment depthSeg(double x0, double y0, double x1, double y1) {
+ return new SubgraphDepthLocater.DepthSegment(new LineSegment(x0,y0,x1,y1), 0);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/distance/DistanceTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/distance/DistanceTest.java
new file mode 100644
index 0000000..a85d22c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/distance/DistanceTest.java
@@ -0,0 +1,100 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.distance;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * @version 1.7
+ */
+public class DistanceTest extends TestCase {
+
+ private PrecisionModel precisionModel = new PrecisionModel(1);
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(DistanceTest.class);
+ }
+
+ public DistanceTest(String name) { super(name); }
+
+ public void testDisjointCollinearSegments() throws Exception {
+ Geometry g1 = reader.read("LINESTRING (0.0 0.0, 9.9 1.4)");
+ Geometry g2 = reader.read("LINESTRING (11.88 1.68, 21.78 3.08)");
+ assertEquals(2.23606, g1.distance(g2), 0.0001);
+ }
+
+ public void testEverything() throws Exception {
+ Geometry g1 = reader.read("POLYGON ((40 320, 200 380, 320 80, 40 40, 40 320), (180 280, 80 280, 100 100, 220 140, 180 280))");
+ Geometry g2 = reader.read("POLYGON ((160 240, 120 240, 120 160, 160 140, 160 240))");
+ assertEquals(18.97366596, g1.distance(g2), 1E-5);
+
+ g2 = reader.read("POLYGON ((160 240, 120 240, 120 160, 180 100, 160 240))");
+ assertEquals(0.0, g1.distance(g2), 1E-5);
+
+ LineString l1 = (LineString) reader.read("LINESTRING(10 10, 20 20, 30 40)");
+ LineString l2 = (LineString) reader.read("LINESTRING(10 10, 20 20, 30 40)");
+ assertEquals(0.0, l1.distance(l2), 1E-5);
+ }
+
+ public void testEmpty() throws Exception {
+ Geometry g1 = reader.read("POINT (0 0)");
+ Geometry g2 = reader.read("POLYGON EMPTY");
+ assertEquals(0.0, g1.distance(g2), 0.0);
+ }
+
+ public void testClosestPoints1() throws Exception {
+ doNearestPointsTest("POLYGON ((200 180, 60 140, 60 260, 200 180))", "POINT (140 280)", 57.05597791103589, new Coordinate(111.6923076923077, 230.46153846153845), new Coordinate(140, 280));
+ }
+ public void testClosestPoints2() throws Exception {
+ doNearestPointsTest("POLYGON ((200 180, 60 140, 60 260, 200 180))", "MULTIPOINT ((140 280), (140 320))", 57.05597791103589, new Coordinate(111.6923076923077, 230.46153846153845), new Coordinate(140, 280));
+ }
+ public void testClosestPoints3() throws Exception {
+ doNearestPointsTest("LINESTRING (100 100, 200 100, 200 200, 100 200, 100 100)", "POINT (10 10)", 127.27922061357856, new Coordinate(100, 100), new Coordinate(10, 10));
+ }
+ public void testClosestPoints4() throws Exception {
+ doNearestPointsTest("LINESTRING (100 100, 200 200)", "LINESTRING (100 200, 200 100)", 0.0, new Coordinate(150, 150), new Coordinate(150, 150));
+ }
+ public void testClosestPoints5() throws Exception {
+ doNearestPointsTest("LINESTRING (100 100, 200 200)", "LINESTRING (150 121, 200 0)", 20.506096654409877, new Coordinate(135.5, 135.5), new Coordinate(150, 121));
+ }
+ public void testClosestPoints6() throws Exception {
+ doNearestPointsTest("POLYGON ((76 185, 125 283, 331 276, 324 122, 177 70, 184 155, 69 123, 76 185), (267 237, 148 248, 135 185, 223 189, 251 151, 286 183, 267 237))", "LINESTRING (153 204, 185 224, 209 207, 238 222, 254 186)", 13.788860460124573, new Coordinate(139.4956500724988, 206.78661188980183), new Coordinate(153, 204));
+ }
+ public void testClosestPoints7() throws Exception {
+ doNearestPointsTest("POLYGON ((76 185, 125 283, 331 276, 324 122, 177 70, 184 155, 69 123, 76 185), (267 237, 148 248, 135 185, 223 189, 251 151, 286 183, 267 237))", "LINESTRING (120 215, 185 224, 209 207, 238 222, 254 186)", 0.0, new Coordinate(120, 215), new Coordinate(120, 215));
+ }
+
+ private void doNearestPointsTest(String wkt0, String wkt1, double distance,
+ Coordinate p0, Coordinate p1) throws ParseException {
+ DistanceOp op = new DistanceOp(new WKTReader().read(wkt0), new WKTReader().read(wkt1));
+ double tolerance = 1E-10;
+ assertEquals(distance, op.nearestPoints()[0].distance(op.nearestPoints()[1]), tolerance);
+ assertEquals(p0.x, op.nearestPoints()[0].x, tolerance);
+ assertEquals(p0.y, op.nearestPoints()[0].y, tolerance);
+ assertEquals(p1.x, op.nearestPoints()[1].x, tolerance);
+ assertEquals(p1.y, op.nearestPoints()[1].y, tolerance);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/distance3d/Distance3DOpTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/distance3d/Distance3DOpTest.java
new file mode 100644
index 0000000..f5e0f39
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/distance3d/Distance3DOpTest.java
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.distance3d;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+public class Distance3DOpTest extends TestCase
+{
+ static GeometryFactory geomFact = new GeometryFactory();
+ static WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(Distance3DOpTest.class);
+ }
+
+ public Distance3DOpTest(String name) {
+ super(name);
+ }
+
+ /*
+ public void testTest()
+ {
+ checkDistance( "LINESTRING (250 250 0, 260 260 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 70.71067811865476);
+
+ testLinePolygonFlat();
+ }
+ */
+
+ public void testEmpty()
+ {
+ checkDistance( "POINT EMPTY", "POINT EMPTY", 0);
+ checkDistance( "LINESTRING EMPTY", "POINT (0 0 0)", 0);
+ checkDistance( "MULTILINESTRING EMPTY", "POLYGON EMPTY", 0);
+ checkDistance( "MULTIPOLYGON EMPTY", "POINT (0 0 0)", 0);
+ }
+
+ public void testPartiallyEmpty()
+ {
+ checkDistance( "GEOMETRYCOLLECTION( MULTIPOINT (0 0 0), POLYGON EMPTY)", "POINT (0 1 0)", 1);
+ checkDistance( "GEOMETRYCOLLECTION( MULTIPOINT (11 11 0), POLYGON EMPTY)",
+ "GEOMETRYCOLLECTION( MULTIPOINT EMPTY, LINESTRING (10 10 0, 10 20 0 ))",
+ 1);
+ }
+
+ public void testPointPointFlat() {
+ checkDistance( "POINT (10 10 0 )",
+ "POINT (20 20 0 )",
+ 14.1421356);
+ checkDistance( "POINT (10 10 0 )",
+ "POINT (20 20 0 )",
+ 14.1421356);
+ }
+
+ public void testPointPoint() {
+ checkDistance( "POINT (0 0 0 )",
+ "POINT (0 0 1 )",
+ 1);
+ checkDistance( "POINT (10 10 1 )",
+ "POINT (11 11 2 )",
+ 1.7320508075688772);
+ checkDistance( "POINT (10 10 0 )",
+ "POINT (10 20 10 )",
+ 14.142135623730951);
+ }
+
+ public void testPointSegFlat() {
+ checkDistance( "LINESTRING (10 10 0, 10 20 0 )",
+ "POINT (20 15 0 )",
+ 10);
+ }
+
+ public void testPointSeg() {
+ checkDistance( "LINESTRING (0 0 0, 10 10 10 )",
+ "POINT (5 5 5 )",
+ 0);
+ checkDistance( "LINESTRING (10 10 10, 20 20 20 )",
+ "POINT (11 11 10 )",
+ 0.816496580927726);
+ }
+
+ public void testPointSegRobust() {
+ checkDistance( "LINESTRING (0 0 0, 10000000 10000000 1 )",
+ "POINT (9999999 9999999 .9999999 )",
+ 0 );
+ checkDistance( "LINESTRING (0 0 0, 10000000 10000000 1 )",
+ "POINT (5000000 5000000 .5 )",
+ 0 );
+ }
+
+ public void testCrossSegmentsFlat() {
+ checkDistance( "LINESTRING (0 0 0, 10 10 0 )",
+ "LINESTRING (10 0 0, 0 10 0 )",
+ 0);
+ checkDistance( "LINESTRING (0 0 10, 30 10 10 )",
+ "LINESTRING (10 0 10, 0 10 10 )",
+ 0);
+ }
+
+ public void testCrossSegments() {
+ checkDistance( "LINESTRING (0 0 0, 10 10 0 )",
+ "LINESTRING (10 0 1, 0 10 1 )",
+ 1);
+ checkDistance( "LINESTRING (0 0 0, 20 20 0 )",
+ "LINESTRING (10 0 1, 0 10 1 )",
+ 1);
+ checkDistance( "LINESTRING (20 10 20, 10 20 10 )",
+ "LINESTRING (10 10 20, 20 20 10 )",
+ 0);
+ }
+
+ /**
+ * Many of these tests exhibit robustness errors
+ * due to numerical roundoff in the distance algorithm mathematics.
+ * This happens when computing nearly-coincident lines
+ * with very large ordinate values
+ */
+ public void testCrossSegmentsRobust() {
+ checkDistance( "LINESTRING (0 0 0, 10000000 10000000 1 )",
+ "LINESTRING (0 0 1, 10000000 10000000 0 )",
+ 0, 0.001); // expected is 0, but actual is larger
+
+ checkDistance( "LINESTRING (-10000 -10000 0, 10000 10000 1 )",
+ "LINESTRING (-10000 -10000 1, 10000 10000 0 )",
+ 0);
+
+ // previous case with X,Y scaled by 1000 - exposes robustness issue
+ checkDistance( "LINESTRING (-10000000 -10000000 0, 10000000 10000000 1 )",
+ "LINESTRING (-10000000 -10000000 1, 10000000 10000000 0 )",
+ 0, 0.02); // expected is 0, but actual is larger
+
+ // works because lines are orthogonal, so doesn't hit roundoff problems
+ checkDistance( "LINESTRING (20000000 10000000 20, 10000000 20000000 10 )",
+ "LINESTRING (10000000 10000000 20, 20000000 20000000 10 )",
+ 0);
+ }
+
+ public void testTSegmentsFlat() {
+ checkDistance( "LINESTRING (10 10 0, 10 20 0 )",
+ "LINESTRING (20 15 0, 25 15 0 )",
+ 10);
+ }
+
+ public void testParallelSegmentsFlat() {
+ checkDistance( "LINESTRING (10 10 0, 20 20 0 )",
+ "LINESTRING (10 20 0, 20 30 0 )",
+ 7.0710678118654755);
+ }
+
+ public void testParallelSegments() {
+ checkDistance( "LINESTRING (0 0 0, 1 0 0 )",
+ "LINESTRING (0 0 1, 1 0 1 )",
+ 1);
+ checkDistance( "LINESTRING (10 10 0, 20 10 0 )",
+ "LINESTRING (10 20 10, 20 20 10 )",
+ 14.142135623730951);
+ checkDistance( "LINESTRING (10 10 0, 20 20 0 )",
+ "LINESTRING (10 20 10, 20 30 10 )",
+ 12.24744871391589 );
+ // = distance from LINESTRING (10 10 0, 20 20 0 ) to POINT(10 20 10)
+ // = hypotenuse(7.0710678118654755, 10)
+ }
+
+ public void testLineLine()
+ {
+ checkDistance( "LINESTRING (0 1 2, 1 1 1, 1 0 2 )",
+ "LINESTRING (0 0 0.1, .5 .5 0, 1 1 0, 1.5 1.5 0, 2 2 0 )",
+ 1);
+ checkDistance( "LINESTRING (10 10 20, 20 20 30, 20 20 1, 30 30 5 )",
+ "LINESTRING (1 80 10, 0 39 5, 39 0 5, 80 1 20)",
+ 0.7071067811865476);
+ }
+
+ public void testPointPolygon()
+ {
+ // point above poly
+ checkDistance( "POINT (150 150 10)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 10);
+ // point below poly
+ checkDistance( "POINT (150 150 -10)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 10);
+ // point right of poly in YZ plane
+ checkDistance( "POINT (10 150 150)",
+ "POLYGON ((0 100 200, 0 200 200, 0 200 100, 0 100 100, 0 100 200))",
+ 10);
+ }
+
+ public void testPointPolygonFlat()
+ {
+ // inside
+ checkDistance( "POINT (150 150 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ // outside
+ checkDistance( "POINT (250 250 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 70.71067811865476);
+ // on
+ checkDistance( "POINT (200 200 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ }
+
+ public void testLinePolygonFlat()
+ {
+ // line inside
+ checkDistance( "LINESTRING (150 150 0, 160 160 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ // line outside
+ checkDistance( "LINESTRING (200 250 0, 260 260 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 50);
+ // line touching
+ checkDistance( "LINESTRING (200 200 0, 260 260 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ }
+
+ public void testLinePolygonSimple()
+ {
+ // line crossing inside
+ checkDistance( "LINESTRING (150 150 10, 150 150 -10)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ // vertical line above
+ checkDistance( "LINESTRING (200 200 10, 260 260 100)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 10);
+ // vertical line touching
+ checkDistance( "LINESTRING (200 200 0, 260 260 100)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ }
+
+ String polyHoleFlat = "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0), (120 180 0, 180 180 0, 180 120 0, 120 120 0, 120 180 0))";
+
+ public void testLinePolygonHoleFlat()
+ {
+ // line crossing hole
+ checkDistance( "LINESTRING (150 150 10, 150 150 -10)", polyHoleFlat, 30);
+ // line crossing interior
+ checkDistance( "LINESTRING (110 110 10, 110 110 -10)", polyHoleFlat, 0);
+ // vertical line above hole
+ checkDistance( "LINESTRING (130 130 10, 150 150 100)", polyHoleFlat, 14.14213562373095);
+ // vertical line touching hole
+ checkDistance( "LINESTRING (120 180 0, 120 180 100)", polyHoleFlat, 0);
+ }
+
+ public void testPointPolygonHoleFlat()
+ {
+ // point above poly hole
+ checkDistance( "POINT (130 130 10)", polyHoleFlat, 14.14213562373095);
+ // point below poly hole
+ checkDistance( "POINT (130 130 -10)", polyHoleFlat, 14.14213562373095);
+ // point above poly
+ checkDistance( "POINT (110 110 100)", polyHoleFlat, 100);
+ }
+
+ String poly2HoleFlat = "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0), (110 110 0, 110 130 0, 130 130 0, 130 110 0, 110 110 0), (190 110 0, 170 110 0, 170 130 0, 190 130 0, 190 110 0))";
+
+ /**
+ * A case proving that polygon/polygon distance requires
+ * computing distance between all rings, not just the shells.
+ */
+ public void testPolygonPolygonLinkedThruHoles()
+ {
+ // note distance is zero!
+ checkDistance(
+ // polygon with two holes
+ poly2HoleFlat,
+ // polygon parallel to XZ plane with shell passing through holes in other polygon
+ "POLYGON ((120 120 -10, 120 120 100, 180 120 100, 180 120 -10, 120 120 -10))",
+ 0);
+
+ // confirm that distance of simple poly boundary is non-zero
+ checkDistance(
+ // polygon with two holes
+ poly2HoleFlat,
+ // boundary of polygon parallel to XZ plane with shell passing through holes
+ "LINESTRING (120 120 -10, 120 120 100, 180 120 100, 180 120 -10, 120 120 -10)",
+ 10);
+ }
+
+
+ public void testMultiPoint()
+ {
+ checkDistance(
+ "MULTIPOINT ((0 0 0), (0 0 100), (100 100 100))",
+ "MULTIPOINT ((100 100 99), (50 50 50), (25 100 33))",
+ 1
+ );
+ }
+
+ public void testMultiLineString()
+ {
+ checkDistance(
+ "MULTILINESTRING ((0 0 0, 10 10 10), (0 0 100, 25 25 25, 40 40 50), (100 100 100, 100 101 102))",
+ "MULTILINESTRING ((100 100 99, 100 100 99), (100 102 102, 200 200 20), (25 100 33, 25 100 35))",
+ 1
+ );
+ }
+
+ public void testMultiPolygon()
+ {
+ checkDistance(
+ // Polygons parallel to XZ plane
+ "MULTIPOLYGON ( ((120 120 -10, 120 120 100, 180 120 100, 180 120 -10, 120 120 -10)), ((120 200 -10, 120 200 190, 180 200 190, 180 200 -10, 120 200 -10)) )",
+ // Polygons parallel to XY plane
+ "MULTIPOLYGON ( ((100 200 200, 200 200 200, 200 100 200, 100 100 200, 100 200 200)), ((100 200 210, 200 200 210, 200 100 210, 100 100 210, 100 200 210)) )",
+ 10
+ );
+ }
+
+ public void testMultiMixed()
+ {
+ checkDistance(
+ "MULTILINESTRING ((0 0 0, 10 10 10), (0 0 100, 25 25 25, 40 40 50), (100 100 100, 100 101 101))",
+ "MULTIPOINT ((100 100 99), (50 50 50), (25 100 33))",
+ 1
+ );
+ }
+
+ //==========================================================
+ // Convenience methods
+ //==========================================================
+
+ private static final double DIST_TOLERANCE = 0.00001;
+
+ private void checkDistance(String wkt1, String wkt2, double expectedDistance)
+ {
+ checkDistance(wkt1, wkt2, expectedDistance, DIST_TOLERANCE);
+ }
+
+ private void checkDistance(String wkt1, String wkt2, double expectedDistance, double tolerance)
+ {
+ Geometry g1;
+ Geometry g2;
+ try {
+ g1 = rdr.read(wkt1);
+ } catch (ParseException e) {
+ throw new RuntimeException(e.toString());
+ }
+ try {
+ g2 = rdr.read(wkt2);
+ } catch (ParseException e) {
+ throw new RuntimeException(e.toString());
+ }
+ // check both orders for arguments
+ checkDistance(g1, g2, expectedDistance, tolerance);
+ checkDistance(g2, g1, expectedDistance, tolerance);
+ }
+
+ private void checkDistance(Geometry g1, Geometry g2, double expectedDistance, double tolerance)
+ {
+ Distance3DOp distOp = new Distance3DOp(g1, g2);
+ double dist = distOp.distance();
+ assertEquals(expectedDistance, dist, tolerance);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/distance3d/WithinDistance3DTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/distance3d/WithinDistance3DTest.java
new file mode 100644
index 0000000..f534f5a
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/distance3d/WithinDistance3DTest.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.distance3d;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+public class WithinDistance3DTest extends TestCase
+{
+ static GeometryFactory geomFact = new GeometryFactory();
+ static WKTReader rdr = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(WithinDistance3DTest.class);
+ }
+
+ public WithinDistance3DTest(String name) {
+ super(name);
+ }
+
+ public void testEmpty()
+ {
+ checkWithinDistance( "POINT EMPTY", "POINT EMPTY", 0);
+ checkWithinDistance( "LINESTRING EMPTY", "POINT (0 0 0)", 1, true);
+ }
+
+ public void testPointPoint() {
+ checkWithinDistance( "POINT (0 0 0 )",
+ "POINT (0 0 1 )",
+ 1);
+ checkWithinDistance( "POINT (0 0 0 )",
+ "POINT (0 0 1 )",
+ 0.5, false);
+ checkWithinDistance( "POINT (10 10 1 )",
+ "POINT (11 11 2 )",
+ 1.733);
+ checkWithinDistance( "POINT (10 10 0 )",
+ "POINT (10 20 10 )",
+ 14.143);
+ }
+
+ public void testPointSeg() {
+ checkWithinDistance( "LINESTRING (0 0 0, 10 10 10 )",
+ "POINT (5 5 5 )",
+ 0);
+ checkWithinDistance( "LINESTRING (10 10 10, 20 20 20 )",
+ "POINT (11 11 10 )",
+ 0.8, false);
+ }
+
+ public void testCrossSegmentsFlat() {
+ checkWithinDistance( "LINESTRING (0 0 0, 10 10 0 )",
+ "LINESTRING (10 0 0, 0 10 0 )",
+ 0);
+ checkWithinDistance( "LINESTRING (0 0 10, 30 10 10 )",
+ "LINESTRING (10 0 10, 0 10 10 )",
+ 0);
+ }
+
+ public void testCrossSegments() {
+ checkWithinDistance( "LINESTRING (0 0 0, 10 10 0 )",
+ "LINESTRING (10 0 1, 0 10 1 )",
+ 1);
+ checkWithinDistance( "LINESTRING (0 0 0, 20 20 0 )",
+ "LINESTRING (10 0 1, 0 10 1 )",
+ 1);
+ checkWithinDistance( "LINESTRING (20 10 20, 10 20 10 )",
+ "LINESTRING (10 10 20, 20 20 10 )",
+ 0);
+ }
+
+ public void testTSegmentsFlat() {
+ checkWithinDistance( "LINESTRING (10 10 0, 10 20 0 )",
+ "LINESTRING (20 15 0, 25 15 0 )",
+ 10);
+ }
+
+ public void testParallelSegmentsFlat() {
+ checkWithinDistance( "LINESTRING (10 10 0, 20 20 0 )",
+ "LINESTRING (10 20 0, 20 30 0 )",
+ 7.0710678118654755);
+ }
+
+ public void testParallelSegments() {
+ checkWithinDistance( "LINESTRING (0 0 0, 1 0 0 )",
+ "LINESTRING (0 0 1, 1 0 1 )",
+ 1);
+ checkWithinDistance( "LINESTRING (10 10 0, 20 10 0 )",
+ "LINESTRING (10 20 10, 20 20 10 )",
+ 14.142135623730951);
+ checkWithinDistance( "LINESTRING (10 10 0, 20 20 0 )",
+ "LINESTRING (10 20 10, 20 30 10 )",
+ 12.24744871391589 );
+ // = distance from LINESTRING (10 10 0, 20 20 0 ) to POINT(10 20 10)
+ // = hypotenuse(7.0710678118654755, 10)
+ }
+
+ public void testLineLine()
+ {
+ checkWithinDistance( "LINESTRING (0 1 2, 1 1 1, 1 0 2 )",
+ "LINESTRING (0 0 0.1, .5 .5 0, 1 1 0, 1.5 1.5 0, 2 2 0 )",
+ 1);
+ checkWithinDistance( "LINESTRING (10 10 20, 20 20 30, 20 20 1, 30 30 5 )",
+ "LINESTRING (1 80 10, 0 39 5, 39 0 5, 80 1 20)",
+ 0.7071067811865476);
+ }
+
+ public void testPointPolygon()
+ {
+ // point above poly
+ checkWithinDistance( "POINT (150 150 10)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 10);
+ // point below poly
+ checkWithinDistance( "POINT (150 150 -10)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 10);
+ // point right of poly in YZ plane
+ checkWithinDistance( "POINT (10 150 150)",
+ "POLYGON ((0 100 200, 0 200 200, 0 200 100, 0 100 100, 0 100 200))",
+ 10);
+ }
+
+ public void testPointPolygonFlat()
+ {
+ // inside
+ checkWithinDistance( "POINT (150 150 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ // outside
+ checkWithinDistance( "POINT (250 250 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 70.71067811865476);
+ // on
+ checkWithinDistance( "POINT (200 200 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ }
+
+ public void testLinePolygonFlat()
+ {
+ // line inside
+ checkWithinDistance( "LINESTRING (150 150 0, 160 160 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ // line outside
+ checkWithinDistance( "LINESTRING (200 250 0, 260 260 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 50);
+ // line touching
+ checkWithinDistance( "LINESTRING (200 200 0, 260 260 0)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ }
+
+ public void testLinePolygonSimple()
+ {
+ // line crossing inside
+ checkWithinDistance( "LINESTRING (150 150 10, 150 150 -10)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ // vertical line above
+ checkWithinDistance( "LINESTRING (200 200 10, 260 260 100)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 10);
+ // vertical line touching
+ checkWithinDistance( "LINESTRING (200 200 0, 260 260 100)",
+ "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0))",
+ 0);
+ }
+
+ String polyHoleFlat = "POLYGON ((100 200 0, 200 200 0, 200 100 0, 100 100 0, 100 200 0), (120 180 0, 180 180 0, 180 120 0, 120 120 0, 120 180 0))";
+
+ public void testLinePolygonHoleFlat()
+ {
+ // line crossing hole
+ checkWithinDistance( "LINESTRING (150 150 10, 150 150 -10)", polyHoleFlat, 20, false);
+ // line crossing interior
+ checkWithinDistance( "LINESTRING (110 110 10, 110 110 -10)", polyHoleFlat, 0);
+ }
+
+ public void testPointPolygonHoleFlat()
+ {
+ // point above poly hole
+ checkWithinDistance( "POINT (130 130 10)", polyHoleFlat, 14.143);
+ // point below poly hole
+ checkWithinDistance( "POINT (130 130 -10)", polyHoleFlat, 14.143);
+ // point above poly
+ checkWithinDistance( "POINT (110 110 100)", polyHoleFlat, 100);
+ }
+
+ public void testMultiPoint()
+ {
+ checkWithinDistance(
+ "MULTIPOINT ((0 0 0), (0 0 100), (100 100 100))",
+ "MULTIPOINT ((100 100 99), (50 50 50), (25 100 33))",
+ 1
+ );
+ }
+
+ public void testMultiLineString()
+ {
+ checkWithinDistance(
+ "MULTILINESTRING ((0 0 0, 10 10 10), (0 0 100, 25 25 25, 40 40 50), (100 100 100, 100 101 102))",
+ "MULTILINESTRING ((100 100 99, 100 100 99), (100 102 102, 200 200 20), (25 100 33, 25 100 35))",
+ 1
+ );
+ }
+
+ public void testMultiPolygon()
+ {
+ checkWithinDistance(
+ // Polygons parallel to XZ plane
+ "MULTIPOLYGON ( ((120 120 -10, 120 120 100, 180 120 100, 180 120 -10, 120 120 -10)), ((120 200 -10, 120 200 190, 180 200 190, 180 200 -10, 120 200 -10)) )",
+ // Polygons parallel to XY plane
+ "MULTIPOLYGON ( ((100 200 200, 200 200 200, 200 100 200, 100 100 200, 100 200 200)), ((100 200 210, 200 200 210, 200 100 210, 100 100 210, 100 200 210)) )",
+ 10
+ );
+ }
+
+
+ //==========================================================
+ // Convenience methods
+ //==========================================================
+
+ private void checkWithinDistance(String wkt1, String wkt2, double distance)
+ {
+ checkWithinDistance(wkt1, wkt2, distance, true);
+ }
+
+ private void checkWithinDistance(String wkt1, String wkt2, double distance, boolean expectedResult)
+ {
+ Geometry g1;
+ Geometry g2;
+ try {
+ g1 = rdr.read(wkt1);
+ } catch (ParseException e) {
+ throw new RuntimeException(e.toString());
+ }
+ try {
+ g2 = rdr.read(wkt2);
+ } catch (ParseException e) {
+ throw new RuntimeException(e.toString());
+ }
+ // check both orders for arguments
+ checkWithinDistance(g1, g2, distance, expectedResult);
+ checkWithinDistance(g2, g1, distance, expectedResult);
+ }
+
+ private void checkWithinDistance(Geometry g1, Geometry g2, double distance, boolean expectedResult)
+ {
+ boolean isWithinDist = Distance3DOp.isWithinDistance(g1, g2, distance);
+ assertEquals(expectedResult, isWithinDist);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/linemerge/LineMergerTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/linemerge/LineMergerTest.java
new file mode 100644
index 0000000..f1ee01d
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/linemerge/LineMergerTest.java
@@ -0,0 +1,132 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.linemerge;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.util.Assert;
+
+import junit.framework.TestCase;
+
+
+
+
+/**
+ * @version 1.7
+ */
+public class LineMergerTest extends TestCase {
+ private static WKTReader reader = new WKTReader();
+
+ public LineMergerTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(LineMergerTest.class);
+ }
+
+ public void test1() {
+ doTest(new String[] {
+ "LINESTRING (120 120, 180 140)", "LINESTRING (200 180, 180 140)",
+ "LINESTRING (200 180, 240 180)"
+ }, new String[] { "LINESTRING (120 120, 180 140, 200 180, 240 180)" });
+ }
+
+ public void test2() {
+ doTest(new String[]{"LINESTRING (120 300, 80 340)",
+ "LINESTRING (120 300, 140 320, 160 320)",
+ "LINESTRING (40 320, 20 340, 0 320)",
+ "LINESTRING (0 320, 20 300, 40 320)",
+ "LINESTRING (40 320, 60 320, 80 340)",
+ "LINESTRING (160 320, 180 340, 200 320)",
+ "LINESTRING (200 320, 180 300, 160 320)"},
+ new String[]{
+ "LINESTRING (160 320, 180 340, 200 320, 180 300, 160 320)",
+ "LINESTRING (40 320, 20 340, 0 320, 20 300, 40 320)",
+ "LINESTRING (40 320, 60 320, 80 340, 120 300, 140 320, 160 320)"});
+ }
+
+ public void test3() {
+ doTest(new String[]{"LINESTRING (0 0, 100 100)", "LINESTRING (0 100, 100 0)"},
+ new String[]{"LINESTRING (0 0, 100 100)", "LINESTRING (0 100, 100 0)"});
+ }
+
+ public void test4() {
+ doTest(new String[]{"LINESTRING EMPTY", "LINESTRING EMPTY"},
+ new String[]{});
+ }
+
+ public void test5() {
+ doTest(new String[]{},
+ new String[]{});
+ }
+
+ public void testSingleUniquePoint() {
+ doTest(new String[]{"LINESTRING (10642 31441, 10642 31441)", "LINESTRING EMPTY"},
+ new String[]{});
+ }
+
+
+ private void doTest(String[] inputWKT, String[] expectedOutputWKT) {
+ doTest(inputWKT, expectedOutputWKT, true);
+ }
+
+ public static void doTest(String[] inputWKT, String[] expectedOutputWKT, boolean compareDirections) {
+ LineMerger lineMerger = new LineMerger();
+ lineMerger.add(toGeometries(inputWKT));
+ compare(toGeometries(expectedOutputWKT), lineMerger.getMergedLineStrings(), compareDirections);
+ }
+
+ public static void compare(Collection expectedGeometries,
+ Collection actualGeometries, boolean compareDirections) {
+ assertEquals("Geometry count, " + actualGeometries,
+ expectedGeometries.size(), actualGeometries.size());
+ for (Iterator i = expectedGeometries.iterator(); i.hasNext();) {
+ Geometry expectedGeometry = (Geometry) i.next();
+ assertTrue("Not found: " + expectedGeometry + ", " + actualGeometries,
+ contains(actualGeometries, expectedGeometry, compareDirections));
+ }
+ }
+
+ private static boolean contains(Collection geometries, Geometry g, boolean exact) {
+ for (Iterator i = geometries.iterator(); i.hasNext();) {
+ Geometry element = (Geometry) i.next();
+ if (exact && element.equalsExact(g)) {
+ return true;
+ }
+ if (!exact && element.equalsTopo(g)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static Collection toGeometries(String[] inputWKT) {
+ ArrayList geometries = new ArrayList();
+ for (int i = 0; i < inputWKT.length; i++) {
+ try {
+ geometries.add(reader.read(inputWKT[i]));
+ } catch (ParseException e) {
+ Assert.shouldNeverReachHere();
+ }
+ }
+
+ return geometries;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/linemerge/LineSequencerTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/linemerge/LineSequencerTest.java
new file mode 100644
index 0000000..d75a172
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/linemerge/LineSequencerTest.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.linemerge;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Test LineSequencer
+ *
+ * @version 1.7
+ */
+public class LineSequencerTest
+ extends TestCase
+{
+ private static WKTReader rdr = new WKTReader();
+
+ public LineSequencerTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(LineSequencerTest.class);
+ }
+
+ public void testSimple()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 20, 0 30 )",
+ "LINESTRING ( 0 10, 0 20 )"
+ };
+ String result =
+ "MULTILINESTRING ((0 0, 0 10), (0 10, 0 20), (0 20, 0 30))";
+ runLineSequencer(wkt, result);
+ }
+
+ public void testSimpleLoop()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 10, 0 0 )",
+ };
+ String result =
+ "MULTILINESTRING ((0 0, 0 10), (0 10, 0 0))";
+ runLineSequencer(wkt, result);
+ }
+
+ public void testSimpleBigLoop()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 20, 0 30 )",
+ "LINESTRING ( 0 30, 0 00 )",
+ "LINESTRING ( 0 10, 0 20 )",
+ };
+ String result =
+ "MULTILINESTRING ((0 0, 0 10), (0 10, 0 20), (0 20, 0 30), (0 30, 0 0))";
+ runLineSequencer(wkt, result);
+ }
+
+ public void test2SimpleLoops()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 10, 0 0 )",
+ "LINESTRING ( 0 0, 0 20 )",
+ "LINESTRING ( 0 20, 0 0 )",
+ };
+ String result =
+ "MULTILINESTRING ((0 10, 0 0), (0 0, 0 20), (0 20, 0 0), (0 0, 0 10))";
+ runLineSequencer(wkt, result);
+ }
+
+ public void testWide8WithTail()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 10 0, 10 10 )",
+ "LINESTRING ( 0 0, 10 0 )",
+ "LINESTRING ( 0 10, 10 10 )",
+ "LINESTRING ( 0 10, 0 20 )",
+ "LINESTRING ( 10 10, 10 20 )",
+ "LINESTRING ( 0 20, 10 20 )",
+
+ "LINESTRING ( 10 20, 30 30 )",
+ };
+ String result = null;
+ runLineSequencer(wkt, result);
+ }
+
+ public void testSimpleLoopWithTail()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 10, 10 10 )",
+ "LINESTRING ( 10 10, 10 20, 0 10 )",
+ };
+ String result =
+ "MULTILINESTRING ((0 0, 0 10), (0 10, 10 10), (10 10, 10 20, 0 10))";
+ runLineSequencer(wkt, result);
+ }
+
+ public void testLineWithRing()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 10, 10 10, 10 20, 0 10 )",
+ "LINESTRING ( 0 30, 0 20 )",
+ "LINESTRING ( 0 20, 0 10 )",
+ };
+ String result =
+ "MULTILINESTRING ((0 0, 0 10), (0 10, 10 10, 10 20, 0 10), (0 10, 0 20), (0 20, 0 30))";
+ runLineSequencer(wkt, result);
+ }
+
+ public void testMultipleGraphsWithRing()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 10, 10 10, 10 20, 0 10 )",
+ "LINESTRING ( 0 30, 0 20 )",
+ "LINESTRING ( 0 20, 0 10 )",
+ "LINESTRING ( 0 60, 0 50 )",
+ "LINESTRING ( 0 40, 0 50 )",
+ };
+ String result =
+ "MULTILINESTRING ((0 0, 0 10), (0 10, 10 10, 10 20, 0 10), (0 10, 0 20), (0 20, 0 30), (0 40, 0 50), (0 50, 0 60))";
+ runLineSequencer(wkt, result);
+ }
+
+ public void testMultipleGraphsWithMultipeRings()
+ throws Exception
+ {
+ String[] wkt = {
+ "LINESTRING ( 0 0, 0 10 )",
+ "LINESTRING ( 0 10, 10 10, 10 20, 0 10 )",
+ "LINESTRING ( 0 10, 40 40, 40 20, 0 10 )",
+ "LINESTRING ( 0 30, 0 20 )",
+ "LINESTRING ( 0 20, 0 10 )",
+ "LINESTRING ( 0 60, 0 50 )",
+ "LINESTRING ( 0 40, 0 50 )",
+ };
+ String result =
+ "MULTILINESTRING ((0 0, 0 10), (0 10, 40 40, 40 20, 0 10), (0 10, 10 10, 10 20, 0 10), (0 10, 0 20), (0 20, 0 30), (0 40, 0 50), (0 50, 0 60))";
+ runLineSequencer(wkt, result);
+ }
+
+// isSequenced tests ==========================================================
+
+ public void testLineSequence()
+ throws Exception
+ {
+ String wkt =
+ "LINESTRING ( 0 0, 0 10 )";
+ runIsSequenced(wkt, true);
+ }
+
+ public void testSplitLineSequence()
+ throws Exception
+ {
+ String wkt =
+ "MULTILINESTRING ((0 0, 0 1), (0 2, 0 3), (0 3, 0 4) )";
+ runIsSequenced(wkt, true);
+ }
+
+ public void testBadLineSequence()
+ throws Exception
+ {
+ String wkt =
+ "MULTILINESTRING ((0 0, 0 1), (0 2, 0 3), (0 1, 0 4) )";
+ runIsSequenced(wkt, false);
+ }
+
+//==========================================================
+
+ private void runLineSequencer(String[] inputWKT, String expectedWKT)
+ throws ParseException
+ {
+ List inputGeoms = fromWKT(inputWKT);
+ LineSequencer sequencer = new LineSequencer();
+ sequencer.add(inputGeoms);
+
+ boolean isCorrect = false;
+ if (! sequencer.isSequenceable()) {
+ assertTrue(expectedWKT == null);
+ }
+ else {
+ Geometry expected = rdr.read(expectedWKT);
+ Geometry result = sequencer.getSequencedLineStrings();
+ boolean isOK = expected.equalsNorm(result);
+ if (! isOK) {
+ System.out.println("ERROR - Expected: " + expected);
+ System.out.println(" Actual: " + result);
+ }
+ assertTrue(isOK);
+
+ boolean isSequenced = LineSequencer.isSequenced(result);
+ assertTrue(isSequenced);
+ }
+ }
+
+ private void runIsSequenced(String inputWKT, boolean expected)
+ throws ParseException
+ {
+ Geometry g = rdr.read(inputWKT);
+ boolean isSequenced = LineSequencer.isSequenced(g);
+ assertTrue(isSequenced == expected);
+ }
+
+ List fromWKT(String[] wkts)
+ {
+ List geomList = new ArrayList();
+ for (int i = 0; i < wkts.length; i++) {
+ try {
+ geomList.add(rdr.read(wkts[i]));
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return geomList;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/overlay/FixedPrecisionSnappingTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/overlay/FixedPrecisionSnappingTest.java
new file mode 100644
index 0000000..07b2cb6
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/overlay/FixedPrecisionSnappingTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.overlay;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+public class FixedPrecisionSnappingTest extends TestCase
+{
+ PrecisionModel pm = new PrecisionModel(1.0);
+ GeometryFactory fact = new GeometryFactory(pm);
+ WKTReader rdr = new WKTReader(fact);
+
+ public FixedPrecisionSnappingTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(FixedPrecisionSnappingTest.class);
+ }
+
+ public void testTriangles()
+ throws ParseException
+ {
+ Geometry a = rdr.read("POLYGON ((545 317, 617 379, 581 321, 545 317))");
+ Geometry b = rdr.read("POLYGON ((484 290, 558 359, 543 309, 484 290))");
+ a.intersection(b);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/polygonize/PolygonizeTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/polygonize/PolygonizeTest.java
new file mode 100644
index 0000000..6b80dfd
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/polygonize/PolygonizeTest.java
@@ -0,0 +1,183 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.polygonize;
+
+import java.util.Collection;
+import java.util.List;
+
+import test.jts.GeometryTestCase;
+
+/**
+ * @version 1.7
+ */
+public class PolygonizeTest extends GeometryTestCase {
+
+ public PolygonizeTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(PolygonizeTest.class);
+ }
+
+ public void test1() {
+ checkPolygonize(new String[]{"LINESTRING EMPTY", "LINESTRING EMPTY"},
+ new String[]{});
+ }
+
+ public void test2() {
+ checkPolygonize(new String[]{
+"LINESTRING (100 180, 20 20, 160 20, 100 180)",
+"LINESTRING (100 180, 80 60, 120 60, 100 180)",
+ },
+ new String[]{
+"POLYGON ((100 180, 120 60, 80 60, 100 180))",
+"POLYGON ((100 180, 160 20, 20 20, 100 180), (100 180, 80 60, 120 60, 100 180))"
+ });
+ }
+
+ public void test3() {
+ checkPolygonize(new String[]{
+ "LINESTRING (0 0, 4 0)",
+ "LINESTRING (4 0, 5 3)",
+"LINESTRING (5 3, 4 6, 6 6, 5 3)",
+"LINESTRING (5 3, 6 0)",
+"LINESTRING (6 0, 10 0, 5 10, 0 0)",
+"LINESTRING (4 0, 6 0)"
+ },
+ new String[]{
+"POLYGON ((5 3, 4 0, 0 0, 5 10, 10 0, 6 0, 5 3), (5 3, 6 6, 4 6, 5 3))",
+"POLYGON ((5 3, 4 6, 6 6, 5 3))",
+"POLYGON ((4 0, 5 3, 6 0, 4 0))"
+ });
+ }
+
+ public void testPolygonal1() {
+ checkPolygonize(true, new String[]{
+ "LINESTRING (100 100, 100 300, 300 300, 300 100, 100 100)",
+ "LINESTRING (150 150, 150 250, 250 250, 250 150, 150 150)"
+ },
+ new String[]{
+"POLYGON ((100 100, 100 300, 300 300, 300 100, 100 100), (150 150, 150 250, 250 250, 250 150, 150 150))"
+ });
+ }
+
+ public void testPolygonal2() {
+ checkPolygonize(true, new String[]{
+ "LINESTRING (100 100, 100 0, 0 0, 0 100, 100 100)"
+ ,"LINESTRING (10 10, 10 30, 20 30)"
+ ,"LINESTRING (20 30, 30 30, 30 20)"
+ ,"LINESTRING (30 20, 30 10, 10 10)"
+ ,"LINESTRING (40 40, 40 20, 30 20)"
+ ,"LINESTRING (30 20, 20 20, 20 30)"
+ ,"LINESTRING (20 30, 20 40, 40 40))"
+ },
+ new String[]{
+"POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0), (10 10, 30 10, 30 20, 40 20, 40 40, 20 40, 20 30, 10 30, 10 10))",
+"POLYGON ((20 20, 20 30, 30 30, 30 20, 20 20))"
+ });
+ }
+
+ public void testPolygonal_OuterOnly_1() {
+ checkPolygonize(true, new String[] {
+ "LINESTRING (10 10, 10 20, 20 20)"
+ ,"LINESTRING (20 20, 20 10)"
+ ,"LINESTRING (20 10, 10 10)"
+ ,"LINESTRING (20 20, 30 20, 30 10, 20 10)"
+ },
+ new String[]{
+"POLYGON ((20 20, 20 10, 10 10, 10 20, 20 20))"
+ });
+ }
+
+ public void testPolygona_OuterOnly_2() {
+ checkPolygonize(true, new String[] {
+ "LINESTRING (100 400, 200 400, 200 300)"
+ ,"LINESTRING (200 300, 150 300)"
+ ,"LINESTRING (150 300, 100 300, 100 400)"
+ ,"LINESTRING (200 300, 250 300, 250 200)"
+ ,"LINESTRING (250 200, 200 200)"
+ ,"LINESTRING (200 200, 150 200, 150 300)"
+ ,"LINESTRING (250 200, 300 200, 300 100, 200 100, 200 200)"
+ },
+ new String[]{
+ "POLYGON ((150 300, 100 300, 100 400, 200 400, 200 300, 150 300))"
+ ,"POLYGON ((200 200, 250 200, 300 200, 300 100, 200 100, 200 200))"
+ });
+ }
+
+ String[] LINES_CHECKERBOARD = new String[] {
+ "LINESTRING (10 20, 20 20)",
+ "LINESTRING (10 20, 10 30)",
+ "LINESTRING (20 10, 10 10, 10 20)",
+ "LINESTRING (10 30, 20 30)",
+ "LINESTRING (10 30, 10 40, 20 40)",
+ "LINESTRING (30 10, 20 10)",
+ "LINESTRING (20 20, 20 10)",
+ "LINESTRING (20 20, 30 20)",
+ "LINESTRING (20 30, 20 20)",
+ "LINESTRING (20 30, 30 30)",
+ "LINESTRING (20 40, 20 30)",
+ "LINESTRING (20 40, 30 40)",
+ "LINESTRING (40 20, 40 10, 30 10)",
+ "LINESTRING (30 20, 30 10)",
+ "LINESTRING (30 20, 40 20)",
+ "LINESTRING (30 30, 30 20)",
+ "LINESTRING (30 30, 40 30)",
+ "LINESTRING (30 40, 30 30)",
+ "LINESTRING (30 40, 40 40, 40 30)",
+ "LINESTRING (40 30, 40 20)"
+ };
+
+ public void testPolygona_OuterOnly_Checkerboard() {
+ checkPolygonize(true, LINES_CHECKERBOARD,
+ new String[]{
+ "POLYGON ((10 20, 20 20, 20 10, 10 10, 10 20))"
+ ,"POLYGON ((20 30, 10 30, 10 40, 20 40, 20 30))"
+ ,"POLYGON ((30 20, 20 20, 20 30, 30 30, 30 20))"
+ ,"POLYGON ((30 10, 30 20, 40 20, 40 10, 30 10))"
+ ,"POLYGON ((30 40, 40 40, 40 30, 30 30, 30 40))"
+ });
+ }
+
+/*
+ public void test2() {
+ doTest(new String[]{
+
+"LINESTRING(20 20, 20 100)",
+"LINESTRING (20 100, 20 180, 100 180)",
+"LINESTRING (100 180, 180 180, 180 100)",
+"LINESTRING (180 100, 180 20, 100 20)",
+"LINESTRING (100 20, 20 20)",
+"LINESTRING (100 20, 20 100)",
+"LINESTRING (20 100, 100 180)",
+"LINESTRING (100 180, 180 100)",
+"LINESTRING (180 100, 100 20)"
+ },
+ new String[]{});
+ }
+*/
+
+ private void checkPolygonize(String[] inputWKT, String[] expectedWKT) {
+ checkPolygonize(false, inputWKT, expectedWKT);
+ }
+
+ private void checkPolygonize(boolean extractOnlyPolygonal, String[] inputWKT, String[] expectedWKT) {
+ Polygonizer polygonizer = new Polygonizer(extractOnlyPolygonal);
+ polygonizer.add(readList(inputWKT));
+ List expected = readList(expectedWKT);
+ Collection actual = polygonizer.getPolygons();
+ checkEqual(expected, actual);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/relate/ContainsTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/relate/ContainsTest.java
new file mode 100644
index 0000000..88e7cfb
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/relate/ContainsTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.relate;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests {@link Geometry#relate}.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class ContainsTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(ContainsTest.class);
+ }
+
+ private GeometryFactory fact = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(fact);
+
+ public ContainsTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * From GEOS #572.
+ * A case where B is contained in A, but
+ * the JTS relate algorithm fails to compute this correctly.
+ *
+ * The cause is that the long segment in A nodes the single-segment line in B.
+ * The node location cannot be computed precisely.
+ * The node then tests as not lying precisely on the original long segment in A.
+ *
+ * The solution is to change the relate algorithm so that it never computes
+ * new intersection points, only ones which occur at existing vertices.
+ * (The topology of the implicit intersections can still be computed
+ * to contribute to the intersection matrix result).
+ * This will require a complete reworking of the relate algorithm.
+ *
+ * @throws Exception
+ */
+ public void testContainsIncorrect()
+ throws Exception
+ {
+ String a = "LINESTRING (1 0, 0 2, 0 0, 2 2)";
+ String b = "LINESTRING (0 0, 2 2)";
+
+ // for now assert this as false, although it should be true
+ assertTrue(! a.contains(b));
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/relate/RelateBoundaryNodeRuleTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/relate/RelateBoundaryNodeRuleTest.java
new file mode 100644
index 0000000..baec9a9
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/relate/RelateBoundaryNodeRuleTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.relate;
+
+import org.locationtech.jts.algorithm.BoundaryNodeRule;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests {@link Geometry#relate} with different {@link BoundaryNodeRule}s.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class RelateBoundaryNodeRuleTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(RelateBoundaryNodeRuleTest.class);
+ }
+
+ private GeometryFactory fact = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(fact);
+
+ public RelateBoundaryNodeRuleTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMultiLineStringSelfIntTouchAtEndpoint()
+ throws Exception
+ {
+ String a = "MULTILINESTRING ((20 20, 100 100, 100 20, 20 100), (60 60, 60 140))";
+ String b = "LINESTRING (60 60, 20 60)";
+
+ // under EndPoint, A has a boundary node - A.bdy / B.bdy = 0
+ runRelateTest(a, b, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, "FF1F00102" );
+ }
+
+ public void testLineStringSelfIntTouchAtEndpoint()
+ throws Exception
+ {
+ String a = "LINESTRING (20 20, 100 100, 100 20, 20 100)";
+ String b = "LINESTRING (60 60, 20 60)";
+
+ // results for both rules are the same
+ runRelateTest(a, b, BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE, "F01FF0102" );
+ runRelateTest(a, b, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, "F01FF0102" );
+ }
+
+ public void testMultiLineStringTouchAtEndpoint()
+ throws Exception
+ {
+ String a = "MULTILINESTRING ((0 0, 10 10), (10 10, 20 20))";
+ String b = "LINESTRING (10 10, 20 0)";
+
+ // under Mod2, A has no boundary - A.int / B.bdy = 0
+// runRelateTest(a, b, BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE, "F01FFF102" );
+ // under EndPoint, A has a boundary node - A.bdy / B.bdy = 0
+ runRelateTest(a, b, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, "FF1F00102" );
+ // under MultiValent, A has a boundary node but B does not - A.bdy / B.bdy = F and A.int
+// runRelateTest(a, b, BoundaryNodeRule.MULTIVALENT_ENDPOINT_BOUNDARY_RULE, "0F1FFF1F2" );
+ }
+
+ public void testLineRingTouchAtEndpoints()
+ throws Exception
+ {
+ String a = "LINESTRING (20 100, 20 220, 120 100, 20 100)";
+ String b = "LINESTRING (20 20, 20 100)";
+
+ // under Mod2, A has no boundary - A.int / B.bdy = 0
+// runRelateTest(a, b, BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE, "F01FFF102" );
+ // under EndPoint, A has a boundary node - A.bdy / B.bdy = 0
+// runRelateTest(a, b, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, "FF1F0F102" );
+ // under MultiValent, A has a boundary node but B does not - A.bdy / B.bdy = F and A.int
+ runRelateTest(a, b, BoundaryNodeRule.MULTIVALENT_ENDPOINT_BOUNDARY_RULE, "0F1FFF1F2" );
+ }
+
+ public void testLineRingTouchAtEndpointAndInterior()
+ throws Exception
+ {
+ String a = "LINESTRING (20 100, 20 220, 120 100, 20 100)";
+ String b = "LINESTRING (20 20, 40 100)";
+
+ // this is the same result as for the above test
+ runRelateTest(a, b, BoundaryNodeRule.OGC_SFS_BOUNDARY_RULE, "F01FFF102" );
+ // this result is different - the A node is now on the boundary, so A.bdy/B.ext = 0
+ runRelateTest(a, b, BoundaryNodeRule.ENDPOINT_BOUNDARY_RULE, "F01FF0102" );
+ }
+
+ void runRelateTest(String wkt1, String wkt2, BoundaryNodeRule bnRule, String expectedIM)
+ throws ParseException
+ {
+ Geometry g1 = rdr.read(wkt1);
+ Geometry g2 = rdr.read(wkt2);
+ IntersectionMatrix im = RelateOp.relate(g1, g2, bnRule);
+ String imStr = im.toString();
+ //System.out.println(imStr);
+ assertTrue(im.matches(expectedIM));
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/relate/RelateTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/relate/RelateTest.java
new file mode 100644
index 0000000..536e7e6
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/relate/RelateTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.relate;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.IntersectionMatrix;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * Tests {@link Geometry#relate}.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class RelateTest
+ extends TestCase
+{
+ public static void main(String args[]) {
+ TestRunner.run(RelateTest.class);
+ }
+
+ private GeometryFactory fact = new GeometryFactory();
+ private WKTReader rdr = new WKTReader(fact);
+
+ public RelateTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * From GEOS #572
+ *
+ * The cause is that the longer line nodes the single-segment line.
+ * The node then tests as not lying precisely on the original longer line.
+ *
+ * @throws Exception
+ */
+ public void testContainsIncorrectIMMatrix()
+ throws Exception
+ {
+ String a = "LINESTRING (1 0, 0 2, 0 0, 2 2)";
+ String b = "LINESTRING (0 0, 2 2)";
+
+ // actual matrix is 001F001F2
+ // true matrix should be 101F00FF2
+ runRelateTest(a, b, "001F001F2" );
+ }
+
+ void runRelateTest(String wkt1, String wkt2, String expectedIM)
+ throws ParseException
+ {
+ Geometry g1 = rdr.read(wkt1);
+ Geometry g2 = rdr.read(wkt2);
+ IntersectionMatrix im = RelateOp.relate(g1, g2);
+ String imStr = im.toString();
+ //System.out.println(imStr);
+ assertTrue(im.matches(expectedIM));
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionFileTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionFileTest.java
new file mode 100644
index 0000000..5e14a2c
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionFileTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.union;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Collection;
+
+import org.locationtech.jts.io.ParseException;
+
+import junit.framework.TestCase;
+import test.jts.junit.GeometryUtils;
+
+/**
+ * Large-scale tests of {@link CascadedPolygonUnion}
+ * using data from files.
+ *
+ * @author mbdavis
+ *
+ */
+public class CascadedPolygonUnionFileTest extends TestCase
+{
+ public CascadedPolygonUnionFileTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(CascadedPolygonUnionFileTest.class);
+ }
+
+ public void testAfrica2()
+ throws Exception
+ {
+ runTestResource("../../../../../data/africa.wkt",
+ CascadedPolygonUnionTester.MIN_SIMILARITY_MEAURE);
+ }
+
+ public void XtestEurope()
+ throws Exception
+ {
+ runTestResource("../../../../../data/europe.wkt",
+ CascadedPolygonUnionTester.MIN_SIMILARITY_MEAURE);
+ }
+
+ private static CascadedPolygonUnionTester tester = new CascadedPolygonUnionTester();
+
+ private void runTest(String filename, double minimumMeasure)
+ throws IOException, ParseException
+ {
+ Collection geoms = GeometryUtils.readWKTFile(filename);
+ assertTrue(tester.test(geoms, minimumMeasure));
+ }
+ private void runTestResource(String resource, double minimumMeasure)
+ throws IOException, ParseException
+ {
+ InputStream is = this.getClass().getResourceAsStream(resource);
+ // don't bother if file is missing
+ if (is == null) return;
+ Collection geoms = GeometryUtils.readWKTFile(new InputStreamReader(is));
+ assertTrue(tester.test(geoms, minimumMeasure));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionTest.java
new file mode 100644
index 0000000..8dd13dc
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.union;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+
+import junit.framework.TestCase;
+import test.jts.junit.GeometryUtils;
+
+/**
+ * Large-scale tests of {@link CascadedPolygonUnion}
+ * using synthetic datasets.
+ *
+ * @author mbdavis
+ *
+ */
+public class CascadedPolygonUnionTest extends TestCase
+{
+ GeometryFactory geomFact = new GeometryFactory();
+
+ public CascadedPolygonUnionTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(CascadedPolygonUnionTest.class);
+ }
+
+ public void testBoxes()
+ throws Exception
+ {
+ runTest(GeometryUtils.readWKT(
+ new String[] {
+ "POLYGON ((80 260, 200 260, 200 30, 80 30, 80 260))",
+ "POLYGON ((30 180, 300 180, 300 110, 30 110, 30 180))",
+ "POLYGON ((30 280, 30 150, 140 150, 140 280, 30 280))"
+ }),
+ CascadedPolygonUnionTester.MIN_SIMILARITY_MEAURE);
+ }
+
+ public void testDiscs1()
+ throws Exception
+ {
+ Collection geoms = createDiscs(5, 0.7);
+
+ //System.out.println(geomFact.buildGeometry(geoms));
+
+ runTest(geoms,
+ CascadedPolygonUnionTester.MIN_SIMILARITY_MEAURE);
+ }
+
+
+ public void testDiscs2()
+ throws Exception
+ {
+ Collection geoms = createDiscs(5, 0.55);
+
+ //System.out.println(geomFact.buildGeometry(geoms));
+
+ runTest(geoms,
+ CascadedPolygonUnionTester.MIN_SIMILARITY_MEAURE);
+ }
+
+
+ // TODO: add some synthetic tests
+
+ private static CascadedPolygonUnionTester tester = new CascadedPolygonUnionTester();
+
+ private void runTest(Collection geoms, double minimumMeasure)
+ {
+ assertTrue(tester.test(geoms, minimumMeasure));
+ }
+
+ private Collection createDiscs(int num, double radius)
+ {
+ List geoms = new ArrayList();
+ for (int i = 0; i < num; i++) {
+ for (int j = 0; j < num; j++) {
+ Coordinate pt = new Coordinate(i, j);
+ Geometry ptGeom = geomFact.createPoint(pt);
+ Geometry disc = ptGeom.buffer(radius);
+ geoms.add(disc);
+ }
+ }
+ return geoms;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionTester.java b/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionTester.java
new file mode 100644
index 0000000..69017b9
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/union/CascadedPolygonUnionTester.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.union;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.locationtech.jts.algorithm.match.AreaSimilarityMeasure;
+import org.locationtech.jts.algorithm.match.HausdorffSimilarityMeasure;
+import org.locationtech.jts.algorithm.match.SimilarityMeasureCombiner;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+
+/**
+ * Compares the results of CascadedPolygonUnion to Geometry.union()
+ * using shape similarity measures.
+ *
+ * @author mbdavis
+ *
+ */
+public class CascadedPolygonUnionTester
+{
+ public static final double MIN_SIMILARITY_MEAURE = 0.999999;;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+
+ GeometryFactory geomFact = new GeometryFactory();
+
+ public CascadedPolygonUnionTester() {
+ }
+
+ public boolean test(Collection geoms, double minimumMeasure)
+ {
+ //System.out.println("Computing Iterated union");
+ Geometry union1 = unionIterated(geoms);
+ //System.out.println("Computing Cascaded union");
+ Geometry union2 = unionCascaded(geoms);
+
+ //System.out.println("Testing similarity with min measure = " + minimumMeasure);
+
+ double areaMeasure = (new AreaSimilarityMeasure()).measure(union1, union2);
+ double hausMeasure = (new HausdorffSimilarityMeasure()).measure(union1, union2);
+ double overallMeasure = SimilarityMeasureCombiner.combine(areaMeasure, hausMeasure);
+
+ //System.out.println(
+ // "Area measure = " + areaMeasure
+ // + " Hausdorff measure = " + hausMeasure
+ // + " Overall = " + overallMeasure);
+
+ return overallMeasure > minimumMeasure;
+ }
+
+ /*
+ private void OLDdoTest(String filename, double distanceTolerance)
+ throws IOException, ParseException
+ {
+ WKTFileReader fileRdr = new WKTFileReader(filename, wktRdr);
+ List geoms = fileRdr.read();
+
+ //System.out.println("Computing Iterated union");
+ Geometry union1 = unionIterated(geoms);
+ //System.out.println("Computing Cascaded union");
+ Geometry union2 = unionCascaded(geoms);
+
+ //System.out.println("Testing similarity with tolerance = " + distanceTolerance);
+ boolean isSameWithinTolerance = SimilarityValidator.isSimilar(union1, union2, distanceTolerance);
+
+
+ assertTrue(isSameWithinTolerance);
+ }
+*/
+
+ public Geometry unionIterated(Collection geoms)
+ {
+ Geometry unionAll = null;
+ int count = 0;
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry geom = (Geometry) i.next();
+
+ if (unionAll == null) {
+ unionAll = (Geometry) geom.copy();
+ }
+ else {
+ unionAll = unionAll.union(geom);
+ }
+
+ count++;
+ if (count % 100 == 0) {
+ System.out.print(".");
+// System.out.println("Adding geom #" + count);
+ }
+ }
+ return unionAll;
+ }
+
+ public Geometry unionCascaded(Collection geoms)
+ {
+ return CascadedPolygonUnion.union(geoms);
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/union/UnaryUnionTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/union/UnaryUnionTest.java
new file mode 100644
index 0000000..46f3548
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/union/UnaryUnionTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.union;
+
+import java.util.Collection;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+
+import junit.framework.TestCase;
+import test.jts.junit.GeometryUtils;
+
+public class UnaryUnionTest extends TestCase
+{
+ GeometryFactory geomFact = new GeometryFactory();
+
+ public UnaryUnionTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(UnaryUnionTest.class);
+ }
+
+ public void testEmptyCollection()
+ throws Exception
+ {
+ doTest(new String[]{}, "GEOMETRYCOLLECTION EMPTY");
+ }
+
+ public void testPoints()
+ throws Exception
+ {
+ doTest(new String[]{ "POINT (1 1)", "POINT (2 2)"}, "MULTIPOINT ((1 1), (2 2))");
+ }
+
+ public void testLineNoding()
+ throws Exception
+ {
+ doTest(new String[]{ "LINESTRING (0 0, 10 0, 5 -5, 5 5)"},
+ "MULTILINESTRING ((0 0, 5 0), (5 0, 10 0, 5 -5, 5 0), (5 0, 5 5))");
+ }
+
+ public void testAll()
+ throws Exception
+ {
+ doTest(new String[]{"GEOMETRYCOLLECTION (POLYGON ((0 0, 0 90, 90 90, 90 0, 0 0)), POLYGON ((120 0, 120 90, 210 90, 210 0, 120 0)), LINESTRING (40 50, 40 140), LINESTRING (160 50, 160 140), POINT (60 50), POINT (60 140), POINT (40 140))"},
+ "GEOMETRYCOLLECTION (POINT (60 140), LINESTRING (40 90, 40 140), LINESTRING (160 90, 160 140), POLYGON ((0 0, 0 90, 40 90, 90 90, 90 0, 0 0)), POLYGON ((120 0, 120 90, 160 90, 210 90, 210 0, 120 0)))"); }
+
+ private void doTest(String[] inputWKT, String expectedWKT)
+ throws ParseException
+ {
+ Geometry result;
+ Collection geoms = GeometryUtils.readWKT(inputWKT);
+ if (geoms.size() == 0)
+ result = UnaryUnionOp.union(geoms, geomFact);
+ else
+ result = UnaryUnionOp.union(geoms);
+
+ assertTrue(GeometryUtils.isEqual(GeometryUtils.readWKT(expectedWKT), result));
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/valid/IsValidTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/valid/IsValidTest.java
new file mode 100644
index 0000000..e97475d
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/valid/IsValidTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * @version 1.7
+ */
+public class IsValidTest extends TestCase {
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(IsValidTest.class);
+ }
+
+ public IsValidTest(String name) { super(name); }
+
+ public void testInvalidCoordinate() throws Exception
+ {
+ Coordinate badCoord = new Coordinate(1.0, Double.NaN);
+ Coordinate[] pts = { new Coordinate(0.0, 0.0), badCoord };
+ Geometry line = geometryFactory.createLineString(pts);
+ IsValidOp isValidOp = new IsValidOp(line);
+ boolean valid = isValidOp.isValid();
+ TopologyValidationError err = isValidOp.getValidationError();
+ Coordinate errCoord = err.getCoordinate();
+
+ assertEquals(TopologyValidationError.INVALID_COORDINATE, err.getErrorType());
+ assertTrue(Double.isNaN(errCoord.y));
+ assertEquals(false, valid);
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/valid/SimpleNestedRingTester.java b/modules/core/src/test/java/org/locationtech/jts/operation/valid/SimpleNestedRingTester.java
new file mode 100644
index 0000000..ab48549
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/valid/SimpleNestedRingTester.java
@@ -0,0 +1,80 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.operation.valid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Tests whether any of a set of {@link LinearRing}s are
+ * nested inside another ring in the set, using a simple O(n^2)
+ * comparison.
+ *
+ * @version 1.7
+ */
+public class SimpleNestedRingTester
+{
+
+ private GeometryGraph graph; // used to find non-node vertices
+ private List rings = new ArrayList();
+ private Coordinate nestedPt;
+
+ public SimpleNestedRingTester(GeometryGraph graph)
+ {
+ this.graph = graph;
+ }
+
+ public void add(LinearRing ring)
+ {
+ rings.add(ring);
+ }
+
+ public Coordinate getNestedPoint() { return nestedPt; }
+
+ public boolean isNonNested()
+ {
+ for (int i = 0; i < rings.size(); i++) {
+ LinearRing innerRing = (LinearRing) rings.get(i);
+ Coordinate[] innerRingPts = innerRing.getCoordinates();
+
+ for (int j = 0; j < rings.size(); j++) {
+ LinearRing searchRing = (LinearRing) rings.get(j);
+ Coordinate[] searchRingPts = searchRing.getCoordinates();
+
+ if (innerRing == searchRing)
+ continue;
+
+ if (! innerRing.getEnvelopeInternal().intersects(searchRing.getEnvelopeInternal()))
+ continue;
+
+ Coordinate innerRingPt = IsValidOp.findPtNotNode(innerRingPts, searchRing, graph);
+ Assert.isTrue(innerRingPt != null, "Unable to find a ring point not a node of the search ring");
+ //Coordinate innerRingPt = innerRingPts[0];
+
+ boolean isInside = PointLocation.isInRing(innerRingPt, searchRingPts);
+ if (isInside) {
+ nestedPt = innerRingPt;
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/valid/ValidClosedRingTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/valid/ValidClosedRingTest.java
new file mode 100644
index 0000000..2ae1d65
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/valid/ValidClosedRingTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.valid;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Tests validating geometries with
+ * non-closed rings.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class ValidClosedRingTest
+ extends TestCase
+{
+ private static WKTReader rdr = new WKTReader();
+
+ public ValidClosedRingTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(ValidClosedRingTest.class);
+ }
+
+ public void testBadLinearRing()
+ {
+ LinearRing ring = (LinearRing) fromWKT("LINEARRING (0 0, 0 10, 10 10, 10 0, 0 0)");
+ updateNonClosedRing(ring);
+ checkIsValid(ring, false);
+ }
+
+ public void testGoodLinearRing()
+ {
+ LinearRing ring = (LinearRing) fromWKT("LINEARRING (0 0, 0 10, 10 10, 10 0, 0 0)");
+ checkIsValid(ring, true);
+ }
+
+ public void testBadPolygonShell()
+ {
+ Polygon poly = (Polygon) fromWKT("POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))");
+ updateNonClosedRing((LinearRing) poly.getExteriorRing());
+ checkIsValid(poly, false);
+ }
+
+ public void testBadPolygonHole()
+ {
+ Polygon poly = (Polygon) fromWKT("POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1) ))");
+ updateNonClosedRing((LinearRing) poly.getInteriorRingN(0));
+ checkIsValid(poly, false);
+ }
+
+ public void testGoodPolygon()
+ {
+ Polygon poly = (Polygon) fromWKT("POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))");
+ checkIsValid(poly, true);
+ }
+
+ public void testBadGeometryCollection()
+ {
+ GeometryCollection gc = (GeometryCollection) fromWKT("GEOMETRYCOLLECTION ( POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1) )), POINT(0 0) )");
+ Polygon poly = (Polygon) gc.getGeometryN(0);
+ updateNonClosedRing((LinearRing) poly.getInteriorRingN(0));
+ checkIsValid(poly, false);
+ }
+
+
+ private void checkIsValid(Geometry geom, boolean expected)
+ {
+ IsValidOp validator = new IsValidOp(geom);
+ boolean isValid = validator.isValid();
+ assertTrue(isValid == expected);
+ }
+
+ Geometry fromWKT(String wkt)
+ {
+ Geometry geom = null;
+ try {
+ geom = rdr.read(wkt);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return geom;
+ }
+
+ private void updateNonClosedRing(LinearRing ring)
+ {
+ Coordinate[] pts = ring.getCoordinates();
+ pts[0].x += 0.0001;
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/operation/valid/ValidSelfTouchingRingFormingHoleTest.java b/modules/core/src/test/java/org/locationtech/jts/operation/valid/ValidSelfTouchingRingFormingHoleTest.java
new file mode 100644
index 0000000..bb93ca4
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/operation/valid/ValidSelfTouchingRingFormingHoleTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.operation.valid;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Tests allowing IsValidOp to validate polygons with
+ * Self-Touching Rings forming holes.
+ * Mainly tests that configuring {@link IsValidOp} to allow validating
+ * the STR validates polygons with this condition, and does not validate
+ * polygons with other kinds of self-intersection (such as ones with Disconnected Interiors).
+ * Includes some basic tests to confirm that other invalid cases remain detected correctly,
+ * but most of this testing is left to the existing XML validation tests.
+ *
+ * @author Martin Davis
+ * @version 1.7
+ */
+public class ValidSelfTouchingRingFormingHoleTest
+ extends TestCase
+{
+ private static WKTReader rdr = new WKTReader();
+
+ public ValidSelfTouchingRingFormingHoleTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(ValidSelfTouchingRingFormingHoleTest.class);
+ }
+
+ /**
+ * Tests a geometry with both a shell self-touch and a hole self-touch.
+ * This is valid if STR is allowed, but invalid in OGC
+ */
+ public void testShellAndHoleSelfTouch()
+ {
+ String wkt = "POLYGON ((0 0, 0 340, 320 340, 320 0, 120 0, 180 100, 60 100, 120 0, 0 0), (80 300, 80 180, 200 180, 200 240, 280 200, 280 280, 200 240, 200 300, 80 300))";
+ checkIsValidSTR(wkt, true);
+ checkIsValidDefault(wkt, false);
+ }
+
+ /**
+ * Tests a geometry representing the same area as in {@link #testShellAndHoleSelfTouch}
+ * but using a shell-hole touch and a hole-hole touch.
+ * This is valid in OGC.
+ */
+ public void testShellHoleAndHoleHoleTouch()
+ {
+ String wkt = "POLYGON ((0 0, 0 340, 320 340, 320 0, 120 0, 0 0), (120 0, 180 100, 60 100, 120 0), (80 300, 80 180, 200 180, 200 240, 200 300, 80 300), (200 240, 280 200, 280 280, 200 240))";
+ checkIsValidSTR(wkt, true);
+ checkIsValidDefault(wkt, true);
+ }
+
+ /**
+ * Tests an overlapping hole condition, where one of the holes is created by a shell self-touch.
+ * This is never valid.
+ */
+ public void testShellSelfTouchHoleOverlappingHole()
+ {
+ String wkt = "POLYGON ((0 0, 220 0, 220 200, 120 200, 140 100, 80 100, 120 200, 0 200, 0 0), (200 80, 20 80, 120 200, 200 80))";
+ checkIsValidSTR(wkt, false);
+ checkIsValidDefault(wkt, false);
+ }
+
+ /**
+ * Ensure that the Disconnected Interior condition is not validated
+ */
+ public void testDisconnectedInteriorShellSelfTouchAtNonVertex()
+ {
+ String wkt = "POLYGON ((40 180, 40 60, 240 60, 240 180, 140 60, 40 180))";
+ checkIsValidSTR(wkt, false);
+ checkIsValidDefault(wkt, false);
+ }
+
+ /**
+ * Ensure that the Disconnected Interior condition is not validated
+ */
+ public void testDisconnectedInteriorShellSelfTouchAtVertex()
+ {
+ String wkt = "POLYGON ((20 20, 20 100, 140 100, 140 180, 260 180, 260 100, 140 100, 140 20, 20 20))";
+ checkIsValidSTR(wkt, false);
+ checkIsValidDefault(wkt, false);
+ }
+
+ public void testShellCross()
+ {
+ String wkt = "POLYGON ((20 20, 120 20, 120 220, 240 220, 240 120, 20 120, 20 20))";
+ checkIsValidSTR(wkt, false);
+ checkIsValidDefault(wkt, false);
+ }
+
+ public void testShellCrossAndSTR()
+ {
+ String wkt = "POLYGON ((20 20, 120 20, 120 220, 180 220, 140 160, 200 160, 180 220, 240 220, 240 120, 20 120, 20 20))";
+ checkIsValidSTR(wkt, false);
+ checkIsValidDefault(wkt, false);
+ }
+
+ private void checkIsValidDefault(String wkt, boolean expected)
+ {
+ Geometry geom = fromWKT(wkt);
+ IsValidOp validator = new IsValidOp(geom);
+ boolean isValid = validator.isValid();
+ assertTrue(isValid == expected);
+ }
+
+ private void checkIsValidSTR(String wkt, boolean expected)
+ {
+ Geometry geom = fromWKT(wkt);
+ IsValidOp validator = new IsValidOp(geom);
+ validator.setSelfTouchingRingFormingHoleValid(true);
+ boolean isValid = validator.isValid();
+ assertTrue(isValid == expected);
+ }
+
+ Geometry fromWKT(String wkt)
+ {
+ Geometry geom = null;
+ try {
+ geom = rdr.read(wkt);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return geom;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/precision/CommonBitsOpTest.java b/modules/core/src/test/java/org/locationtech/jts/precision/CommonBitsOpTest.java
new file mode 100644
index 0000000..fe3f4dd
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/precision/CommonBitsOpTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+
+import test.jts.GeometryTestCase;
+
+public class CommonBitsOpTest extends GeometryTestCase
+{
+
+ public CommonBitsOpTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Tests an issue where CommonBitsRemover was not persisting changes to some kinds of CoordinateSequences
+ */
+ public void testPackedCoordinateSequence() {
+ GeometryFactory pcsFactory = new GeometryFactory(PackedCoordinateSequenceFactory.DOUBLE_FACTORY);
+ Geometry geom0 = read(pcsFactory, "POLYGON ((210 210, 210 220, 220 220, 220 210, 210 210))");
+ Geometry geom1 = read("POLYGON ((225 225, 225 215, 215 215, 215 225, 225 225))");
+ CommonBitsOp cbo = new CommonBitsOp(true);
+ Geometry result = cbo.intersection(geom0, geom1);
+ Geometry expected = geom0.intersection(geom1);
+ ///Geometry expected = read("POLYGON ((220 215, 215 215, 215 220, 220 220, 220 215))");
+ checkEqual(expected, result);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/precision/GeometryPrecisionReducerTest.java b/modules/core/src/test/java/org/locationtech/jts/precision/GeometryPrecisionReducerTest.java
new file mode 100644
index 0000000..6e0baf8
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/precision/GeometryPrecisionReducerTest.java
@@ -0,0 +1,146 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+/**
+ * @version 1.12
+ */
+public class GeometryPrecisionReducerTest
+ extends TestCase
+{
+ private PrecisionModel pmFloat = new PrecisionModel();
+ private PrecisionModel pmFixed1 = new PrecisionModel(1);
+ private GeometryPrecisionReducer reducer = new GeometryPrecisionReducer(pmFixed1);
+ private GeometryPrecisionReducer reducerKeepCollapse
+ = new GeometryPrecisionReducer(pmFixed1);
+
+ private GeometryFactory gfFloat = new GeometryFactory(pmFloat, 0);
+ WKTReader reader = new WKTReader(gfFloat);
+
+ public static void main(String args[]) {
+ TestRunner.run(GeometryPrecisionReducerTest.class);
+ }
+
+ public GeometryPrecisionReducerTest(String name)
+ {
+ super(name);
+ reducerKeepCollapse.setRemoveCollapsedComponents(false);
+ }
+
+ public void testSquare()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 1.4, 1.4 1.4, 1.4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0 ))");
+ Geometry gReduce = reducer.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+ public void testTinySquareCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 .4, .4 .4, .4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON EMPTY");
+ Geometry gReduce = reducer.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testSquareCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 1.4, .4 .4, .4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON EMPTY");
+ Geometry gReduce = reducer.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testSquareKeepCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 1.4, .4 .4, .4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON EMPTY");
+ Geometry gReduce = reducerKeepCollapse.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testLine()
+ throws Exception
+ {
+ Geometry g = reader.read("LINESTRING ( 0 0, 0 1.4 )");
+ Geometry g2 = reader.read("LINESTRING (0 0, 0 1)");
+ Geometry gReduce = reducer.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testLineRemoveCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("LINESTRING ( 0 0, 0 .4 )");
+ Geometry g2 = reader.read("LINESTRING EMPTY");
+ Geometry gReduce = reducer.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testLineKeepCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("LINESTRING ( 0 0, 0 .4 )");
+ Geometry g2 = reader.read("LINESTRING ( 0 0, 0 0 )");
+ Geometry gReduce = reducerKeepCollapse.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testPolgonWithCollapsedLine() throws Exception {
+ Geometry g = reader.read("POLYGON ((10 10, 100 100, 200 10.1, 300 10, 10 10))");
+ Geometry g2 = reader.read("POLYGON ((10 10, 100 100, 200 10, 10 10))");
+ Geometry gReduce = reducer.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testPolgonWithCollapsedLinePointwise() throws Exception {
+ Geometry g = reader.read("POLYGON ((10 10, 100 100, 200 10.1, 300 10, 10 10))");
+ Geometry g2 = reader.read("POLYGON ((10 10, 100 100, 200 10, 300 10, 10 10))");
+ Geometry gReduce = GeometryPrecisionReducer.reducePointwise(g, pmFixed1);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testPolgonWithCollapsedPoint() throws Exception {
+ Geometry g = reader.read("POLYGON ((10 10, 100 100, 200 10.1, 300 100, 400 10, 10 10))");
+ Geometry g2 = reader.read("MULTIPOLYGON (((10 10, 100 100, 200 10, 10 10)), ((200 10, 300 100, 400 10, 200 10)))");
+ Geometry gReduce = reducer.reduce(g);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ public void testPolgonWithCollapsedPointPointwise() throws Exception {
+ Geometry g = reader.read("POLYGON ((10 10, 100 100, 200 10.1, 300 100, 400 10, 10 10))");
+ Geometry g2 = reader.read("POLYGON ((10 10, 100 100, 200 10, 300 100, 400 10, 10 10))");
+ Geometry gReduce = GeometryPrecisionReducer.reducePointwise(g, pmFixed1);
+ assertEqualsExactAndHasSameFactory(gReduce, g2);
+ }
+
+ private void assertEqualsExactAndHasSameFactory(Geometry a, Geometry b)
+ {
+ assertTrue(a.equalsExact(b));
+ assertTrue(a.getFactory() == b.getFactory());
+ }
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/precision/MinimumClearanceTest.java b/modules/core/src/test/java/org/locationtech/jts/precision/MinimumClearanceTest.java
new file mode 100644
index 0000000..4f33eaa
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/precision/MinimumClearanceTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+public class MinimumClearanceTest extends TestCase {
+ public static void main(String args[]) {
+ TestRunner.run(MinimumClearanceTest.class);
+ }
+
+ private GeometryFactory geomFact = new GeometryFactory();
+ private WKTReader reader = new WKTReader();
+
+ public MinimumClearanceTest(String name) { super(name); }
+
+ public void test2IdenticalPoints()
+ throws ParseException
+ {
+ runTest("MULTIPOINT ((100 100), (100 100))", 1.7976931348623157E308);
+ }
+
+ public void test3Points()
+ throws ParseException
+ {
+ runTest("MULTIPOINT ((100 100), (10 100), (30 100))", 20);
+ }
+
+ public void testTriangle()
+ throws ParseException
+ {
+ runTest("POLYGON ((100 100, 300 100, 200 200, 100 100))", 100);
+ }
+
+ private void runTest(String wkt, double expectedValue)
+ throws ParseException
+ {
+ Geometry g = reader.read(wkt);
+ double rp = MinimumClearance.getDistance(g);
+ assertEquals(expectedValue, rp);
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducerTest.java b/modules/core/src/test/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducerTest.java
new file mode 100644
index 0000000..365c182
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducerTest.java
@@ -0,0 +1,110 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.precision;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * @version 1.7
+ */
+public class SimpleGeometryPrecisionReducerTest
+ extends TestCase
+{
+ private PrecisionModel pmFloat = new PrecisionModel();
+ private PrecisionModel pmFixed1 = new PrecisionModel(1);
+ private SimpleGeometryPrecisionReducer reducer = new SimpleGeometryPrecisionReducer(pmFixed1);
+ private SimpleGeometryPrecisionReducer reducerKeepCollapse
+ = new SimpleGeometryPrecisionReducer(pmFixed1);
+
+ private GeometryFactory gfFloat = new GeometryFactory(pmFloat, 0);
+ WKTReader reader = new WKTReader(gfFloat);
+
+ public static void main(String args[]) {
+ TestRunner.run(SimpleGeometryPrecisionReducerTest.class);
+ }
+
+ public SimpleGeometryPrecisionReducerTest(String name)
+ {
+ super(name);
+ reducerKeepCollapse.setRemoveCollapsedComponents(false);
+
+ }
+
+ public void testSquare()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 1.4, 1.4 1.4, 1.4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0 ))");
+ Geometry gReduce = reducer.reduce(g);
+ assertTrue(gReduce.equalsExact(g2));
+ }
+ public void testTinySquareCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 .4, .4 .4, .4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON EMPTY");
+ Geometry gReduce = reducer.reduce(g);
+ assertTrue(gReduce.equalsExact(g2));
+ }
+ public void testSquareCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 1.4, .4 .4, .4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON EMPTY");
+ Geometry gReduce = reducer.reduce(g);
+ assertTrue(gReduce.equalsExact(g2));
+ }
+ public void testSquareKeepCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("POLYGON (( 0 0, 0 1.4, .4 .4, .4 0, 0 0 ))");
+ Geometry g2 = reader.read("POLYGON (( 0 0, 0 1, 0 0, 0 0, 0 0 ))");
+ Geometry gReduce = reducerKeepCollapse.reduce(g);
+ assertTrue(gReduce.equalsExact(g2));
+ }
+ public void testLine()
+ throws Exception
+ {
+ Geometry g = reader.read("LINESTRING ( 0 0, 0 1.4 )");
+ Geometry g2 = reader.read("LINESTRING (0 0, 0 1)");
+ Geometry gReduce = reducer.reduce(g);
+ assertTrue(gReduce.equalsExact(g2));
+ }
+ public void testLineRemoveCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("LINESTRING ( 0 0, 0 .4 )");
+ Geometry g2 = reader.read("LINESTRING EMPTY");
+ Geometry gReduce = reducer.reduce(g);
+ assertTrue(gReduce.equalsExact(g2));
+ }
+ public void testLineKeepCollapse()
+ throws Exception
+ {
+ Geometry g = reader.read("LINESTRING ( 0 0, 0 .4 )");
+ Geometry g2 = reader.read("LINESTRING ( 0 0, 0 0 )");
+ Geometry gReduce = reducerKeepCollapse.reduce(g);
+ assertTrue(gReduce.equalsExact(g2));
+ }
+
+
+
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifierTest.java b/modules/core/src/test/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifierTest.java
new file mode 100644
index 0000000..3c9db94
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifierTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * @version 1.7
+ */
+public class DouglasPeuckerSimplifierTest
+ extends TestCase
+{
+ public DouglasPeuckerSimplifierTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(DouglasPeuckerSimplifierTest.class);
+ }
+
+ public void testEmptyPolygon() throws Exception {
+ String geomStr = "POLYGON(EMPTY)";
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ geomStr,
+ 1))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+
+ public void testPoint() throws Exception {
+ String geomStr = "POINT (10 10)";
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ geomStr,
+ 1))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+
+
+ public void testPolygonNoReduction() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "POLYGON ((20 220, 40 220, 60 220, 80 220, 100 220, 120 220, 140 220, 140 180, 100 180, 60 180, 20 180, 20 220))",
+ 10.0))
+ .test();
+ }
+ public void testPolygonReductionWithSplit() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "POLYGON ((40 240, 160 241, 280 240, 280 160, 160 240, 40 140, 40 240))",
+ 10.0))
+ .test();
+ }
+ public void testPolygonReduction() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "POLYGON ((120 120, 121 121, 122 122, 220 120, 180 199, 160 200, 140 199, 120 120))",
+ 10.0))
+ .test();
+ }
+ public void testPolygonWithTouchingHole() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "POLYGON ((80 200, 240 200, 240 60, 80 60, 80 200), (120 120, 220 120, 180 199, 160 200, 140 199, 120 120))",
+ 10.0))
+ .setExpectedResult("POLYGON ((80 200, 160 200, 240 200, 240 60, 80 60, 80 200), (160 200, 140 199, 120 120, 220 120, 180 199, 160 200)))")
+ .test();
+ }
+ public void testFlattishPolygon() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "POLYGON ((0 0, 50 0, 53 0, 55 0, 100 0, 70 1, 60 1, 50 1, 40 1, 0 0))",
+ 10.0))
+ .test();
+ }
+ public void testTinySquare() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "POLYGON ((0 5, 5 5, 5 0, 0 0, 0 1, 0 5))",
+ 10.0))
+ .test();
+ }
+ public void testTinyHole() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "POLYGON ((10 10, 10 310, 370 310, 370 10, 10 10), (160 190, 180 190, 180 170, 160 190))",
+ 30.0))
+ .testEmpty(false);
+ }
+ public void testTinyLineString() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "LINESTRING (0 5, 1 5, 2 5, 5 5)",
+ 10.0))
+ .test();
+ }
+ public void testMultiPoint() throws Exception {
+ String geomStr = "MULTIPOINT(80 200, 240 200, 240 60, 80 60, 80 200, 140 199, 120 120)";
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 10.0))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+ public void testMultiLineString() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "MULTILINESTRING( (0 0, 50 0, 70 0, 80 0, 100 0), (0 0, 50 1, 60 1, 100 0) )",
+ 10.0))
+ .test();
+ }
+ public void testMultiLineStringWithEmpty() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "MULTILINESTRING( EMPTY, (0 0, 50 0, 70 0, 80 0, 100 0), (0 0, 50 1, 60 1, 100 0) )",
+ 10.0))
+ .test();
+ }
+ public void testMultiPolygonWithEmpty() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "MULTIPOLYGON (EMPTY, ((-36 91.5, 4.5 91.5, 4.5 57.5, -36 57.5, -36 91.5)), ((25.5 57.5, 61.5 57.5, 61.5 23.5, 25.5 23.5, 25.5 57.5)))",
+ 10.0))
+ .test();
+ }
+ public void testGeometryCollection() throws Exception {
+ new GeometryOperationValidator(
+ DPSimplifierResult.getResult(
+ "GEOMETRYCOLLECTION ("
+ + "MULTIPOINT (80 200, 240 200, 240 60, 80 60, 80 200, 140 199, 120 120),"
+ + "POLYGON ((80 200, 240 200, 240 60, 80 60, 80 200)),"
+ + "LINESTRING (80 200, 240 200, 240 60, 80 60, 80 200, 140 199, 120 120)"
+ + ")"
+ ,10.0))
+ .test();
+ }
+}
+
+class DPSimplifierResult
+{
+ private static WKTReader rdr = new WKTReader();
+
+ public static Geometry[] getResult(String wkt, double tolerance)
+ throws ParseException
+ {
+ Geometry[] ioGeom = new Geometry[2];
+ ioGeom[0] = rdr.read(wkt);
+ ioGeom[1] = DouglasPeuckerSimplifier.simplify(ioGeom[0], tolerance);
+ //System.out.println(ioGeom[1]);
+ return ioGeom;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/simplify/GeometryOperationValidator.java b/modules/core/src/test/java/org/locationtech/jts/simplify/GeometryOperationValidator.java
new file mode 100644
index 0000000..80501b2
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/simplify/GeometryOperationValidator.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.Assert;
+
+
+/**
+ * Runs various validation tests on a the results of a geometry operation
+ */
+public class GeometryOperationValidator
+{
+ private static WKTReader rdr = new WKTReader();
+ private Geometry[] ioGeometry;
+ private boolean expectedSameStructure = false;
+ private String wktExpected = null;
+
+ public GeometryOperationValidator(Geometry[] ioGeometry)
+ {
+ this.ioGeometry = ioGeometry;
+ }
+
+ public GeometryOperationValidator setExpectedResult(String wktExpected)
+ {
+ this.wktExpected = wktExpected;
+ return this;
+ }
+
+ public GeometryOperationValidator setExpectedSameStructure()
+ {
+ this.expectedSameStructure = true;
+ return this;
+ }
+
+ public boolean isAllTestsPassed()
+ {
+ try {
+ test();
+ }
+ catch (Throwable e) {
+ return false;
+ }
+ return true;
+ }
+ /**
+ * Tests if the result is valid.
+ * Throws an exception if result is not valid.
+ * This allows chaining multiple tests together.
+ *
+ * @throws Exception if the result is not valid.
+ */
+ public void test()
+ throws Exception
+ {
+ testSameStructure();
+ testValid();
+ testExpectedResult();
+ }
+
+ public GeometryOperationValidator testSameStructure() throws Exception {
+ if (!expectedSameStructure)
+ return this;
+ Assert.assertTrue("simplified geometry has different structure than input",
+ SameStructureTester.isSameStructure(ioGeometry[0], ioGeometry[1]));
+ return this;
+ }
+
+ public GeometryOperationValidator testValid() throws Exception {
+ Assert.assertTrue("simplified geometry is not valid", ioGeometry[1]
+ .isValid());
+ return this;
+ }
+
+ public GeometryOperationValidator testEmpty(boolean isEmpty) throws Exception {
+ String failureCondition = isEmpty ? "not empty" : "empty";
+ Assert.assertTrue("simplified geometry is " + failureCondition,
+ ioGeometry[1].isEmpty() == isEmpty);
+ return this;
+ }
+
+ private void testExpectedResult()
+ throws Exception
+ {
+ if (wktExpected == null) return;
+ Geometry expectedGeom = rdr.read(wktExpected);
+ boolean isEqual = expectedGeom.equalsExact(ioGeometry[1]);
+ if (! isEqual) {
+ System.out.println("Result not expected: " + ioGeometry[1]);
+ }
+ Assert.assertTrue("Expected result not found",isEqual);
+
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/simplify/SameStructureTester.java b/modules/core/src/test/java/org/locationtech/jts/simplify/SameStructureTester.java
new file mode 100644
index 0000000..d0439f8
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/simplify/SameStructureTester.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Test if two geometries have the same structure
+ * (but not necessarily the same coordinate sequences or adjacencies).
+ */
+public class SameStructureTester {
+
+ public static boolean isSameStructure(Geometry g1, Geometry g2)
+ {
+ if (g1.getClass() != g2.getClass())
+ return false;
+ if (g1 instanceof GeometryCollection)
+ return isSameStructureCollection((GeometryCollection) g1, (GeometryCollection) g2);
+ else if (g1 instanceof Polygon)
+ return isSameStructurePolygon((Polygon) g1, (Polygon) g2);
+ else if (g1 instanceof LineString)
+ return isSameStructureLineString((LineString) g1, (LineString) g2);
+ else if (g1 instanceof Point)
+ return isSameStructurePoint((Point) g1, (Point) g2);
+
+ Assert.shouldNeverReachHere(
+ "Unsupported Geometry class: " + g1.getClass().getName());
+ return false;
+ }
+
+ private static boolean isSameStructureCollection(GeometryCollection g1, GeometryCollection g2)
+ {
+ if (g1.getNumGeometries() != g2.getNumGeometries())
+ return false;
+ for (int i = 0; i < g1.getNumGeometries(); i++) {
+ if (! isSameStructure(g1.getGeometryN(i), g2.getGeometryN(i)))
+ return false;
+ }
+ return true;
+ }
+
+ private static boolean isSameStructurePolygon(Polygon g1, Polygon g2)
+ {
+ if (g1.getNumInteriorRing() != g2.getNumInteriorRing())
+ return false;
+ // could check for both empty or nonempty here
+ return true;
+ }
+
+ private static boolean isSameStructureLineString(LineString g1, LineString g2)
+ {
+ // could check for both empty or nonempty here
+ return true;
+ }
+
+ private static boolean isSameStructurePoint(Point g1, Point g2)
+ {
+ // could check for both empty or nonempty here
+ return true;
+ }
+
+ private SameStructureTester() {
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/simplify/TopologyPreservingSimplifierTest.java b/modules/core/src/test/java/org/locationtech/jts/simplify/TopologyPreservingSimplifierTest.java
new file mode 100644
index 0000000..9bf3bc9
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/simplify/TopologyPreservingSimplifierTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * @version 1.7
+ */
+public class TopologyPreservingSimplifierTest
+ extends TestCase
+{
+ public TopologyPreservingSimplifierTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(TopologyPreservingSimplifierTest.class);
+ }
+
+ public void testEmptyPolygon() throws Exception {
+ String geomStr = "POLYGON(EMPTY)";
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 1))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+
+ public void testPoint() throws Exception {
+ String geomStr = "POINT (10 10)";
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 1))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+
+
+ /**
+ * Test is from http://postgis.refractions.net/pipermail/postgis-users/2008-April/019327.html
+ * Exhibits the issue where simplified polygon shells can "jump" across
+ * holes, causing invalid topology.
+ *
+ * @throws Exception
+ */
+ public void testMultiPolygonWithSmallComponents() throws Exception {
+ String geomStr = "MULTIPOLYGON(((13.73095 51.024734,13.7309323 51.0247668,13.7306959 51.0247959,13.7292724 51.0249742,13.7280216 51.0251252,13.7266598 51.0252998,13.7259617 51.0254072,13.7258854 51.0254201,13.7253253 51.0255144,13.725276 51.025492,13.724538 51.025631,13.7230288 51.0259021,13.7223529 51.0260273,13.7223299 51.0260863,13.7222292 51.026391,13.7220002 51.0273366,13.7217875 51.0282094,13.721746 51.028243,13.7217693 51.0282803,13.7215512 51.0291967,13.721513 51.029222,13.72 [...]
+ boolean isPassed = new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 0.0057))
+ .isAllTestsPassed();
+ assertTrue(! isPassed);
+ }
+ /**
+ * Test is from http://lists.jump-project.org/pipermail/jts-devel/2008-February/002350.html
+ * @throws Exception
+ */
+ public void testPolygonWithSpike() throws Exception {
+ String geomStr = "POLYGON ((3312459.605 6646878.353, 3312460.524 6646875.969, 3312459.427 6646878.421, 3312460.014 6646886.391, 3312465.889 6646887.398, 3312470.827 6646884.839, 3312475.4 6646878.027, 3312477.289 6646871.694, 3312472.748 6646869.547, 3312468.253 6646874.01, 3312463.52 6646875.779, 3312459.605 6646878.353))";
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 2.0))
+ .test();
+ }
+ public void testPolygonNoReduction() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "POLYGON ((20 220, 40 220, 60 220, 80 220, 100 220, 120 220, 140 220, 140 180, 100 180, 60 180, 20 180, 20 220))",
+ 10.0))
+ .test();
+ }
+ public void testPolygonNoReductionWithConflicts() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "POLYGON ((40 240, 160 241, 280 240, 280 160, 160 240, 40 140, 40 240))",
+ 10.0))
+ .test();
+ }
+ public void testPolygonWithTouchingHole() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "POLYGON ((80 200, 240 200, 240 60, 80 60, 80 200), (120 120, 220 120, 180 199, 160 200, 140 199, 120 120))",
+ 10.0))
+ .setExpectedResult("POLYGON ((80 200, 240 200, 240 60, 80 60, 80 200), (120 120, 220 120, 180 199, 160 200, 140 199, 120 120))")
+ .test();
+ }
+ public void testFlattishPolygon() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "POLYGON ((0 0, 50 0, 53 0, 55 0, 100 0, 70 1, 60 1, 50 1, 40 1, 0 0))",
+ 10.0))
+ .test();
+ }
+ public void testPolygonWithFlattishHole() throws Exception {
+ String geomStr = "POLYGON ((0 0, 0 200, 200 200, 200 0, 0 0), (140 40, 90 95, 40 160, 95 100, 140 40))";
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 20.0))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+ public void testTinySquare() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "POLYGON ((0 5, 5 5, 5 0, 0 0, 0 1, 0 5))",
+ 10.0))
+ .test();
+ }
+ public void testTinyLineString() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "LINESTRING (0 5, 1 5, 2 5, 5 5)",
+ 10.0))
+ .test();
+ }
+
+ public void testTinyClosedLineString() throws Exception {
+ String geomStr = "LINESTRING (0 0, 5 0, 5 5, 0 0)";
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 10))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+
+ public void testMultiPoint() throws Exception {
+ String geomStr = "MULTIPOINT(80 200, 240 200, 240 60, 80 60, 80 200, 140 199, 120 120)";
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ geomStr,
+ 10.0))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+
+ public void testMultiLineString() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "MULTILINESTRING( (0 0, 50 0, 70 0, 80 0, 100 0), (0 0, 50 1, 60 1, 100 0) )",
+ 10.0))
+ .test();
+ }
+ public void testMultiLineStringWithEmpty() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "MULTILINESTRING(EMPTY, (0 0, 50 0, 70 0, 80 0, 100 0), (0 0, 50 1, 60 1, 100 0) )",
+ 10.0))
+ .test();
+ }
+ public void testMultiPolygonWithEmpty() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "MULTIPOLYGON (EMPTY, ((-36 91.5, 4.5 91.5, 4.5 57.5, -36 57.5, -36 91.5)), ((25.5 57.5, 61.5 57.5, 61.5 23.5, 25.5 23.5, 25.5 57.5)))",
+ 10.0))
+ .test();
+ }
+ public void testGeometryCollection() throws Exception {
+ new GeometryOperationValidator(
+ TPSimplifierResult.getResult(
+ "GEOMETRYCOLLECTION ("
+ + "MULTIPOINT (80 200, 240 200, 240 60, 80 60, 80 200, 140 199, 120 120),"
+ + "POLYGON ((80 200, 240 200, 240 60, 80 60, 80 200)),"
+ + "LINESTRING (80 200, 240 200, 240 60, 80 60, 80 200, 140 199, 120 120)"
+ + ")"
+ ,10.0))
+ .test();
+ }
+}
+
+class TPSimplifierResult
+{
+ private static WKTReader rdr = new WKTReader();
+
+ public static Geometry[] getResult(String wkt, double tolerance)
+ throws ParseException
+ {
+ Geometry[] ioGeom = new Geometry[2];
+ ioGeom[0] = rdr.read(wkt);
+ ioGeom[1] = TopologyPreservingSimplifier.simplify(ioGeom[0], tolerance);
+ //System.out.println(ioGeom[1]);
+ return ioGeom;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/simplify/VWSimplifierTest.java b/modules/core/src/test/java/org/locationtech/jts/simplify/VWSimplifierTest.java
new file mode 100644
index 0000000..76b5ac3
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/simplify/VWSimplifierTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.simplify;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+
+/**
+ * @version 1.7
+ */
+public class VWSimplifierTest
+ extends TestCase
+{
+ public VWSimplifierTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(VWSimplifierTest.class);
+ }
+
+ public void testEmptyPolygon() throws Exception {
+ String geomStr = "POLYGON(EMPTY)";
+ new GeometryOperationValidator(
+ VWSimplifierResult.getResult(
+ geomStr,
+ 1))
+ .setExpectedResult(geomStr)
+ .test();
+ }
+
+ public void testPolygonNoReduction() throws Exception {
+ new GeometryOperationValidator(
+ VWSimplifierResult.getResult(
+ "POLYGON ((20 220, 40 220, 60 220, 80 220, 100 220, 120 220, 140 220, 140 180, 100 180, 60 180, 20 180, 20 220))",
+ 1.0))
+ .test();
+ }
+ public void testPolygonSpikeInShell() throws Exception {
+ new GeometryOperationValidator(
+ VWSimplifierResult.getResult(
+ "POLYGON ((1721355.3 693015.146, 1721318.687 693046.251, 1721306.747 693063.038, 1721367.025 692978.29, 1721355.3 693015.146))",
+ 10.0))
+ .setExpectedResult("POLYGON ((1721355.3 693015.146, 1721367.025 692978.29, 1721318.687 693046.251, 1721355.3 693015.146))")
+ .test();
+ }
+ public void testPolygonSpikeInHole() throws Exception {
+ new GeometryOperationValidator(
+ VWSimplifierResult.getResult(
+ "POLYGON ((1721270 693090, 1721400 693090, 1721400 692960, 1721270 692960, 1721270 693090), (1721355.3 693015.146, 1721318.687 693046.251, 1721306.747 693063.038, 1721367.025 692978.29, 1721355.3 693015.146))",
+ 10.0))
+ .setExpectedResult("POLYGON ((1721270 693090, 1721400 693090, 1721400 692960, 1721270 692960, 1721270 693090), (1721355.3 693015.146, 1721318.687 693046.251, 1721367.025 692978.29, 1721355.3 693015.146))")
+ .test();
+ }
+
+
+}
+
+class VWSimplifierResult
+{
+ private static WKTReader rdr = new WKTReader();
+
+ public static Geometry[] getResult(String wkt, double tolerance)
+ throws ParseException
+ {
+ Geometry[] ioGeom = new Geometry[2];
+ ioGeom[0] = rdr.read(wkt);
+ ioGeom[1] = VWSimplifier.simplify(ioGeom[0], tolerance);
+ //System.out.println(ioGeom[1]);
+ return ioGeom;
+ }
+}
diff --git a/modules/core/src/test/java/org/locationtech/jts/triangulate/ConformingDelaunayTest.java b/modules/core/src/test/java/org/locationtech/jts/triangulate/ConformingDelaunayTest.java
new file mode 100644
index 0000000..af2b519
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/triangulate/ConformingDelaunayTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests Delaunay Triangulation classes
+ *
+ */
+public class ConformingDelaunayTest extends TestCase {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(ConformingDelaunayTest.class);
+ }
+
+ public ConformingDelaunayTest(String name) { super(name); }
+
+ public void testRandom()
+ throws ParseException
+ {
+ String wkt = "MULTIPOINT ((90 290), (120 250), (280 250), (200 200), (220 290), (170 320), (110 180), (70 140), (180 110), (210 80), (250 120))";
+ String lineWKT = "MULTILINESTRING ((130 160, 150 280, 200 250), (180 120, 240 230), (40 270, 90 220), (90 270, 130 290, 100 280, 140 310))";
+
+ String expected = "MULTILINESTRING ((220 290, 280 250), (170 320, 220 290), (170 320, 140 310), (90 290, 140 310), (90 290, 40 270), (70 140, 40 270), (70 140, 210 80), (210 80, 250 120), (280 250, 250 120), (250 120, 240 230), (280 250, 240 230), (240 230, 220 290), (200 250, 240 230), (220 290, 200 250), (150 280, 200 250), (220 290, 150 280), (170 320, 150 280), (140 310, 150 280), (130 290, 150 280), (130 290, 140 310), (130 290, 124 298), (140 310, 124 298), (90 290, 124 298), (1 [...]
+ runDelaunay(wkt, lineWKT, false, expected);
+
+ String expectedTri = "GEOMETRYCOLLECTION (POLYGON ((40 270, 70 140, 90 220, 40 270)), POLYGON ((40 270, 90 220, 90 270, 40 270)), POLYGON ((40 270, 90 270, 90 290, 40 270)), POLYGON ((90 290, 90 270, 100 280, 90 290)), POLYGON ((90 290, 100 280, 124 298, 90 290)), POLYGON ((90 290, 124 298, 140 310, 90 290)), POLYGON ((140 310, 124 298, 130 290, 140 310)), POLYGON ((140 310, 130 290, 150 280, 140 310)), POLYGON ((140 310, 150 280, 170 320, 140 310)), POLYGON ((170 320, 150 280, 220 29 [...]
+ runDelaunay(wkt, lineWKT, true, expectedTri);
+ }
+
+ static final double COMPARISON_TOLERANCE = 1.0e-7;
+
+ void runDelaunay(String sitesWKT, String constraintsWKT, boolean computeTriangles, String expectedWKT)
+ throws ParseException
+ {
+ Geometry sites = reader.read(sitesWKT);
+ Geometry constraints = reader.read(constraintsWKT);
+
+ ConformingDelaunayTriangulationBuilder builder = new ConformingDelaunayTriangulationBuilder();
+ builder.setSites(sites);
+ builder.setConstraints(constraints);
+ GeometryFactory geomFact = new GeometryFactory();
+
+ Geometry result = null;
+ if (computeTriangles) {
+ result = builder.getTriangles(geomFact);
+ }
+ else {
+ result = builder.getEdges(geomFact);
+ }
+ //System.out.println(result);
+
+ Geometry expectedEdges = reader.read(expectedWKT);
+ result.normalize();
+ expectedEdges.normalize();
+ assertTrue(expectedEdges.equalsExact(result, COMPARISON_TOLERANCE));
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/triangulate/DelaunayTest.java b/modules/core/src/test/java/org/locationtech/jts/triangulate/DelaunayTest.java
new file mode 100644
index 0000000..d650753
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/triangulate/DelaunayTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests Delaunay Triangulation classes
+ *
+ */
+public class DelaunayTest extends TestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(DelaunayTest.class);
+ }
+
+ private GeometryFactory geomFact = new GeometryFactory();
+ private WKTReader reader = new WKTReader();
+
+ public DelaunayTest(String name) { super(name); }
+
+ public void testTriangle()
+ throws ParseException
+ {
+ String wkt = "MULTIPOINT ((10 10 1), (10 20 2), (20 20 3))";
+ String expected = "MULTILINESTRING ((10 20, 20 20), (10 10, 10 20), (10 10, 20 20))";
+ runDelaunayEdges(wkt, expected);
+ String expectedTri = "GEOMETRYCOLLECTION (POLYGON ((10 20, 10 10, 20 20, 10 20)))";
+ runDelaunay(wkt, true, expectedTri);
+ }
+
+ public void testRandom()
+ throws ParseException
+ {
+ String wkt = "MULTIPOINT ((50 40), (140 70), (80 100), (130 140), (30 150), (70 180), (190 110), (120 20))";
+ String expected = "MULTILINESTRING ((70 180, 190 110), (30 150, 70 180), (30 150, 50 40), (50 40, 120 20), (190 110, 120 20), (120 20, 140 70), (190 110, 140 70), (130 140, 140 70), (130 140, 190 110), (70 180, 130 140), (80 100, 130 140), (70 180, 80 100), (30 150, 80 100), (50 40, 80 100), (80 100, 120 20), (80 100, 140 70))";
+ runDelaunayEdges(wkt, expected);
+ String expectedTri = "GEOMETRYCOLLECTION (POLYGON ((30 150, 50 40, 80 100, 30 150)), POLYGON ((30 150, 80 100, 70 180, 30 150)), POLYGON ((70 180, 80 100, 130 140, 70 180)), POLYGON ((70 180, 130 140, 190 110, 70 180)), POLYGON ((190 110, 130 140, 140 70, 190 110)), POLYGON ((190 110, 140 70, 120 20, 190 110)), POLYGON ((120 20, 140 70, 80 100, 120 20)), POLYGON ((120 20, 80 100, 50 40, 120 20)), POLYGON ((80 100, 140 70, 130 140, 80 100)))";
+ runDelaunay(wkt, true, expectedTri);
+ }
+
+ public void testGrid()
+ throws ParseException
+ {
+ String wkt = "MULTIPOINT ((10 10), (10 20), (20 20), (20 10), (20 0), (10 0), (0 0), (0 10), (0 20))";
+ String expected = "MULTILINESTRING ((10 20, 20 20), (0 20, 10 20), (0 10, 0 20), (0 0, 0 10), (0 0, 10 0), (10 0, 20 0), (20 0, 20 10), (20 10, 20 20), (10 20, 20 10), (10 10, 20 10), (10 10, 10 20), (10 10, 0 20), (10 10, 0 10), (10 0, 10 10), (0 10, 10 0), (10 10, 20 0))";
+ runDelaunayEdges(wkt, expected);
+ String expectedTri = "GEOMETRYCOLLECTION (POLYGON ((0 20, 0 10, 10 10, 0 20)), POLYGON ((0 20, 10 10, 10 20, 0 20)), POLYGON ((10 20, 10 10, 20 10, 10 20)), POLYGON ((10 20, 20 10, 20 20, 10 20)), POLYGON ((10 0, 20 0, 10 10, 10 0)), POLYGON ((10 0, 10 10, 0 10, 10 0)), POLYGON ((10 0, 0 10, 0 0, 10 0)), POLYGON ((10 10, 20 0, 20 10, 10 10)))";
+ runDelaunay(wkt, true, expectedTri);
+ }
+
+ public void testCircle()
+ throws ParseException
+ {
+ String wkt = "POLYGON ((42 30, 41.96 29.61, 41.85 29.23, 41.66 28.89, 41.41 28.59, 41.11 28.34, 40.77 28.15, 40.39 28.04, 40 28, 39.61 28.04, 39.23 28.15, 38.89 28.34, 38.59 28.59, 38.34 28.89, 38.15 29.23, 38.04 29.61, 38 30, 38.04 30.39, 38.15 30.77, 38.34 31.11, 38.59 31.41, 38.89 31.66, 39.23 31.85, 39.61 31.96, 40 32, 40.39 31.96, 40.77 31.85, 41.11 31.66, 41.41 31.41, 41.66 31.11, 41.85 30.77, 41.96 30.39, 42 30))";
+ String expected = "MULTILINESTRING ((41.66 31.11, 41.85 30.77), (41.41 31.41, 41.66 31.11), (41.11 31.66, 41.41 31.41), (40.77 31.85, 41.11 31.66), (40.39 31.96, 40.77 31.85), (40 32, 40.39 31.96), (39.61 31.96, 40 32), (39.23 31.85, 39.61 31.96), (38.89 31.66, 39.23 31.85), (38.59 31.41, 38.89 31.66), (38.34 31.11, 38.59 31.41), (38.15 30.77, 38.34 31.11), (38.04 30.39, 38.15 30.77), (38 30, 38.04 30.39), (38 30, 38.04 29.61), (38.04 29.61, 38.15 29.23), (38.15 29.23, 38.34 28.89), [...]
+ runDelaunayEdges(wkt, expected);
+ }
+
+ public void testPolygonWithChevronHoles()
+ throws ParseException
+ {
+ String wkt = "POLYGON ((0 0, 0 200, 180 200, 180 0, 0 0), (20 180, 160 180, 160 20, 152.625 146.75, 20 180), (30 160, 150 30, 70 90, 30 160))";
+ String expected = "MULTILINESTRING ((0 200, 180 200), (0 0, 0 200), (0 0, 180 0), (180 200, 180 0), (152.625 146.75, 180 0), (152.625 146.75, 180 200), (152.625 146.75, 160 180), (160 180, 180 200), (0 200, 160 180), (20 180, 160 180), (0 200, 20 180), (20 180, 30 160), (30 160, 0 200), (0 0, 30 160), (30 160, 70 90), (0 0, 70 90), (70 90, 150 30), (150 30, 0 0), (150 30, 160 20), (0 0, 160 20), (160 20, 180 0), (152.625 146.75, 160 20), (150 30, 152.625 146.75), (70 90, 152.625 146. [...]
+ runDelaunayEdges(wkt, expected);
+ }
+
+ static final double COMPARISON_TOLERANCE = 1.0e-7;
+
+ void runDelaunayEdges(String sitesWKT, String expectedWKT)
+ throws ParseException
+ {
+ runDelaunay(sitesWKT, false, expectedWKT);
+ }
+
+ void runDelaunay(String sitesWKT, boolean computeTriangles, String expectedWKT)
+ throws ParseException
+ {
+ Geometry sites = reader.read(sitesWKT);
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(sites);
+
+ Geometry result = null;
+ if (computeTriangles) {
+ result = builder.getTriangles(geomFact);
+ }
+ else {
+ result = builder.getEdges(geomFact);
+ }
+ //System.out.println(result);
+
+ Geometry expected = reader.read(expectedWKT);
+ result.normalize();
+ expected.normalize();
+ assertTrue(expected.equalsExact(result, COMPARISON_TOLERANCE));
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/triangulate/VoronoiTest.java b/modules/core/src/test/java/org/locationtech/jts/triangulate/VoronoiTest.java
new file mode 100644
index 0000000..7daff45
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/triangulate/VoronoiTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.triangulate;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * Tests Voronoi diagram generation
+ *
+ */
+public class VoronoiTest extends TestCase {
+
+ private WKTReader reader = new WKTReader();
+
+ public static void main(String args[]) {
+ TestRunner.run(VoronoiTest.class);
+ }
+
+ public VoronoiTest(String name) { super(name); }
+
+ public void testSimple()
+ throws ParseException
+ {
+ String wkt = "MULTIPOINT ((10 10), (20 70), (60 30), (80 70))";
+ String expected = "GEOMETRYCOLLECTION (POLYGON ((-1162.076359832636 462.66344142259413, 50 419.375, 50 60, 27.857142857142854 37.857142857142854, -867 187, -1162.076359832636 462.66344142259413)), POLYGON ((-867 187, 27.857142857142854 37.857142857142854, 245 -505, 45 -725, -867 187)), POLYGON ((27.857142857142854 37.857142857142854, 50 60, 556.6666666666666 -193.33333333333331, 245 -505, 27.857142857142854 37.857142857142854)), POLYGON ((50 60, 50 419.375, 1289.1616314199396 481.333 [...]
+ runVoronoi(wkt, true, expected);
+ }
+
+ static final double COMPARISON_TOLERANCE = 1.0e-7;
+
+ void runVoronoi(String sitesWKT, boolean computeTriangles, String expectedWKT)
+ throws ParseException
+ {
+ Geometry sites = reader.read(sitesWKT);
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(sites);
+
+ QuadEdgeSubdivision subdiv = builder.getSubdivision();
+
+ GeometryFactory geomFact = new GeometryFactory();
+ Geometry result = null;
+ if (computeTriangles) {
+ result = subdiv.getVoronoiDiagram(geomFact);
+ }
+ else {
+ //result = builder.getEdges(geomFact);
+ }
+ //System.out.println(result);
+
+ Geometry expectedEdges = reader.read(expectedWKT);
+ result.normalize();
+ expectedEdges.normalize();
+ assertTrue(expectedEdges.equalsExact(result, COMPARISON_TOLERANCE));
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/org/locationtech/jts/util/PriorityQueueTest.java b/modules/core/src/test/java/org/locationtech/jts/util/PriorityQueueTest.java
new file mode 100644
index 0000000..9ea908f
--- /dev/null
+++ b/modules/core/src/test/java/org/locationtech/jts/util/PriorityQueueTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.locationtech.jts.util;
+
+import junit.framework.TestCase;
+
+/**
+ * @version 1.7
+ */
+public class PriorityQueueTest
+ extends TestCase
+{
+ public PriorityQueueTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(PriorityQueueTest.class);
+ }
+
+ public void testOrder1() throws Exception {
+ PriorityQueue q = new PriorityQueue();
+ q.add(new Integer(1));
+ q.add(new Integer(10));
+ q.add(new Integer(5));
+ q.add(new Integer(8));
+ q.add(new Integer(-1));
+ checkOrder(q);
+ }
+
+ public void testOrderRandom1() throws Exception {
+ PriorityQueue q = new PriorityQueue();
+ addRandomItems(q, 100);
+ checkOrder(q);
+ }
+
+ private void addRandomItems(PriorityQueue q, int num)
+ {
+ for (int i = 0 ; i < num; i++) {
+ q.add(new Integer((int) (num * Math.random())));
+ }
+ }
+
+ private void checkOrder(PriorityQueue q)
+ {
+ Comparable curr = null;
+
+ while (! q.isEmpty()) {
+ Comparable next = (Comparable) q.poll();
+ //System.out.println(next);
+ if (curr == null)
+ curr = next;
+ else
+ assertTrue(next.compareTo(curr) >= 0);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/test/jts/GeometryTestCase.java b/modules/core/src/test/java/test/jts/GeometryTestCase.java
new file mode 100644
index 0000000..f3f05c9
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/GeometryTestCase.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+
+/**
+ * A base class for Geometry tests which provides various utility methods.
+ *
+ * @author mbdavis
+ *
+ */
+public class GeometryTestCase extends TestCase{
+
+ GeometryFactory geomFactory = new GeometryFactory();
+
+ WKTReader reader = new WKTReader(geomFactory);
+
+ public GeometryTestCase(String name) {
+ super(name);
+ }
+
+ protected void checkEqual(Geometry expected, Geometry actual) {
+ Geometry actualNorm = actual.norm();
+ Geometry expectedNorm = expected.norm();
+ boolean equal = actualNorm.equalsExact(expectedNorm);
+ if (! equal) {
+ System.out.println("FAIL - Expected = " + expectedNorm
+ + " actual = " + actualNorm );
+ }
+ assertTrue(equal);
+ }
+
+ protected void checkEqual(Collection expected, Collection actual) {
+ checkEqual(toGeometryCollection(expected),toGeometryCollection(actual) );
+ }
+
+ GeometryCollection toGeometryCollection(Collection geoms) {
+ return geomFactory.createGeometryCollection(GeometryFactory.toGeometryArray(geoms));
+ }
+
+ /**
+ * Reads a {@link Geometry} from a WKT string using a custom {@link GeometryFactory}.
+ *
+ * @param geomFactory the custom factory to use
+ * @param wkt the WKT string
+ * @return the geometry read
+ */
+ protected Geometry read(GeometryFactory geomFactory, String wkt) {
+ WKTReader reader = new WKTReader(geomFactory);
+ try {
+ return reader.read(wkt);
+ } catch (ParseException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+
+ protected Geometry read(String wkt) {
+ try {
+ return reader.read(wkt);
+ } catch (ParseException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+
+ protected List readList(String[] wkt) {
+ ArrayList geometries = new ArrayList();
+ for (int i = 0; i < wkt.length; i++) {
+ geometries.add(read(wkt[i]));
+ }
+ return geometries;
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/IsValidTester.java b/modules/core/src/test/java/test/jts/IsValidTester.java
new file mode 100644
index 0000000..af5713e
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/IsValidTester.java
@@ -0,0 +1,39 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.operation.valid.IsValidOp;
+
+
+/**
+ * @version 1.7
+ */
+public class IsValidTester {
+
+ public IsValidTester() {
+ }
+ public static void main(String[] args) throws Exception {
+ WKTReader reader = new WKTReader(new GeometryFactory());
+ Geometry g = reader.read("GEOMETRYCOLLECTION (POINT (110 300), POINT (100 110), POINT (130 210), POINT (150 210), POINT (150 180), POINT (130 170), POINT (140 190), POINT (130 200), LINESTRING (240 50, 210 120, 270 80, 250 140, 330 70, 300 160, 340 130, 340 130), POLYGON ((210 340, 220 260, 150 270, 230 220, 230 140, 270 210, 360 240, 260 250, 260 280, 240 270, 210 340), (230 270, 230 250, 200 250, 240 220, 240 190, 260 220, 290 230, 250 230, 230 270)))");
+ IsValidOp op = new IsValidOp(g);
+ if (!op.isValid()) {
+ System.out.println(op.getValidationError().getMessage());
+ }
+ else {
+ System.out.println("OK");
+ }
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/LineIntersectorBenchmark.java b/modules/core/src/test/java/test/jts/LineIntersectorBenchmark.java
new file mode 100644
index 0000000..1a87d25
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/LineIntersectorBenchmark.java
@@ -0,0 +1,125 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts;
+
+import java.util.Date;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.NonRobustLineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+
+
+
+/**
+ * @version 1.7
+ */
+public class LineIntersectorBenchmark implements Runnable {
+
+ public LineIntersectorBenchmark() {
+ }
+
+ public static void main(String[] args) {
+ LineIntersectorBenchmark lineIntersectorBenchmark = new LineIntersectorBenchmark();
+ lineIntersectorBenchmark.run();
+ }
+
+ public void run() {
+ exercise(new NonRobustLineIntersector());
+ exercise(new RobustLineIntersector());
+ }
+
+ private void exercise(LineIntersector lineIntersector) {
+ System.out.println(lineIntersector.getClass().getName());
+ Date start = new Date();
+ for (int i = 0; i < 1000000; i++) {
+ exerciseOnce(lineIntersector);
+ }
+ Date end = new Date();
+ System.out.println("Milliseconds elapsed: " + (end.getTime() - start.getTime()));
+ System.out.println();
+ }
+
+ private void exerciseOnce(LineIntersector lineIntersector) {
+ Coordinate p1 = new Coordinate(10, 10);
+ Coordinate p2 = new Coordinate(20, 20);
+ Coordinate q1 = new Coordinate(20, 10);
+ Coordinate q2 = new Coordinate(10, 20);
+ Coordinate x = new Coordinate(15, 15);
+ lineIntersector.computeIntersection(p1, p2, q1, q2);
+ lineIntersector.getIntersectionNum();
+ lineIntersector.getIntersection(0);
+ lineIntersector.isProper();
+ lineIntersector.hasIntersection();
+
+ p1 = new Coordinate(10, 10);
+ p2 = new Coordinate(20, 10);
+ q1 = new Coordinate(22, 10);
+ q2 = new Coordinate(30, 10);
+ lineIntersector.computeIntersection(p1, p2, q1, q2);
+ lineIntersector.isProper();
+ lineIntersector.hasIntersection();
+
+ p1 = new Coordinate(10, 10);
+ p2 = new Coordinate(20, 10);
+ q1 = new Coordinate(20, 10);
+ q2 = new Coordinate(30, 10);
+ lineIntersector.computeIntersection(p1, p2, q1, q2);
+ lineIntersector.isProper();
+ lineIntersector.hasIntersection();
+
+ p1 = new Coordinate(10, 10);
+ p2 = new Coordinate(20, 10);
+ q1 = new Coordinate(15, 10);
+ q2 = new Coordinate(30, 10);
+ lineIntersector.computeIntersection(p1, p2, q1, q2);
+ lineIntersector.isProper();
+ lineIntersector.hasIntersection();
+
+ p1 = new Coordinate(30, 10);
+ p2 = new Coordinate(20, 10);
+ q1 = new Coordinate(10, 10);
+ q2 = new Coordinate(30, 10);
+ lineIntersector.computeIntersection(p1, p2, q1, q2);
+ lineIntersector.hasIntersection();
+
+ lineIntersector.computeIntersection(new Coordinate(100, 100), new Coordinate(10, 100),
+ new Coordinate(100, 10), new Coordinate(100, 100));
+ lineIntersector.hasIntersection();
+ lineIntersector.getIntersectionNum();
+
+ lineIntersector.computeIntersection(new Coordinate(190, 50), new Coordinate(120, 100),
+ new Coordinate(120, 100), new Coordinate(50, 150));
+ lineIntersector.hasIntersection();
+ lineIntersector.getIntersectionNum();
+ lineIntersector.getIntersection(1);
+
+ lineIntersector.computeIntersection(new Coordinate(180, 200), new Coordinate(160, 180),
+ new Coordinate(220, 240), new Coordinate(140, 160));
+ lineIntersector.hasIntersection();
+ lineIntersector.getIntersectionNum();
+
+ lineIntersector.computeIntersection(new Coordinate(30, 10), new Coordinate(30, 30),
+ new Coordinate(10, 10), new Coordinate(90, 11));
+ lineIntersector.hasIntersection();
+ lineIntersector.getIntersectionNum();
+ lineIntersector.isProper();
+
+ lineIntersector.computeIntersection(new Coordinate(10, 30), new Coordinate(10, 0),
+ new Coordinate(11, 90), new Coordinate(10, 10));
+ lineIntersector.hasIntersection();
+ lineIntersector.getIntersectionNum();
+ lineIntersector.isProper();
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/TestFiles.java b/modules/core/src/test/java/test/jts/TestFiles.java
new file mode 100644
index 0000000..d420b67
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/TestFiles.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts;
+
+import java.io.File;
+
+public class TestFiles {
+
+ public static final String getResourceFilePath(String fileName) {
+ ClassLoader classLoader = TestFiles.class.getClassLoader();
+ return new File(classLoader.getResource("testdata/" + fileName).getFile()).getAbsolutePath();
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/geom/CoordinateSequenceExperiment2.java b/modules/core/src/test/java/test/jts/geom/CoordinateSequenceExperiment2.java
new file mode 100644
index 0000000..e93bc94
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/geom/CoordinateSequenceExperiment2.java
@@ -0,0 +1,108 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.geom;
+
+import java.io.IOException;
+
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+
+
+
+
+
+/**
+ * @version 1.7
+ */
+public class CoordinateSequenceExperiment2 {
+ GeometryFactory fact = new GeometryFactory(new PrecisionModel(), 0);
+
+ public static void main(String[] args) throws Exception {
+ CoordinateSequenceExperiment2 test = new CoordinateSequenceExperiment2();
+// System.out.println("Press Enter to begin");
+// System.in.read();
+ test.run();
+ System.exit(0);
+ }
+
+ public void run() throws IOException {
+ int factor = 1;
+
+ for (int i = 1; i < 15; i++) {
+ int n = factor * 1000;
+
+ if (n > 64000) { break; }
+ factor *= 2;
+ run2(n);
+ }
+ }
+
+ public void run(int nPts) {
+ double size = 100.0;
+ double armLen = 50.0;
+ int nArms = 10;
+ long startTime = System.currentTimeMillis();
+ Polygon poly = GeometryTestFactory.createSineStar(fact, 0.0, 0.0, size,
+ armLen, nArms, nPts);
+ long endTime = System.currentTimeMillis();
+ long totalTime = endTime - startTime;
+ String totalTimeStr = totalTime < 10000 ? totalTime + " ms"
+ : totalTime / 1000.0 + " s";
+ System.out.println("Sine Star Creation Executed in " + totalTimeStr);
+
+ Polygon box = GeometryTestFactory.createBox(fact, 0, 0, 1, 100.0);
+
+ startTime = System.currentTimeMillis();
+ poly.intersects(box);
+
+ endTime = System.currentTimeMillis();
+ totalTime = endTime - startTime;
+ totalTimeStr = totalTime < 10000 ? totalTime + " ms"
+ : totalTime / 1000.0 + " s";
+ System.out.println("n Pts: " + nPts + " Executed in " + totalTimeStr);
+ }
+
+ public void run2(int nPts) throws IOException {
+ double size = 100.0;
+ double armLen = 50.0;
+ int nArms = 10;
+ long startTime = System.currentTimeMillis();
+ Polygon poly = GeometryTestFactory.createSineStar(fact, 0.0, 0.0, size,
+ armLen, nArms, nPts);
+ Polygon box = GeometryTestFactory.createSineStar(fact, 0.0, size / 2,
+ size, armLen, nArms, nPts);
+ long endTime = System.currentTimeMillis();
+ long totalTime = endTime - startTime;
+ String totalTimeStr = totalTime < 10000 ? totalTime + " ms"
+ : totalTime / 1000.0 + " s";
+ System.out.println("Sine Star Creation Executed in " + totalTimeStr);
+
+
+ //RobustDeterminant.callCount = 0;
+ System.out.println("n Pts: " + nPts);
+
+ startTime = System.currentTimeMillis();
+ poly.intersects(box);
+
+ //poly.intersection(box);
+ endTime = System.currentTimeMillis();
+ totalTime = endTime - startTime;
+ totalTimeStr = totalTime < 10000 ? totalTime + " ms"
+ : (double) totalTime / 1000.0 +
+ " s";
+
+ //System.out.println(" signOfDet2x2 calls: " + RobustDeterminant.callCount);
+ System.out.println(" Executed in " + totalTimeStr);
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/geom/GeometryTestFactory.java b/modules/core/src/test/java/test/jts/geom/GeometryTestFactory.java
new file mode 100644
index 0000000..30eceb6
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/geom/GeometryTestFactory.java
@@ -0,0 +1,176 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.geom;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+
+
+/**
+ * @version 1.7
+ */
+public class GeometryTestFactory {
+
+ public static Coordinate[] createBox(
+ double minx, double miny,
+ int nSide,
+ double segLen)
+ {
+ int i;
+ int ipt = 0;
+ Coordinate[] pts = new Coordinate[4 * nSide + 1];
+
+ double maxx = minx + nSide * segLen;
+ double maxy = miny + nSide * segLen;
+
+ for (i = 0; i < nSide; i++) {
+ double x = minx + i * segLen;
+ double y = miny;
+ pts[ipt++] = new Coordinate(x, y);
+ }
+ for (i = 0; i < nSide; i++) {
+ double x = maxx;
+ double y = miny + i * segLen;
+ pts[ipt++] = new Coordinate(x, y);
+ }
+ for (i = 0; i < nSide; i++) {
+ double x = maxx - i * segLen;
+ double y = maxy;
+ pts[ipt++] = new Coordinate(x, y);
+ }
+ for (i = 0; i < nSide; i++) {
+ double x = minx;
+ double y = maxy - i * segLen;
+ pts[ipt++] = new Coordinate(x, y);
+ }
+ pts[ipt++] = new Coordinate(pts[0]);
+
+ return pts;
+ }
+ public static Polygon createCircle(
+ GeometryFactory fact,
+ double basex,
+ double basey,
+ double size,
+ int nPts)
+ {
+ Coordinate[] pts = createCircle(basex, basey, size, nPts);
+ LinearRing ring = fact.createLinearRing(pts);
+ Polygon poly = fact.createPolygon(ring, null);
+ return poly;
+ }
+
+ /**
+ * Creates a circle
+ * @param basex the centre x coord
+ * @param basey the centre y coord
+ * @param size the size of the envelope of the star
+ * @param nPts the number of points in the star
+ */
+ public static Coordinate[] createCircle(
+ double basex,
+ double basey,
+ double size,
+ int nPts)
+ {
+ Coordinate[] pts = new Coordinate[nPts + 1];
+
+ int iPt = 0;
+ double len = size / 2.0;
+
+ for (int i = 0; i < nPts; i++) {
+ double ang = i * (2 * Math.PI / nPts);
+ double x = len * Math.cos(ang) + basex;
+ double y = len * Math.sin(ang) + basey;
+ Coordinate pt = new Coordinate(x, y);
+ pts[iPt++] = pt;
+ }
+ pts[iPt] = pts[0];
+ return pts;
+ }
+
+ public static Polygon createBox(
+ GeometryFactory fact,
+ double minx, double miny,
+ int nSide,
+ double segLen)
+ {
+ Coordinate[] pts = createBox(minx, minx, nSide, segLen);
+ LinearRing ring = fact.createLinearRing(pts);
+ Polygon poly = fact.createPolygon(ring, null);
+ return poly;
+ }
+
+ /**
+ * Creates a star from a "circular" sine wave
+ * @param basex the centre x coord
+ * @param basey the centre y coord
+ * @param size the size of the envelope of the star
+ * @param armLen the length of an arm of the star
+ * @param nArms the number of arms of the star
+ * @param nPts the number of points in the star
+ */
+ public static Coordinate[] createSineStar(
+ double basex,
+ double basey,
+ double size,
+ double armLen,
+ int nArms,
+ int nPts)
+ {
+ double armBaseLen = size / 2 - armLen;
+ if (armBaseLen < 0) armBaseLen = 0.5;
+
+ double angInc = 2 * Math.PI / nArms;
+ int nArmPt = nPts / nArms;
+ if (nArmPt < 5) nArmPt = 5;
+
+ int nPts2 = nArmPt * nArms;
+ Coordinate[] pts = new Coordinate[nPts2 + 1];
+
+ int iPt = 0;
+ double starAng = 0.0;
+
+ for (int iArm = 0; iArm < nArms; iArm++) {
+ for (int iArmPt = 0; iArmPt < nArmPt; iArmPt++) {
+ double ang = iArmPt * (2 * Math.PI / nArmPt);
+ double len = armLen * (1 - Math.cos(ang) / 2) + armBaseLen;
+ double x = len * Math.cos(starAng + iArmPt * angInc / nArmPt) + basex;
+ double y = len * Math.sin(starAng + iArmPt * angInc / nArmPt) + basey;
+ Coordinate pt = new Coordinate(x, y);
+ pts[iPt++] = pt;
+ }
+ starAng += angInc;
+ }
+ pts[iPt] = pts[0];
+ return pts;
+ }
+
+ public static Polygon createSineStar(
+ GeometryFactory fact,
+ double basex,
+ double basey,
+ double size,
+ double armLen,
+ int nArms,
+ int nPts)
+ {
+ Coordinate[] pts = createSineStar(basex, basey, size, armLen, nArms, nPts);
+ LinearRing ring = fact.createLinearRing(pts);
+ Polygon poly = fact.createPolygon(ring, null);
+ return poly;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/geom/TestSerializable.java b/modules/core/src/test/java/test/jts/geom/TestSerializable.java
new file mode 100644
index 0000000..a2a064f
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/geom/TestSerializable.java
@@ -0,0 +1,153 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.geom;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+
+
+
+
+/**
+ * @version 1.7
+ */
+public class TestSerializable {
+
+ public static final String FILENAME = "c:\\testSerial.txt";
+ public static final GeometryFactory fact = new GeometryFactory();
+
+ public TestSerializable() {
+ }
+
+ public static void main(String[] args) {
+ TestSerializable test = new TestSerializable();
+ test.run();
+ }
+
+ public void run()
+ {
+ List objList = createData();
+ writeData(objList);
+ readData(objList);
+ }
+
+ List createData()
+ {
+ List objList = new ArrayList();
+
+ Envelope env = new Envelope(123, 456, 123, 456);
+ objList.add(env);
+
+ objList.add(GeometryTestFactory.createBox(fact, 0.0, 100.0, 10, 10.0));
+
+ return objList;
+
+ }
+ void writeData(List objList)
+ {
+ File file; // simply a file name
+ FileOutputStream outStream; // generic stream to the file
+ ObjectOutputStream objStream; // stream for objects to the file
+
+ file = new File(FILENAME);
+
+ try {
+ // setup a stream to a physical file on the filesystem
+ outStream = new FileOutputStream(file);
+
+ // attach a stream capable of writing objects to the stream that is
+ // connected to the file
+ objStream = new ObjectOutputStream(outStream);
+
+ objStream.writeObject(objList);
+// for (Iterator i = objList.iterator(); i.hasNext(); )
+// {
+// objStream.writeObject(i.next());
+// }
+ objStream.close();
+
+ } catch(IOException e) {
+ System.err.println("Things not going as planned.");
+ e.printStackTrace();
+ } // catch
+ }
+ void readData(List objList)
+ {
+ File file; // simply a file name
+ FileInputStream stream; // generic stream to the file
+ ObjectInputStream objStream; // stream for objects to the file
+
+ file = new File(FILENAME);
+
+ try {
+ // setup a stream to a physical file on the filesystem
+ stream = new FileInputStream(file);
+
+ // attach a stream capable of writing objects to the stream that is
+ // connected to the file
+ objStream = new ObjectInputStream(stream);
+
+ int count = 0;
+ Object obj = objStream.readObject();
+ List inputList = (List) obj;
+ for (Iterator i = inputList.iterator(); i.hasNext(); ) {
+ compare(objList.get(count++), i.next());
+ }
+
+// while (objStream.available() > 0) {
+// Object obj = objStream.readObject();
+// compare(objList.get(count++), obj);
+// }
+ objStream.close();
+
+ } catch(Exception e) {
+ System.err.println("Things not going as planned.");
+ e.printStackTrace();
+ } // catch
+ }
+
+ boolean compare(Object o1, Object o2)
+ {
+ boolean matched = false;
+ if (o1 instanceof Envelope) {
+ if (! ((Envelope) o1).equals(o2) ) {
+ System.out.println("expected " + o1 + ", found " + o2);
+ }
+ else
+ matched = true;
+ }
+ else if (o1 instanceof Geometry) {
+ if (! ((Geometry) o1).equalsExact((Geometry) o2) ) {
+ System.out.println("expected " + o1 + ", found " + o2);
+ }
+ else
+ matched = true;
+ }
+ if (matched)
+ System.out.println("found match for object");
+ return true;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/index/BinTreeCorrectTest.java b/modules/core/src/test/java/test/jts/index/BinTreeCorrectTest.java
new file mode 100644
index 0000000..d645cf4
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/BinTreeCorrectTest.java
@@ -0,0 +1,136 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.index;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.index.bintree.Bintree;
+import org.locationtech.jts.index.bintree.Interval;
+import org.locationtech.jts.util.Stopwatch;
+
+
+
+/**
+ * @version 1.7
+ */
+public class BinTreeCorrectTest {
+
+ public static void main(String[] args) throws Exception
+ {
+ //testBinaryPower();
+ BinTreeCorrectTest test = new BinTreeCorrectTest();
+ test.run();
+ }
+
+
+ static final int NUM_ITEMS = 20000;
+ static final double MIN_EXTENT = -1000.0;
+ static final double MAX_EXTENT = 1000.0;
+
+ IntervalList intervalList = new IntervalList();
+ Bintree btree = new Bintree();
+
+ public BinTreeCorrectTest() {
+ }
+
+ public void run()
+ {
+ fill();
+ System.out.println("depth = " + btree.depth()
+ + " size = " + btree.size() );
+ runQueries();
+ }
+
+ void fill()
+ {
+ createGrid(NUM_ITEMS);
+ }
+
+ void createGrid(int nGridCells)
+ {
+ int gridSize = (int) Math.sqrt((double) nGridCells);
+ gridSize += 1;
+ double extent = MAX_EXTENT - MIN_EXTENT;
+ double gridInc = extent / gridSize;
+ double cellSize = 2 * gridInc;
+
+ for (int i = 0; i < gridSize; i++) {
+ double x = MIN_EXTENT + gridInc * i;
+ Interval interval = new Interval(x, x + cellSize );
+ btree.insert(interval, interval);
+ intervalList.add(interval);
+ }
+ }
+
+ void runQueries()
+ {
+ int nGridCells = 100;
+ int cellSize = (int) Math.sqrt((double) NUM_ITEMS);
+ double extent = MAX_EXTENT - MIN_EXTENT;
+ double queryCellSize = 2.0 * extent / cellSize;
+
+ queryGrid(nGridCells, queryCellSize);
+
+ //queryGrid(200);
+ }
+
+ void queryGrid(int nGridCells, double cellSize)
+ {
+ Stopwatch sw = new Stopwatch();
+ sw.start();
+
+ int gridSize = (int) Math.sqrt((double) nGridCells);
+ gridSize += 1;
+ double extent = MAX_EXTENT - MIN_EXTENT;
+ double gridInc = extent / gridSize;
+
+ for (int i = 0; i < gridSize; i++) {
+ double x = MIN_EXTENT + gridInc * i;
+ Interval interval = new Interval(x, x + cellSize);
+ queryTest(interval);
+ //queryTime(env);
+ }
+ System.out.println("Time = " + sw.getTimeString());
+ }
+
+ void queryTime(Interval interval)
+ {
+ //List finalList = getOverlapping(q.query(env), env);
+
+ List eList = intervalList.query(interval);
+ }
+
+ void queryTest(Interval interval)
+ {
+ List candidateList = btree.query(interval);
+ List finalList = getOverlapping(candidateList, interval);
+
+ List eList = intervalList.query(interval);
+System.out.println(finalList.size());
+
+ if (finalList.size() != eList.size() )
+ throw new RuntimeException("queries do not match");
+ }
+
+ private List getOverlapping(List items, Interval searchInterval)
+ {
+ List result = new ArrayList();
+ for (int i = 0; i < items.size(); i++) {
+ Interval interval = (Interval) items.get(i);
+ if (interval.overlaps(searchInterval)) result.add(interval);
+ }
+ return result;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/index/EnvelopeList.java b/modules/core/src/test/java/test/jts/index/EnvelopeList.java
new file mode 100644
index 0000000..ed14186
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/EnvelopeList.java
@@ -0,0 +1,50 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.index;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+
+
+
+/**
+ * @version 1.7
+ */
+public class EnvelopeList
+{
+ List envList = new ArrayList();
+
+ public EnvelopeList() {
+ }
+
+ public void add(Envelope env)
+ {
+ envList.add(env);
+ }
+
+ public List query(Envelope searchEnv)
+ {
+ List result = new ArrayList();
+ for (Iterator i = envList.iterator(); i.hasNext(); ) {
+ Envelope env = (Envelope) i.next();
+ if (env.intersects(searchEnv))
+ result.add(env);
+ }
+ return result;
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/index/Index.java b/modules/core/src/test/java/test/jts/index/Index.java
new file mode 100644
index 0000000..0f6c85a
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/Index.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.index;
+
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+
+
+/**
+ * Adapter for different kinds of indexes
+ * @version 1.7
+ */
+public interface Index
+{
+ void insert(Envelope itemEnv, Object item);
+ List query(Envelope searchEnv);
+ void finishInserting();
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/test/jts/index/IndexTester.java b/modules/core/src/test/java/test/jts/index/IndexTester.java
new file mode 100644
index 0000000..81363e7
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/IndexTester.java
@@ -0,0 +1,137 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.index;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jts.util.Stopwatch;
+
+
+
+/**
+ * @version 1.7
+ */
+public class IndexTester {
+ static final int NUM_ITEMS = 2000;
+ static final double EXTENT_MIN = -1000.0;
+ static final double EXTENT_MAX = 1000.0;
+
+ Index index;
+
+ public IndexTester(Index index)
+ {
+ this.index = index;
+ }
+
+ public static class IndexResult {
+ public IndexResult(String indexName) { this.indexName = indexName; }
+ public String indexName;
+ public long loadMilliseconds;
+ public long queryMilliseconds;
+ }
+
+ private static List victoriaItems = null;
+
+ public IndexResult testAll(List items)
+ {
+ IndexResult result = new IndexResult(index.toString());
+ System.out.print(index.toString() + " ");
+ System.gc();
+ Stopwatch sw = new Stopwatch();
+ sw.start();
+ loadGrid(items);
+ String loadTime = sw.getTimeString();
+ result.loadMilliseconds = sw.getTime();
+ System.gc();
+ sw.start();
+ //runQueries();
+ runSelfQuery(items);
+ String queryTime = sw.getTimeString();
+ result.queryMilliseconds = sw.getTime();
+ System.out.println(" Load Time = " + loadTime + " Query Time = " + queryTime);
+ return result;
+ }
+
+ public static List createGridItems(int nGridCells)
+ {
+ ArrayList items = new ArrayList();
+ int gridSize = (int) Math.sqrt((double) nGridCells);
+ gridSize += 1;
+ double extent = EXTENT_MAX - EXTENT_MIN;
+ double gridInc = extent / gridSize;
+ double cellSize = gridInc;
+ for (int i = 0; i < gridSize; i++) {
+ for (int j = 0; j < gridSize; j++) {
+ double x = EXTENT_MIN + gridInc * i;
+ double y = EXTENT_MIN + gridInc * j;
+ Envelope env = new Envelope(x, x + cellSize,
+ y, y + cellSize);
+ items.add(env);
+ }
+ }
+ return items;
+ }
+
+ void loadGrid(List items)
+ {
+ for (Iterator i = items.iterator(); i.hasNext(); ) {
+ Envelope item = (Envelope) i.next();
+ index.insert(item, item);
+ }
+ index.finishInserting();
+ }
+ void runSelfQuery(List items)
+ {
+ double querySize = 0.0;
+ for (int i = 0; i < items.size(); i++) {
+ Envelope env = (Envelope) items.get(i);
+ List list = index.query(env);
+ Assert.isTrue(!list.isEmpty());
+ querySize += list.size();
+ }
+ System.out.println("Avg query size = " + querySize / items.size());
+ }
+ void runGridQuery()
+ {
+ int nGridCells = 100;
+ int cellSize = (int) Math.sqrt((double) NUM_ITEMS);
+ double extent = EXTENT_MAX - EXTENT_MIN;
+ double queryCellSize = 2.0 * extent / cellSize;
+
+ queryGrid(nGridCells, queryCellSize);
+ }
+
+ void queryGrid(int nGridCells, double cellSize)
+ {
+
+ int gridSize = (int) Math.sqrt((double) nGridCells);
+ gridSize += 1;
+ double extent = EXTENT_MAX - EXTENT_MIN;
+ double gridInc = extent / gridSize;
+
+ for (int i = 0; i < gridSize; i++) {
+ for (int j = 0; j < gridSize; j++) {
+ double x = EXTENT_MIN + gridInc * i;
+ double y = EXTENT_MIN + gridInc * j;
+ Envelope env = new Envelope(x, x + cellSize,
+ y, y + cellSize);
+ index.query(env);
+ }
+ }
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/index/IntervalList.java b/modules/core/src/test/java/test/jts/index/IntervalList.java
new file mode 100644
index 0000000..d27410b
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/IntervalList.java
@@ -0,0 +1,50 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.index;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.index.bintree.Interval;
+
+
+
+/**
+ * @version 1.7
+ */
+public class IntervalList
+{
+ List list = new ArrayList();
+
+ public IntervalList() {
+ }
+
+ public void add(Interval interval)
+ {
+ list.add(interval);
+ }
+
+ public List query(Interval searchInterval)
+ {
+ List result = new ArrayList();
+ for (Iterator i = list.iterator(); i.hasNext(); ) {
+ Interval interval = (Interval) i.next();
+ if (interval.overlaps(searchInterval))
+ result.add(interval);
+ }
+ return result;
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/index/QuadtreeCorrectTest.java b/modules/core/src/test/java/test/jts/index/QuadtreeCorrectTest.java
new file mode 100644
index 0000000..e027ff8
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/QuadtreeCorrectTest.java
@@ -0,0 +1,161 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.index;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.quadtree.Quadtree;
+import org.locationtech.jts.util.Stopwatch;
+
+
+
+/**
+ * @version 1.7
+ */
+public class QuadtreeCorrectTest {
+
+ public static void main(String[] args) throws Exception
+ {
+ //testBinaryPower();
+ QuadtreeCorrectTest test = new QuadtreeCorrectTest();
+ test.run();
+ }
+
+/*
+ public static void testBinaryPower()
+ {
+ printBinaryPower(1004573397.0);
+ printBinaryPower(100.0);
+ printBinaryPower(0.234);
+ printBinaryPower(0.000003455);
+ }
+
+ public static void printBinaryPower(double num)
+ {
+ BinaryPower pow2 = new BinaryPower();
+ int exp = BinaryPower.exponent(num);
+ double p2 = pow2.power(exp);
+ System.out.println(num + " : pow2 = " + Math.pow(2.0, exp)
+ + " exp = " + exp + " 2^exp = " + p2);
+ }
+*/
+ static final int NUM_ITEMS = 2000;
+ static final double MIN_EXTENT = -1000.0;
+ static final double MAX_EXTENT = 1000.0;
+
+ EnvelopeList envList = new EnvelopeList();
+ Quadtree q = new Quadtree();
+
+ public QuadtreeCorrectTest() {
+ }
+
+ public void run()
+ {
+ fill();
+ System.out.println("depth = " + q.depth()
+ + " size = " + q.size() );
+ runQueries();
+ }
+
+ void fill()
+ {
+ createGrid(NUM_ITEMS);
+ }
+
+ void createGrid(int nGridCells)
+ {
+ int gridSize = (int) Math.sqrt((double) nGridCells);
+ gridSize += 1;
+ double extent = MAX_EXTENT - MIN_EXTENT;
+ double gridInc = extent / gridSize;
+ double cellSize = 2 * gridInc;
+
+ for (int i = 0; i < gridSize; i++) {
+ for (int j = 0; j < gridSize; j++) {
+ double x = MIN_EXTENT + gridInc * i;
+ double y = MIN_EXTENT + gridInc * j;
+ Envelope env = new Envelope(x, x + cellSize,
+ y, y + cellSize);
+ q.insert(env, env);
+ envList.add(env);
+ }
+ }
+ }
+
+ void runQueries()
+ {
+ int nGridCells = 100;
+ int cellSize = (int) Math.sqrt((double) NUM_ITEMS);
+ double extent = MAX_EXTENT - MIN_EXTENT;
+ double queryCellSize = 2.0 * extent / cellSize;
+
+ queryGrid(nGridCells, queryCellSize);
+
+ //queryGrid(200);
+ }
+
+ void queryGrid(int nGridCells, double cellSize)
+ {
+ Stopwatch sw = new Stopwatch();
+ sw.start();
+
+ int gridSize = (int) Math.sqrt((double) nGridCells);
+ gridSize += 1;
+ double extent = MAX_EXTENT - MIN_EXTENT;
+ double gridInc = extent / gridSize;
+
+ for (int i = 0; i < gridSize; i++) {
+ for (int j = 0; j < gridSize; j++) {
+ double x = MIN_EXTENT + gridInc * i;
+ double y = MIN_EXTENT + gridInc * j;
+ Envelope env = new Envelope(x, x + cellSize,
+ y, y + cellSize);
+ queryTest(env);
+ //queryTime(env);
+ }
+ }
+ System.out.println("Time = " + sw.getTimeString());
+ }
+
+ void queryTime(Envelope env)
+ {
+ //List finalList = getOverlapping(q.query(env), env);
+
+ List eList = envList.query(env);
+ }
+
+ void queryTest(Envelope env)
+ {
+ List candidateList = q.query(env);
+ List finalList = getOverlapping(candidateList, env);
+
+ List eList = envList.query(env);
+//System.out.println(finalList.size());
+
+ if (finalList.size() != eList.size() )
+ throw new RuntimeException("queries do not match");
+ }
+
+ private List getOverlapping(List items, Envelope searchEnv)
+ {
+ List result = new ArrayList();
+ for (int i = 0; i < items.size(); i++) {
+ Envelope env = (Envelope) items.get(i);
+ if (env.intersects(searchEnv)) result.add(env);
+ }
+ return result;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/index/STRtreeDemo.java b/modules/core/src/test/java/test/jts/index/STRtreeDemo.java
new file mode 100644
index 0000000..6a76d32
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/STRtreeDemo.java
@@ -0,0 +1,163 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.index;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.index.strtree.AbstractNode;
+import org.locationtech.jts.index.strtree.Boundable;
+import org.locationtech.jts.index.strtree.STRtree;
+
+
+
+/**
+ * @version 1.7
+ */
+public class STRtreeDemo {
+
+ public STRtreeDemo() {
+ }
+
+ public static class TestTree extends STRtree {
+ public TestTree(int nodeCapacity) {
+ super(nodeCapacity);
+ }
+ public List boundablesAtLevel(int level) { return super.boundablesAtLevel(level); }
+ public AbstractNode getRoot() { return root; }
+ public List createParentBoundables(List verticalSlice, int newLevel) {
+ return super.createParentBoundables(verticalSlice, newLevel);
+ }
+ public List[] verticalSlices(List childBoundables, int size) {
+ return super.verticalSlices(childBoundables, size);
+ }
+ public List createParentBoundablesFromVerticalSlice(List childBoundables, int newLevel) {
+ return super.createParentBoundablesFromVerticalSlice(childBoundables, newLevel);
+ }
+ }
+
+ private static void initTree(TestTree t, List sourceEnvelopes) {
+ for (Iterator i = sourceEnvelopes.iterator(); i.hasNext(); ) {
+ Envelope sourceEnvelope = (Envelope) i.next();
+ t.insert(sourceEnvelope, sourceEnvelope);
+ }
+ t.build();
+ }
+
+ public static void main(String[] args) throws Exception {
+ List envelopes = sourceData();
+ TestTree t = new TestTree(NODE_CAPACITY);
+ initTree(t, envelopes);
+ PrintStream printStream = System.out;
+ printSourceData(envelopes, printStream);
+ printLevels(t, printStream);
+ }
+
+ public static void printSourceData(List sourceEnvelopes, PrintStream out) {
+ out.println("============ Source Data ============\n");
+ out.print("GEOMETRYCOLLECTION(");
+ boolean first = true;
+ for (Iterator i = sourceEnvelopes.iterator(); i.hasNext(); ) {
+ Envelope e = (Envelope) i.next();
+ Geometry g = factory.createPolygon(factory.createLinearRing(new Coordinate[] {
+ new Coordinate(e.getMinX(), e.getMinY()), new Coordinate(e.getMinX(), e.getMaxY()),
+ new Coordinate(e.getMaxX(), e.getMaxY()), new Coordinate(e.getMaxX(), e.getMinY()),
+ new Coordinate(e.getMinX(), e.getMinY()) }), null);
+ if (first) {
+ first = false;
+ }
+ else {
+ out.print(",");
+ }
+ out.print(g);
+ }
+ out.println(")\n");
+ }
+
+ private static List sourceData() {
+ ArrayList envelopes = new ArrayList();
+ for (int i = 0; i < ITEM_COUNT; i++) {
+ envelopes.add(randomRectangle().getEnvelopeInternal());
+ }
+ return envelopes;
+ }
+
+ private static final double EXTENT = 100;
+ private static final double MAX_ITEM_EXTENT = 15;
+ private static final double MIN_ITEM_EXTENT = 3;
+ private static final int ITEM_COUNT = 20;
+ private static final int NODE_CAPACITY = 4;
+ private static GeometryFactory factory = new GeometryFactory();
+
+ private static Polygon randomRectangle() {
+ double width = MIN_ITEM_EXTENT + ((MAX_ITEM_EXTENT-MIN_ITEM_EXTENT) * Math.random());
+ double height = MIN_ITEM_EXTENT + ((MAX_ITEM_EXTENT-MIN_ITEM_EXTENT) * Math.random());
+ double bottom = EXTENT * Math.random();
+ double left = EXTENT * Math.random();
+ double top = bottom + height;
+ double right = left + width;
+ return factory.createPolygon(factory.createLinearRing(new Coordinate[]{
+ new Coordinate(left, bottom), new Coordinate(right, bottom),
+ new Coordinate(right, top), new Coordinate(left, top),
+ new Coordinate(left, bottom) }), null);
+ }
+
+ public static void printLevels(TestTree t, PrintStream out) {
+ for (int i = 0; i <= t.getRoot().getLevel(); i++) {
+ printBoundables(t.boundablesAtLevel(i), "Level " + i, out);
+ }
+ }
+
+ public static void printBoundables(List boundables, String title, PrintStream out) {
+ out.println("============ " + title + " ============\n");
+ out.print("GEOMETRYCOLLECTION(");
+ boolean first = true;
+ for (Iterator i = boundables.iterator(); i.hasNext(); ) {
+ Boundable boundable = (Boundable) i.next();
+ if (first) {
+ first = false;
+ }
+ else {
+ out.print(",");
+ }
+ out.print(toString(boundable));
+ }
+ out.println(")\n");
+ }
+
+ private static String toString(Boundable b) {
+ return "POLYGON(("
+ + envelope(b).getMinX() + " "
+ + envelope(b).getMinY() + ", "
+ + envelope(b).getMinX() + " "
+ + envelope(b).getMaxY() + ", "
+ + envelope(b).getMaxX() + " "
+ + envelope(b).getMaxY() + ", "
+ + envelope(b).getMaxX() + " "
+ + envelope(b).getMinY() + ","
+ + envelope(b).getMinX() + " "
+ + envelope(b).getMinY() + "))";
+ }
+
+ private static Envelope envelope(Boundable b) {
+ return (Envelope)b.getBounds();
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/index/TreeTimeTest.java b/modules/core/src/test/java/test/jts/index/TreeTimeTest.java
new file mode 100644
index 0000000..c9f9908
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/index/TreeTimeTest.java
@@ -0,0 +1,127 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.index;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.quadtree.Quadtree;
+import org.locationtech.jts.index.strtree.STRtree;
+
+
+
+/**
+ * @version 1.7
+ */
+public class TreeTimeTest {
+ public static final int NUM_ITEMS = 10000;
+
+ public static void main(String[] args) throws Exception
+ {
+ int n = 10000;
+ TreeTimeTest test = new TreeTimeTest();
+ List items = IndexTester.createGridItems(n);
+ System.out.println("----------------------------------------------");
+ System.out.println("Dummy run to ensure classes are loaded before real run");
+ System.out.println("----------------------------------------------");
+ test.run(items);
+ System.out.println("----------------------------------------------");
+ System.out.println("Real run");
+ System.out.println("----------------------------------------------");
+ test.run(items);
+ }
+
+ public TreeTimeTest()
+ {
+ }
+
+ public List run(List items) throws Exception
+ {
+ ArrayList indexResults = new ArrayList();
+ System.out.println("# items = " + items.size());
+ indexResults.add(run(new QuadtreeIndex(), items));
+ indexResults.add(run(new STRtreeIndex(10), items));
+ //indexResults.add(run(new QXtreeIndex(), n));
+ //indexResults.add(run(new EnvelopeListIndex(), n));
+ return indexResults;
+ }
+
+ public IndexTester.IndexResult run(Index index, List items) throws Exception
+ {
+ return new IndexTester(index).testAll(items);
+ }
+
+ class STRtreeIndex
+ implements Index
+ {
+ public String toString() { return "STR[M=" + index.getNodeCapacity() + "]"; }
+// public String toString() { return "" + index.getNodeCapacity() + ""; }
+ public STRtreeIndex(int nodeCapacity)
+ {
+ index = new STRtree(nodeCapacity);
+ }
+ STRtree index;
+
+ public void insert(Envelope itemEnv, Object item)
+ {
+ index.insert(itemEnv, item);
+ }
+ public List query(Envelope searchEnv)
+ {
+ return index.query(searchEnv);
+ }
+ public void finishInserting()
+ {
+ index.build();
+ }
+ }
+
+ class QuadtreeIndex
+ implements Index
+ {
+ Quadtree index = new Quadtree();
+ public String toString() { return "Quad"; }
+ public void insert(Envelope itemEnv, Object item)
+ {
+ index.insert(itemEnv, item);
+ }
+ public List query(Envelope searchEnv)
+ {
+ return index.query(searchEnv);
+ }
+ public void finishInserting()
+ {
+ }
+ }
+
+ class EnvelopeListIndex
+ implements Index
+ {
+ EnvelopeList index = new EnvelopeList();
+ public String toString() { return "Env"; }
+ public void insert(Envelope itemEnv, Object item)
+ {
+ index.add(itemEnv);
+ }
+ public List query(Envelope searchEnv)
+ {
+ return index.query(searchEnv);
+ }
+ public void finishInserting()
+ {
+ }
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/insert-header.rb b/modules/core/src/test/java/test/jts/insert-header.rb
new file mode 100644
index 0000000..90af865
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/insert-header.rb
@@ -0,0 +1,100 @@
+#!ruby
+
+#Inserts licence headers and @version tags if necessary.
+#Updates the @version tags.
+#Usage: find . -iname '*.java' | xargs --max-args=1 --verbose test/jts/insert-header.rb
+
+filename = ARGV[0]
+version = "1.4"
+
+class AssertionFailure < StandardError
+end
+
+class Object
+ def assert(bool)
+ raise AssertionFailure.new("assertion failure") unless bool
+ end
+end
+
+class Array
+ def insert(inx, obj)
+ self[inx, 0] = obj
+ self
+ end
+end
+
+classLineIndex = nil
+classCommentStartIndex = nil
+classCommentEndIndex = nil
+
+input = File.readlines(filename)
+(0..input.size-1).each {|i|
+ if input[i] =~ /interface / and input[i] !~ /\*/
+ classLineIndex = i
+ break
+ end
+ if input[i] =~ /class / and input[i] !~ /\*/
+ classLineIndex = i
+ break
+ end
+ if input[i] =~ /\/\*\*/
+ classCommentStartIndex = i
+ classCommentEndIndex = nil
+ end
+ if input[i] =~ /\*\// and classCommentEndIndex == nil
+ classCommentEndIndex = i
+ end
+}
+
+assert(classLineIndex != nil)
+assert((classCommentStartIndex == nil && classCommentEndIndex == nil) || (classCommentStartIndex != classCommentEndIndex))
+
+if (classCommentStartIndex != nil)
+ preClassCommentLines = input[0..classCommentStartIndex-1]
+ classCommentLines = input[classCommentStartIndex..classCommentEndIndex]
+ classCommentLines.each {|line| line.gsub!(/@version.*/, '@version ' + version.to_s) }
+ linesBetweenClassCommentAndClass = input[classCommentEndIndex+1..classLineIndex-1]
+ linesBetweenClassCommentAndClass.each {|line| assert(line.strip.empty?)}
+else
+ preClassCommentLines = input[0..classLineIndex-1]
+ classCommentLines = ['
+/**
+ * @version ' + version + '
+ */']
+end
+classLines = input[classLineIndex..-1] OR
+
+versionFound = false
+classCommentLines.each{|line| versionFound = true if line =~ /@version/ }
+if !versionFound
+ classCommentLines.insert(classCommentLines.size-1, " *")
+ classCommentLines.insert(classCommentLines.size-1, " * @version " + version)
+end
+
+output = Array.new
+
+licenceFound = false
+preClassCommentLines.each {|line| licenceFound = true if line =~ /This library is distributed in the hope/ }
+if !licenceFound
+ licence = '
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+'
+ output << licence
+end
+
+output.concat(preClassCommentLines)
+output.concat(classCommentLines)
+output.concat(classLines)
+
+file = File.open(filename, "w")
+output.each {|line| file.puts line }
diff --git a/modules/core/src/test/java/test/jts/junit/GeometryUtils.java b/modules/core/src/test/java/test/jts/junit/GeometryUtils.java
new file mode 100644
index 0000000..363ff16
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/junit/GeometryUtils.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.junit;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+
+
+public class GeometryUtils
+{
+ //TODO: allow specifying GeometryFactory
+
+ public static WKTReader reader = new WKTReader();
+
+ public static List readWKT(String[] inputWKT)
+ throws ParseException
+ {
+ ArrayList geometries = new ArrayList();
+ for (int i = 0; i < inputWKT.length; i++) {
+ geometries.add(reader.read(inputWKT[i]));
+ }
+ return geometries;
+ }
+
+ public static Geometry readWKT(String inputWKT)
+ throws ParseException
+ {
+ return reader.read(inputWKT);
+ }
+
+ public static Collection readWKTFile(String filename)
+ throws IOException, ParseException
+ {
+ WKTFileReader fileRdr = new WKTFileReader(filename, reader);
+ List geoms = fileRdr.read();
+ return geoms;
+ }
+
+ public static Collection readWKTFile(Reader rdr)
+ throws IOException, ParseException
+ {
+ WKTFileReader fileRdr = new WKTFileReader(rdr, reader);
+ List geoms = fileRdr.read();
+ return geoms;
+ }
+
+
+ public static boolean isEqual(Geometry a, Geometry b)
+ {
+ Geometry a2 = normalize(a);
+ Geometry b2 = normalize(b);
+ return a2.equalsExact(b2);
+ }
+
+ public static Geometry normalize(Geometry g)
+ {
+ Geometry g2 = (Geometry) g.copy();
+ g2.normalize();
+ return g2;
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/junit/MasterTester.java b/modules/core/src/test/java/test/jts/junit/MasterTester.java
new file mode 100644
index 0000000..0f9e72f
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/junit/MasterTester.java
@@ -0,0 +1,132 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.junit;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.locationtech.jts.algorithm.RobustLineIntersectionTest;
+import org.locationtech.jts.geom.AreaLengthTest;
+import org.locationtech.jts.geom.BidirectionalComparatorTest;
+import org.locationtech.jts.geom.CoordinateArraysTest;
+import org.locationtech.jts.geom.EnvelopeTest;
+import org.locationtech.jts.geom.GeometryCollectionImplTest;
+import org.locationtech.jts.geom.GeometryImplTest;
+import org.locationtech.jts.geom.IntersectionMatrixTest;
+import org.locationtech.jts.geom.IsRectangleTest;
+import org.locationtech.jts.geom.LineStringImplTest;
+import org.locationtech.jts.geom.MultiPointImplTest;
+import org.locationtech.jts.geom.NormalizeTest;
+import org.locationtech.jts.geom.PointImplTest;
+import org.locationtech.jts.geom.PrecisionModelTest;
+import org.locationtech.jts.geom.PredicateShortCircuitTest;
+import org.locationtech.jts.geom.RectanglePredicateSyntheticTest;
+import org.locationtech.jts.geom.RectanglePredicateTest;
+import org.locationtech.jts.geom.impl.BasicCoordinateSequenceTest;
+import org.locationtech.jts.index.quadtree.QuadtreeTest;
+import org.locationtech.jts.index.strtree.IntervalTest;
+import org.locationtech.jts.index.strtree.SIRtreeTest;
+import org.locationtech.jts.index.strtree.STRtreeTest;
+import org.locationtech.jts.io.WKBTest;
+import org.locationtech.jts.io.WKTReaderTest;
+import org.locationtech.jts.io.WKTWriterTest;
+import org.locationtech.jts.linearref.LengthIndexedLineTest;
+import org.locationtech.jts.linearref.LocationIndexedLineTest;
+import org.locationtech.jts.operation.buffer.BufferTest;
+import org.locationtech.jts.operation.distance.DistanceTest;
+import org.locationtech.jts.operation.linemerge.LineMergerTest;
+import org.locationtech.jts.operation.polygonize.PolygonizeTest;
+import org.locationtech.jts.operation.relate.RelateBoundaryNodeRuleTest;
+import org.locationtech.jts.operation.union.CascadedPolygonUnionTest;
+import org.locationtech.jts.operation.union.UnaryUnionTest;
+import org.locationtech.jts.operation.valid.IsValidTest;
+import org.locationtech.jts.operation.valid.ValidClosedRingTest;
+import org.locationtech.jts.operation.valid.ValidSelfTouchingRingFormingHoleTest;
+import org.locationtech.jts.precision.SimpleGeometryPrecisionReducerTest;
+import org.locationtech.jts.triangulate.ConformingDelaunayTest;
+import org.locationtech.jts.triangulate.DelaunayTest;
+
+/**
+ * A collection of all the tests.
+ *
+ * @version 1.7
+ */
+public class MasterTester extends TestCase {
+
+ public MasterTester(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ TestSuite result = new TestSuite();
+ result.addTest(new TestSuite(org.locationtech.jts.algorithm.AngleTest.class));
+ result.addTest(new TestSuite(AreaLengthTest.class));
+ result.addTest(new TestSuite(BasicCoordinateSequenceTest.class));
+ result.addTest(new TestSuite(BidirectionalComparatorTest.class));
+ result.addTest(new TestSuite(BufferTest.class));
+ result.addTest(new TestSuite(CascadedPolygonUnionTest.class));
+ result.addTest(new TestSuite(org.locationtech.jts.algorithm.OrientationIndexTest.class));
+ result.addTest(new TestSuite(ConformingDelaunayTest.class));
+ result.addTest(new TestSuite(org.locationtech.jts.algorithm.ConvexHullTest.class));
+ result.addTest(new TestSuite(CoordinateArraysTest.class));
+ result.addTest(new TestSuite(DelaunayTest.class));
+ result.addTest(new TestSuite(DistanceTest.class));
+ result.addTest(new TestSuite(EnvelopeTest.class));
+ result.addTest(new TestSuite(GeometryCollectionImplTest.class));
+ result.addTest(new TestSuite(GeometryImplTest.class));
+ result.addTest(new TestSuite(IntersectionMatrixTest.class));
+ result.addTest(new TestSuite(IntervalTest.class));
+ result.addTest(new TestSuite(org.locationtech.jts.algorithm.IsCCWTest.class));
+ result.addTest(new TestSuite(IsRectangleTest.class));
+ result.addTest(new TestSuite(IsValidTest.class));
+ result.addTest(new TestSuite(LengthIndexedLineTest.class));
+ result.addTest(new TestSuite(LineMergerTest.class));
+ result.addTest(new TestSuite(LineStringImplTest.class));
+ result.addTest(new TestSuite(LocationIndexedLineTest.class));
+ result.addTest(new TestSuite(MiscellaneousTest.class));
+ result.addTest(new TestSuite(MiscellaneousTest2.class));
+ result.addTest(new TestSuite(MultiPointImplTest.class));
+ result.addTest(new TestSuite(org.locationtech.jts.algorithm.NonRobustLineIntersectorTest.class));
+ result.addTest(new TestSuite(NormalizeTest.class));
+ result.addTest(new TestSuite(PointImplTest.class));
+ result.addTest(new TestSuite(PolygonizeTest.class));
+ result.addTest(new TestSuite(PredicateShortCircuitTest.class));
+ result.addTest(new TestSuite(PrecisionModelTest.class));
+ result.addTest(new TestSuite(QuadtreeTest.class));
+ result.addTest(new TestSuite(RectanglePredicateSyntheticTest.class));
+ result.addTest(new TestSuite(RectanglePredicateTest.class));
+ result.addTest(new TestSuite(RelateBoundaryNodeRuleTest.class));
+ result.addTest(new TestSuite(RobustLineIntersectionTest.class));
+ result.addTest(new TestSuite(SimpleGeometryPrecisionReducerTest.class));
+ result.addTest(new TestSuite(SimpleTest.class));
+ result.addTest(new TestSuite(SIRtreeTest.class));
+ result.addTest(new TestSuite(STRtreeTest.class));
+ result.addTest(new TestSuite(WKTReaderTest.class));
+ result.addTest(new TestSuite(WKTWriterTest.class));
+ result.addTest(new TestSuite(WKBTest.class));
+ result.addTest(new TestSuite(UnaryUnionTest.class));
+ result.addTest(new TestSuite(ValidClosedRingTest.class));
+ result.addTest(new TestSuite(ValidSelfTouchingRingFormingHoleTest.class));
+ //result.addTest(new TestSuite(VoronoiTest.class));
+
+ return result;
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ System.exit(0);
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/junit/MiscellaneousTest.java b/modules/core/src/test/java/test/jts/junit/MiscellaneousTest.java
new file mode 100644
index 0000000..c3d98a4
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/junit/MiscellaneousTest.java
@@ -0,0 +1,486 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.junit;
+
+import java.util.ArrayList;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+/**
+ * @version 1.7
+ */
+public class MiscellaneousTest extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ TestRunner.run(MiscellaneousTest.class);
+ }
+
+ public void testEnvelopeCloned() throws Exception {
+ Geometry a = reader.read("LINESTRING(0 0, 10 10)");
+ //Envelope is lazily initialized [Jon Aquino]
+ a.getEnvelopeInternal();
+ Geometry b = (Geometry)a.copy();
+ assertTrue(a.getEnvelopeInternal() != b.getEnvelopeInternal());
+ }
+
+ public MiscellaneousTest(String name) { super(name); }
+
+ public void testCreateEmptyGeometry() throws Exception {
+ assertTrue(geometryFactory.createPoint((Coordinate)null).isEmpty());
+ assertTrue(geometryFactory.createLinearRing(new Coordinate[] { }).isEmpty());
+ assertTrue(geometryFactory.createLineString(new Coordinate[] { }).isEmpty());
+ assertTrue(geometryFactory.createPolygon(geometryFactory.createLinearRing(new Coordinate[] { }), new LinearRing[] { }).isEmpty());
+ assertTrue(geometryFactory.createMultiPolygon(new Polygon[] { }).isEmpty());
+ assertTrue(geometryFactory.createMultiLineString(new LineString[] { }).isEmpty());
+ assertTrue(geometryFactory.createMultiPoint(new Point[] { }).isEmpty());
+
+ assertTrue(geometryFactory.createPoint((Coordinate)null).isSimple());
+ assertTrue(geometryFactory.createLinearRing(new Coordinate[] { }).isSimple());
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// assertTrue(geometryFactory.createLineString(new Coordinate[] { }).isSimple());
+// assertTrue(geometryFactory.createPolygon(geometryFactory.createLinearRing(new Coordinate[] { }), new LinearRing[] { }).isSimple());
+// assertTrue(geometryFactory.createMultiPolygon(new Polygon[] { }).isSimple());
+// assertTrue(geometryFactory.createMultiLineString(new LineString[] { }).isSimple());
+// assertTrue(geometryFactory.createMultiPoint(new Point[] { }).isSimple());
+
+ assertTrue(geometryFactory.createPoint((Coordinate)null).getBoundary().isEmpty());
+ assertTrue(geometryFactory.createLinearRing(new Coordinate[] { }).getBoundary().isEmpty());
+ assertTrue(geometryFactory.createLineString(new Coordinate[] { }).getBoundary().isEmpty());
+ assertTrue(geometryFactory.createPolygon(geometryFactory.createLinearRing(new Coordinate[] { }), new LinearRing[] { }).getBoundary().isEmpty());
+ assertTrue(geometryFactory.createMultiPolygon(new Polygon[] { }).getBoundary().isEmpty());
+ assertTrue(geometryFactory.createMultiLineString(new LineString[] { }).getBoundary().isEmpty());
+ assertTrue(geometryFactory.createMultiPoint(new Point[] { }).getBoundary().isEmpty());
+
+ assertTrue(geometryFactory.createLinearRing((CoordinateSequence)null).isEmpty());
+ assertTrue(geometryFactory.createLineString((Coordinate[])null).isEmpty());
+ assertTrue(geometryFactory.createPolygon(null, null).isEmpty());
+ assertTrue(geometryFactory.createMultiPolygon(null).isEmpty());
+ assertTrue(geometryFactory.createMultiLineString(null).isEmpty());
+ assertTrue(geometryFactory.createMultiPoint((Point[]) null).isEmpty());
+
+ assertEquals(-1, (geometryFactory.createPoint((Coordinate)null)).getBoundaryDimension());
+ assertEquals(-1, (geometryFactory.createLinearRing((CoordinateSequence)null)).getBoundaryDimension());
+ assertEquals(0, (geometryFactory.createLineString((Coordinate[])null)).getBoundaryDimension());
+ assertEquals(1, (geometryFactory.createPolygon(null, null)).getBoundaryDimension());
+ assertEquals(1, (geometryFactory.createMultiPolygon(null)).getBoundaryDimension());
+ assertEquals(0, (geometryFactory.createMultiLineString(null)).getBoundaryDimension());
+ assertEquals(-1, (geometryFactory.createMultiPoint((Point[]) null)).getBoundaryDimension());
+
+ assertEquals(0, (geometryFactory.createPoint((Coordinate)null)).getNumPoints());
+ assertEquals(0, (geometryFactory.createLinearRing((CoordinateSequence)null)).getNumPoints());
+ assertEquals(0, (geometryFactory.createLineString((Coordinate[])null)).getNumPoints());
+ assertEquals(0, (geometryFactory.createPolygon(null, null)).getNumPoints());
+ assertEquals(0, (geometryFactory.createMultiPolygon(null)).getNumPoints());
+ assertEquals(0, (geometryFactory.createMultiLineString(null)).getNumPoints());
+ assertEquals(0, (geometryFactory.createMultiPoint((Point[]) null)).getNumPoints());
+
+ assertEquals(0, (geometryFactory.createPoint((Coordinate)null)).getCoordinates().length);
+ assertEquals(0, (geometryFactory.createLinearRing((CoordinateSequence)null)).getCoordinates().length);
+ assertEquals(0, (geometryFactory.createLineString((Coordinate[])null)).getCoordinates().length);
+ assertEquals(0, (geometryFactory.createPolygon(null, null)).getCoordinates().length);
+ assertEquals(0, (geometryFactory.createMultiPolygon(null)).getCoordinates().length);
+ assertEquals(0, (geometryFactory.createMultiLineString(null)).getCoordinates().length);
+ assertEquals(0, (geometryFactory.createMultiPoint((Point[]) null)).getCoordinates().length);
+ }
+
+ public void testBoundaryOfEmptyGeometry() throws Exception {
+ assertTrue(geometryFactory.createPoint((Coordinate)null).getBoundary().getClass() == GeometryCollection.class);
+ assertTrue(geometryFactory.createLinearRing(new Coordinate[] { }).getBoundary().getClass() == MultiPoint.class);
+ assertTrue(geometryFactory.createLineString(new Coordinate[] { }).getBoundary().getClass() == MultiPoint.class);
+ assertTrue(geometryFactory.createPolygon(geometryFactory.createLinearRing(new Coordinate[] { }), new LinearRing[] { }).getBoundary().getClass() == MultiLineString.class);
+ assertTrue(geometryFactory.createMultiPolygon(new Polygon[] { }).getBoundary().getClass() == MultiLineString.class);
+ assertTrue(geometryFactory.createMultiLineString(new LineString[] { }).getBoundary().getClass() == MultiPoint.class);
+ assertTrue(geometryFactory.createMultiPoint(new Point[] { }).getBoundary().getClass() == GeometryCollection.class);
+ try {
+ geometryFactory.createGeometryCollection(new Geometry[] { }).getBoundary();
+ assertTrue(false);
+ }
+ catch (IllegalArgumentException e) {
+ }
+ }
+
+ public void testToPointArray() {
+ ArrayList list = new ArrayList();
+ list.add(geometryFactory.createPoint(new Coordinate(0, 0)));
+ list.add(geometryFactory.createPoint(new Coordinate(10, 0)));
+ list.add(geometryFactory.createPoint(new Coordinate(10, 10)));
+ list.add(geometryFactory.createPoint(new Coordinate(0, 10)));
+ list.add(geometryFactory.createPoint(new Coordinate(0, 0)));
+ Point[] points = GeometryFactory.toPointArray(list);
+ assertEquals(10, points[1].getX(), 1E-1);
+ assertEquals(0, points[1].getY(), 1E-1);
+ }
+
+ public void testPolygonGetCoordinates() throws Exception {
+ Polygon p = (Polygon) reader.read(
+ "POLYGON ( (0 0, 100 0, 100 100, 0 100, 0 0), "
+ + " (20 20, 20 80, 80 80, 80 20, 20 20)) ");
+ Coordinate[] coordinates = p.getCoordinates();
+ assertEquals(10, p.getNumPoints());
+ assertEquals(10, coordinates.length);
+ assertEquals(new Coordinate(0, 0), coordinates[0]);
+ assertEquals(new Coordinate(20, 20), coordinates[9]);
+ }
+
+ public void testEmptyPoint() throws Exception {
+ Point p = geometryFactory.createPoint((Coordinate)null);
+ assertEquals(0, p.getDimension());
+ assertEquals(new Envelope(), p.getEnvelopeInternal());
+ assertTrue(p.isSimple());
+ try {
+ p.getX();
+ assertTrue(false);
+ }
+ catch (IllegalStateException e1) {
+ }
+ try {
+ p.getY();
+ assertTrue(false);
+ }
+ catch (IllegalStateException e2) {
+ }
+
+ assertEquals("POINT EMPTY", p.toString());
+ assertEquals("POINT EMPTY", p.toText());
+ }
+
+ public void testEmptyLineString() throws Exception {
+ LineString l = geometryFactory.createLineString((Coordinate[])null);
+ assertEquals(1, l.getDimension());
+ assertEquals(new Envelope(), l.getEnvelopeInternal());
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// assertTrue(l.isSimple());
+ assertEquals(null, l.getStartPoint());
+ assertEquals(null, l.getEndPoint());
+ assertTrue(! l.isClosed());
+ assertTrue(! l.isRing());
+ }
+
+ public void testEmptyLinearRing() throws Exception {
+ LineString l = geometryFactory.createLinearRing((CoordinateSequence)null);
+ assertEquals(1, l.getDimension());
+ assertEquals(new Envelope(), l.getEnvelopeInternal());
+ assertTrue(l.isSimple());
+ assertEquals(null, l.getStartPoint());
+ assertEquals(null, l.getEndPoint());
+ assertTrue(l.isClosed());
+ assertTrue(l.isRing());
+ }
+
+ public void testEmptyPolygon() throws Exception {
+ Polygon p = geometryFactory.createPolygon(null, null);
+ assertEquals(2, p.getDimension());
+ assertEquals(new Envelope(), p.getEnvelopeInternal());
+ assertTrue(p.isSimple());
+ }
+
+ public void testEmptyGeometryCollection() throws Exception {
+ GeometryCollection g = geometryFactory.createGeometryCollection(null);
+ assertEquals(-1, g.getDimension());
+ assertEquals(new Envelope(), g.getEnvelopeInternal());
+ assertTrue(g.isSimple());
+ }
+
+ public void testEmptyMultiPoint() throws Exception {
+ MultiPoint g = geometryFactory.createMultiPoint((Point[])null);
+ assertEquals(0, g.getDimension());
+ assertEquals(new Envelope(), g.getEnvelopeInternal());
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// assertTrue(g.isSimple());
+ }
+
+ public void testEmptyMultiLineString() throws Exception {
+ MultiLineString g = geometryFactory.createMultiLineString(null);
+ assertEquals(1, g.getDimension());
+ assertEquals(new Envelope(), g.getEnvelopeInternal());
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// assertTrue(g.isSimple());
+ assertTrue(! g.isClosed());
+ }
+
+ public void testEmptyMultiPolygon() throws Exception {
+ MultiPolygon g = geometryFactory.createMultiPolygon(null);
+ assertEquals(2, g.getDimension());
+ assertEquals(new Envelope(), g.getEnvelopeInternal());
+ assertTrue(g.isSimple());
+ }
+
+ public void testGetGeometryType() throws Exception {
+ GeometryCollection g = geometryFactory.createMultiPolygon(null);
+ assertEquals("MultiPolygon", g.getGeometryType());
+ }
+
+ public void testMultiPolygonIsSimple1() throws Exception {
+ Geometry g = reader.read("MULTIPOLYGON (((10 10, 10 20, 20 20, 20 15, 10 10)), ((60 60, 70 70, 80 60, 60 60)))");
+ assertTrue(g.isSimple());
+ }
+
+ public void testPointIsSimple() throws Exception {
+ Geometry g = reader.read("POINT (10 10)");
+ assertTrue(g.isSimple());
+ }
+
+ public void testPointGetBoundary() throws Exception {
+ Geometry g = reader.read("POINT (10 10)");
+ assertTrue(g.getBoundary().isEmpty());
+ }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testMultiPointIsSimple1() throws Exception {
+// Geometry g = reader.read("MULTIPOINT(10 10, 20 20, 30 30)");
+// assertTrue(g.isSimple());
+// }
+
+ public void testMultiPointGetBoundary() throws Exception {
+ Geometry g = reader.read("MULTIPOINT(10 10, 20 20, 30 30)");
+ assertTrue(g.getBoundary().isEmpty());
+ }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testMultiPointIsSimple2() throws Exception {
+// Geometry g = reader.read("MULTIPOINT(10 10, 30 30, 30 30)");
+// assertTrue(! g.isSimple());
+// }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testLineStringIsSimple1() throws Exception {
+// Geometry g = reader.read("LINESTRING(10 10, 20 10, 15 20)");
+// assertTrue(g.isSimple());
+// }
+
+ public void testLineStringGetBoundary1() throws Exception {
+ LineString g = (LineString) reader.read("LINESTRING(10 10, 20 10, 15 20)");
+ assertTrue(g.getBoundary() instanceof MultiPoint);
+ MultiPoint boundary = (MultiPoint) g.getBoundary();
+ assertTrue(boundary.getGeometryN(0).equals(g.getStartPoint()));
+ assertTrue(boundary.getGeometryN(1).equals(g.getEndPoint()));
+ }
+
+ public void testLineStringGetBoundary2() throws Exception {
+ LineString g = (LineString) reader.read("LINESTRING(10 10, 20 10, 15 20, 10 10)");
+ assertTrue(g.getBoundary().isEmpty());
+ }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testLineStringIsSimple2() throws Exception {
+// Geometry g = reader.read("LINESTRING(10 10, 20 10, 15 20, 15 0)");
+// assertTrue(! g.isSimple());
+// }
+
+ public void testLinearRingIsSimple() throws Exception {
+ Coordinate[] coordinates = { new Coordinate(10, 10, 0),
+ new Coordinate(10, 20, 0),
+ new Coordinate(20, 20, 0),
+ new Coordinate(20, 15, 0),
+ new Coordinate(10, 10, 0) };
+ LinearRing linearRing = geometryFactory.createLinearRing(coordinates);
+ assertTrue(linearRing.isSimple());
+ }
+
+ public void testPolygonIsSimple() throws Exception {
+ Geometry g = reader.read("POLYGON((10 10, 10 20, 202 0, 20 15, 10 10))");
+ assertTrue(g.isSimple());
+ }
+
+ public void testPolygonGetBoundary() throws Exception {
+ Geometry g = reader.read("POLYGON("
+ + "(0 0, 40 0, 40 40, 0 40, 0 0),"
+ + "(10 10, 30 10, 30 30, 10 30, 10 10))");
+ Geometry b = reader.read("MULTILINESTRING("
+ + "(0 0, 40 0, 40 40, 0 40, 0 0),"
+ + "(10 10, 30 10, 30 30, 10 30, 10 10))");
+ assertTrue(b.equalsExact(g.getBoundary()));
+ }
+
+ public void testMultiPolygonGetBoundary1() throws Exception {
+ Geometry g = reader.read("MULTIPOLYGON("
+ + "( (0 0, 40 0, 40 40, 0 40, 0 0),"
+ + " (10 10, 30 10, 30 30, 10 30, 10 10) ),"
+ + "( (200 200, 210 200, 210 210, 200 200) ) )");
+ Geometry b = reader.read("MULTILINESTRING("
+ + "(0 0, 40 0, 40 40, 0 40, 0 0),"
+ + "(10 10, 30 10, 30 30, 10 30, 10 10),"
+ + "(200 200, 210 200, 210 210, 200 200))");
+ assertTrue(b.equalsExact(g.getBoundary()));
+ }
+
+ public void testMultiPolygonIsSimple2() throws Exception {
+ Geometry g = reader.read("MULTIPOLYGON("
+ + "((10 10, 10 20, 20 20, 20 15, 10 10)), "
+ + "((60 60, 70 70, 80 60, 60 60)) )");
+ assertTrue(g.isSimple());
+ }
+
+// public void testGeometryCollectionIsSimple1() throws Exception {
+// Geometry g = reader.read("GEOMETRYCOLLECTION("
+// + "LINESTRING(0 0, 100 0),"
+// + "LINESTRING(0 10, 100 10))");
+// assertTrue(g.isSimple());
+// }
+
+// public void testGeometryCollectionIsSimple2() throws Exception {
+// Geometry g = reader.read("GEOMETRYCOLLECTION("
+// + "LINESTRING(0 0, 100 0),"
+// + "LINESTRING(50 0, 100 10))");
+// assertTrue(! g.isSimple());
+// }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testMultiLineStringIsSimple1() throws Exception {
+// Geometry g = reader.read("MULTILINESTRING("
+// + "(0 0, 100 0),"
+// + "(0 10, 100 10))");
+// assertTrue(g.isSimple());
+// }
+
+/**
+ * @todo Enable when #isSimple implemented
+ */
+// public void testMultiLineStringIsSimple2() throws Exception {
+// Geometry g = reader.read("MULTILINESTRING("
+// + "(0 0, 100 0),"
+// + "(50 0, 100 10))");
+// assertTrue(! g.isSimple());
+// }
+
+ public void testMultiLineStringGetBoundary1() throws Exception {
+ Geometry g = reader.read("MULTILINESTRING("
+ + "(0 0, 100 0, 50 50),"
+ + "(50 50, 50 -50))");
+ Geometry m = reader.read("MULTIPOINT(0 0, 50 -50)");
+ assertTrue(m.equalsExact(g.getBoundary()));
+ }
+
+ public void testMultiLineStringGetBoundary2() throws Exception {
+ Geometry g = reader.read("MULTILINESTRING("
+ + "(0 0, 100 0, 50 50),"
+ + "(50 50, 50 0))");
+ Geometry m = reader.read("MULTIPOINT(0 0, 50 0)");
+ assertTrue(m.equalsExact(g.getBoundary()));
+ }
+
+// public void testGeometryCollectionGetBoundary1() throws Exception {
+// Geometry g = reader.read("GEOMETRYCOLLECTION("
+// + "POLYGON((0 0, 100 0, 100 100, 0 100, 0 0)),"
+// + "LINESTRING(200 100, 200 0))");
+// Geometry b = reader.read("GEOMETRYCOLLECTION("
+// + "LINESTRING(0 0, 100 0, 100 100, 0 100, 0 0),"
+// + "LINESTRING(200 100, 200 0))");
+// assertEquals(b, g.getBoundary());
+// assertTrue(! g.equals(g.getBoundary()));
+// }
+
+// public void testGeometryCollectionGetBoundary2() throws Exception {
+// Geometry g = reader.read("GEOMETRYCOLLECTION("
+// + "POLYGON((0 0, 100 0, 100 100, 0 100, 0 0)),"
+// + "LINESTRING(50 50, 60 60))");
+// Geometry b = reader.read("GEOMETRYCOLLECTION("
+// + "LINESTRING(0 0, 100 0, 100 100, 0 100, 0 0))");
+// assertEquals(b, g.getBoundary());
+// }
+
+// public void testGeometryCollectionGetBoundary3() throws Exception {
+// Geometry g = reader.read("GEOMETRYCOLLECTION("
+// + "POLYGON((0 0, 100 0, 100 100, 0 100, 0 0)),"
+// + "LINESTRING(50 50, 150 50))");
+// Geometry b = reader.read("GEOMETRYCOLLECTION("
+// + "LINESTRING(0 0, 100 0, 100 100, 0 100, 0 0),"
+// + "POINT(150 50))");
+// assertEquals(b, g.getBoundary());
+// }
+
+ public void testCoordinateNaN() {
+ Coordinate c1 = new Coordinate();
+ assertTrue(! Double.isNaN(c1.x));
+ assertTrue(! Double.isNaN(c1.y));
+ assertTrue(Double.isNaN(c1.z));
+
+ Coordinate c2 = new Coordinate(3,4);
+ assertEquals(3,c2.x,1E-10);
+ assertEquals(4,c2.y,1E-10);
+ assertTrue(Double.isNaN(c2.z));
+
+ assertEquals(c1,c1);
+ assertEquals(c2,c2);
+ assertTrue(! c1.equals(c2));
+ assertEquals(new Coordinate(),new Coordinate(0,0));
+ assertEquals(new Coordinate(3,5),new Coordinate(3,5));
+ assertEquals(new Coordinate(3,5,Double.NaN),new Coordinate(3,5,Double.NaN));
+ assertTrue(new Coordinate(3,5,0).equals(new Coordinate(3,5,Double.NaN)));
+ }
+
+ public void testPredicatesReturnFalseForEmptyGeometries() {
+ Point p1 = new GeometryFactory().createPoint((Coordinate)null);
+ Point p2 = new GeometryFactory().createPoint(new Coordinate(5,5));
+ assertEquals(false, p1.equals(p2));
+ assertEquals(true, p1.disjoint(p2));
+ assertEquals(false, p1.intersects(p2));
+ assertEquals(false, p1.touches(p2));
+ assertEquals(false, p1.crosses(p2));
+ assertEquals(false, p1.within(p2));
+ assertEquals(false, p1.contains(p2));
+ assertEquals(false, p1.overlaps(p2));
+
+ assertEquals(false, p2.equals(p1));
+ assertEquals(true, p2.disjoint(p1));
+ assertEquals(false, p2.intersects(p1));
+ assertEquals(false, p2.touches(p1));
+ assertEquals(false, p2.crosses(p1));
+ assertEquals(false, p2.within(p1));
+ assertEquals(false, p2.contains(p1));
+ assertEquals(false, p2.overlaps(p1));
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/junit/MiscellaneousTest2.java b/modules/core/src/test/java/test/jts/junit/MiscellaneousTest2.java
new file mode 100644
index 0000000..16197eb
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/junit/MiscellaneousTest2.java
@@ -0,0 +1,161 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.junit;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.NonRobustCGAlgorithms;
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.algorithm.PointLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.planargraph.DirectedEdge;
+import org.locationtech.jts.planargraph.Node;
+import org.locationtech.jts.util.UniqueCoordinateArrayFilter;
+
+import junit.framework.TestCase;
+
+
+
+
+/**
+ * @version 1.7
+ */
+public class MiscellaneousTest2 extends TestCase {
+
+ PrecisionModel precisionModel = new PrecisionModel(1);
+ GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader reader = new WKTReader(geometryFactory);
+
+ public MiscellaneousTest2 (String Name_) {
+ super(Name_);
+ }
+
+ public void testCoordinateHash() {
+ doTestCoordinateHash(true, new Coordinate(1, 2), new Coordinate(1, 2));
+ doTestCoordinateHash(false, new Coordinate(1, 2), new Coordinate(3, 4));
+ doTestCoordinateHash(false, new Coordinate(1, 2), new Coordinate(1, 4));
+ doTestCoordinateHash(false, new Coordinate(1, 2), new Coordinate(3, 2));
+ doTestCoordinateHash(false, new Coordinate(1, 2), new Coordinate(2, 1));
+ }
+
+ private void doTestCoordinateHash(boolean equal, Coordinate a, Coordinate b) {
+ assertEquals(equal, a.equals(b));
+ assertEquals(equal, a.hashCode() == b.hashCode());
+ }
+
+ public static void main (String[] args) {
+ String[] testCaseName = {
+ MiscellaneousTest2.class.getName()
+ };
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ public void testZeroAreaPolygon() throws Exception {
+ Geometry g = reader.read(
+ "POLYGON((0 0, 0 0, 0 0, 0 0, 0 0))");
+ g.isValid();
+ assertTrue(true); //No exception thrown [Jon Aquino]
+ }
+
+ public void testLineStringIsValid() throws Exception {
+ Geometry g = reader.read(
+ "LINESTRING(0 0, 0 0)");
+ g.isValid();
+ assertTrue(true); //No exception thrown [Jon Aquino]
+ }
+
+ public void testUniqueCoordinateArrayFilter() throws Exception {
+ Geometry g = reader.read(
+ "MULTIPOINT(10 10, 20 20, 30 30, 20 20, 10 10)");
+ UniqueCoordinateArrayFilter f = new UniqueCoordinateArrayFilter();
+ g.apply(f);
+ assertEquals(3, f.getCoordinates().length);
+ assertEquals(new Coordinate(10, 10), f.getCoordinates()[0]);
+ assertEquals(new Coordinate(20, 20), f.getCoordinates()[1]);
+ assertEquals(new Coordinate(30, 30), f.getCoordinates()[2]);
+ }
+
+ public void testPointLocatorLinearRingLineString() throws Exception {
+ PointLocator pointLocator = new PointLocator();
+ Geometry gc = reader.read("GEOMETRYCOLLECTION( LINESTRING(0 0, 10 10), LINEARRING(10 10, 10 20, 20 10, 10 10))");
+ assertEquals(Location.BOUNDARY, pointLocator.locate(new Coordinate(10, 10), gc));
+ }
+
+ public void testPointLocator() throws Exception {
+ PointLocator pointLocator = new PointLocator();
+ Geometry polygon = reader.read("POLYGON ((70 340, 430 50, 70 50, 70 340))");
+ assertEquals(Location.EXTERIOR, pointLocator.locate(new Coordinate(420, 340), polygon));
+ assertEquals(Location.BOUNDARY, pointLocator.locate(new Coordinate(350, 50), polygon));
+ assertEquals(Location.BOUNDARY, pointLocator.locate(new Coordinate(410, 50), polygon));
+ assertEquals(Location.INTERIOR, pointLocator.locate(new Coordinate(190, 150), polygon));
+ }
+
+ public void testDirectedEdgeComparator() {
+ DirectedEdge d1 = new DirectedEdge(new Node(new Coordinate(0, 0)),
+ new Node(new Coordinate(10, 10)), new Coordinate(10, 10), true);
+ DirectedEdge d2 = new DirectedEdge(new Node(new Coordinate(0, 0)),
+ new Node(new Coordinate(20, 20)), new Coordinate(20, 20), false);
+ assertEquals(0, d2.compareTo(d1));
+ }
+
+ public void testDirectedEdgeToEdges() {
+ DirectedEdge d1 = new DirectedEdge(new Node(new Coordinate(0, 0)),
+ new Node(new Coordinate(10, 10)), new Coordinate(10, 10), true);
+ DirectedEdge d2 = new DirectedEdge(new Node(new Coordinate(20, 0)),
+ new Node(new Coordinate(20, 10)), new Coordinate(20, 10), false);
+ List edges = DirectedEdge.toEdges(Arrays.asList(new Object[]{d1, d2}));
+ assertEquals(2, edges.size());
+ assertNull(edges.get(0));
+ assertNull(edges.get(1));
+ }
+
+ public void testNoding() throws Exception {
+ Geometry a = reader.read("LINESTRING(0 0, 100 100)");
+ Geometry b = reader.read("LINESTRING(0 100, 100 0)");
+ List lineStrings = Arrays.asList(new Object[] {a, b});
+ Geometry nodedLineStrings = (LineString) lineStrings.get(0);
+ for (int i = 1; i < lineStrings.size(); i++) {
+ nodedLineStrings = nodedLineStrings.union((LineString)lineStrings.get(i));
+ }
+ assertEquals("MULTILINESTRING ((0 0, 50 50), (50 50, 100 100), (0 100, 50 50), (50 50, 100 0))", nodedLineStrings.toString());
+ }
+
+ public void testQuickPolygonUnion() throws Exception {
+ Geometry a = reader.read("POLYGON((0 0, 100 0, 100 100, 0 100, 0 0))");
+ Geometry b = reader.read("POLYGON((50 50, 150 50, 150 150, 50 150, 50 50))");
+ Geometry[] polygons = new Geometry[] {a, b};
+ GeometryCollection polygonCollection = new GeometryFactory().createGeometryCollection(polygons);
+ Geometry union = polygonCollection.buffer(0);
+ System.out.println(union);
+ assertEquals("POLYGON ((0 0, 0 100, 50 100, 50 150, 150 150, 150 50, 100 50, 100 0, 0 0))", union.toString());
+ }
+
+ public void testNoOutgoingDirEdgeFoundException() throws Exception {
+ Geometry a = new WKTReader().read("MULTIPOLYGON (((1668033.7441322226 575074.5372325261, 1668043.6526485088 575601.4901441064, 1668049.5076808596 575876.2262774946, 1668054.4619390026 576155.4662819218, 1668057.61464873 576428.4008668943, 1668059.8665842495 576711.2439681528, 1668063.9200681846 576991.3847467878, 1668071.576648951 577269.7239770072, 1668075.630132886 577547.1624330188, 1668077.8820684056 577825.5016632382, 1668081.935552341 578102.9401192497, 1668087.7905846918 578 [...]
+ Geometry b = new WKTReader().read("MULTIPOLYGON (((1665830.62 580116.54, 1665859.44 580115.84, 1666157.24 580108.56, 1666223.3 580107.1, 1666313 580105.12, 1666371.1 580103.62, 1666402 580102.78, 1666452.1 580101.42, 1666491.02 580100.36, 1666613.94 580097.02, 1666614.26 580097.02, 1666624 580096.74, 1666635.14 580096.42, 1666676.16 580095.28, 1666722.42 580093.94, 1666808.26 580091.44, 1666813.42 580091.3, 1666895.02 580088.78, 1666982.06 580086.1, 1667067.9 580083.46, 1667151.34 [...]
+ a.difference(b);
+ b.difference(a);
+ }
+
+}
+
+
+
diff --git a/modules/core/src/test/java/test/jts/junit/SimpleTest.java b/modules/core/src/test/java/test/jts/junit/SimpleTest.java
new file mode 100644
index 0000000..95af984
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/junit/SimpleTest.java
@@ -0,0 +1,36 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.junit;
+
+import junit.framework.TestCase;
+import junit.swingui.TestRunner;
+
+
+/**
+ * @version 1.7
+ */
+public class SimpleTest extends TestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(SimpleTest.class);
+ }
+
+ public SimpleTest(String name) { super(name); }
+
+ public void testThisIsATest() throws Exception {
+ assertTrue(true);
+ }
+
+}
+
diff --git a/modules/core/src/test/java/test/jts/perf/ExamplePerfTest.java b/modules/core/src/test/java/test/jts/perf/ExamplePerfTest.java
new file mode 100644
index 0000000..7b8727c
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/ExamplePerfTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf;
+
+/**
+ * An example of the usage of the {@PerformanceTestRunner}.
+ *
+ * @author Martin Davis
+ *
+ */
+public class ExamplePerfTest
+extends PerformanceTestCase
+{
+
+ public static void main(String args[]) {
+ PerformanceTestRunner.run(ExamplePerfTest.class);
+ }
+
+ public ExamplePerfTest(String name)
+ {
+ super(name);
+ setRunSize(new int[] { 5, 10, 20 });
+ setRunIterations(10);
+ }
+
+ public void setUp()
+ {
+ // read data and allocate resources here
+ }
+
+ public void startRun(int size)
+ {
+ System.out.println("Running with size " + size);
+ iter = 0;
+ }
+
+ private int iter = 0;
+
+ public void runTest1()
+ {
+ System.out.println("Test 1 : Iter # " + iter++);
+ // do test work here
+ }
+
+ public void runTest2()
+ {
+ System.out.println("Test 2 : Iter # " + iter++);
+ // do test work here
+ }
+
+ public void tearDown()
+ {
+ // deallocate resources here
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/PerformanceTestCase.java b/modules/core/src/test/java/test/jts/perf/PerformanceTestCase.java
new file mode 100644
index 0000000..a0a26fd
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/PerformanceTestCase.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf;
+
+/**
+ * A base class for classes implementing performance tests
+ * to be run by the {@link PerformanceTestRunner}.
+ * <p>
+ * In a subclass of this class,
+ * all public methods which start with <code>run</code> are
+ * executed as performance tests.
+ * <p>
+ * Multiple test runs with different run sizes may be made.
+ * Within each run, each <code>run</code> method is executed
+ * the specified number of iterations.
+ * The time to run the method is printed for each one.
+ *
+ * @author Martin Davis
+ *
+ */
+public abstract class PerformanceTestCase
+{
+ private String name;
+ private int[] runSize = new int[] { 1 };
+ private int runIter = 1;
+ private long[] runTime;
+
+ public PerformanceTestCase(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the size(s) for the runs of the test.
+ *
+ * @param runSize a list of the sizes for the test runs
+ */
+ protected void setRunSize(int[] runSize)
+ {
+ this.runSize = runSize;
+ runTime = new long[runSize.length];
+ }
+
+ public int[] getRunSize()
+ {
+ return runSize;
+ }
+
+ public long[] getRunTime()
+ {
+ return runTime;
+ }
+
+ /**
+ * Sets the number of iterations to execute the test methods in each test run.
+ *
+ * @param runIter the number of iterations to execute.
+ */
+ protected void setRunIterations(int runIter)
+ {
+ this.runIter = runIter;
+ }
+
+ public int getRunIterations()
+ {
+ return runIter;
+ }
+
+ /**
+ * Sets up any fixtures needed for the test runs.
+ *
+ * @throws Exception
+ */
+ public void setUp()
+ throws Exception
+ {
+
+ }
+
+ /**
+ * Starts a test run with the given size.
+ *
+ * @param size
+ * @throws Exception
+ */
+ public void startRun(int size)
+ throws Exception
+ {
+
+ }
+
+ /**
+ * Ends a test run.
+ *
+ * @throws Exception
+ */
+ public void endRun()
+ throws Exception
+ {
+
+ }
+
+ /**
+ * Tear down any fixtures made for the testing.
+ *
+ * @throws Exception
+ */
+ public void tearDown()
+ throws Exception
+ {
+
+ }
+
+ void setTime(int runNum, long time) {
+ runTime[runNum] = time;
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/PerformanceTestRunner.java b/modules/core/src/test/java/test/jts/perf/PerformanceTestRunner.java
new file mode 100644
index 0000000..89820f0
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/PerformanceTestRunner.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.util.Stopwatch;
+
+
+/**
+ * Runs {@link PerformanceTestCase} classes which contain performance tests.
+ *
+ *
+ *
+ * @author Martin Davis
+ *
+ */
+public class PerformanceTestRunner
+{
+ private static final String RUN_PREFIX = "run";
+
+ private static final String INIT_METHOD = "init";
+
+ public static void run(Class clz)
+ {
+ PerformanceTestRunner runner = new PerformanceTestRunner();
+ runner.runInternal(clz);
+ }
+
+ private PerformanceTestRunner()
+ {
+
+ }
+
+ private void runInternal(Class clz)
+ {
+ try {
+ Constructor ctor = clz.getConstructor(String.class);
+ PerformanceTestCase test = (PerformanceTestCase) ctor.newInstance("Name");
+ int[] runSize = test.getRunSize();
+ int runIter = test.getRunIterations();
+ Method[] runMethod = findMethods(clz, RUN_PREFIX);
+
+ // do the run
+ test.setUp();
+ for (int runNum = 0; runNum < runSize.length; runNum++)
+ {
+ int size = runSize[runNum];
+ test.startRun(size);
+ for (int i = 0; i < runMethod.length; i++) {
+ Stopwatch sw = new Stopwatch();
+ for (int iter = 0; iter < runIter; iter++) {
+ runMethod[i].invoke(test);
+ }
+ long time = sw.getTime();
+ System.out.println(runMethod[i].getName()
+ + " : " + sw.getTimeString());
+ test.setTime(runNum, time);
+ }
+ test.endRun();
+ }
+ test.tearDown();
+ }
+ catch (InvocationTargetException e) {
+ e.getTargetException().printStackTrace();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ private static Method[] findMethods(Class clz, String methodPrefix)
+ {
+ List runMeths = new ArrayList();
+ Method meth[] = clz.getDeclaredMethods();
+ for (int i = 0; i < meth.length; i++) {
+ if (meth[i].getName().startsWith(RUN_PREFIX)) {
+ runMeths.add(meth[i]);
+ }
+ }
+ return (Method[]) runMeths.toArray(new Method[0]);
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/ThreadTestCase.java b/modules/core/src/test/java/test/jts/perf/ThreadTestCase.java
new file mode 100644
index 0000000..6bce93e
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/ThreadTestCase.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf;
+
+/**
+ * Base class for test cases which depend on threading.
+ * A common example of usage is to test for race conditions.
+ *
+ * @author Martin Davis
+ *
+ */
+public abstract class ThreadTestCase
+{
+ public int getThreadCount()
+ {
+ return ThreadTestRunner.DEFAULT_THREAD_COUNT;
+
+ }
+ public abstract void setup();
+
+ public abstract Runnable getRunnable(int threadIndex);
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/ThreadTestRunner.java b/modules/core/src/test/java/test/jts/perf/ThreadTestRunner.java
new file mode 100644
index 0000000..9c06e0a
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/ThreadTestRunner.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf;
+
+/**
+ * Runs a {@link ThreadTestCase}.
+ *
+ * @author Martin Davis
+ *
+ */
+public class ThreadTestRunner
+{
+
+ public static final int DEFAULT_THREAD_COUNT = 10;
+
+ public static void run(ThreadTestCase testcase)
+ {
+ testcase.setup();
+
+ for (int i = 0; i < testcase.getThreadCount(); i++) {
+ Runnable runnable = testcase.getRunnable(i);
+ Thread t = new Thread(runnable);
+ t.start();
+ }
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/AreaPrecisionPerfTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/AreaPrecisionPerfTest.java
new file mode 100644
index 0000000..984e32a
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/AreaPrecisionPerfTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
+
+public class AreaPrecisionPerfTest
+{
+ public static void main(String[] args) throws Exception
+ {
+
+ double originX = 1000000;
+ double originY = 5000000;
+ long start = System.currentTimeMillis();
+
+ for (int nrVertices = 4; nrVertices <= 1000000; nrVertices *= 2) {
+ Coordinate[] coordinates = new Coordinate[nrVertices + 1];
+
+ Coordinate vertex;
+ for (int i = 0; i <= nrVertices; i++) {
+ vertex = new Coordinate(originX
+ + (1 + Math.sin((float) i / (float) nrVertices * 2 * Math.PI)),
+ originY
+ + (1 + Math.cos((float) i / (float) nrVertices * 2 * Math.PI)));
+ coordinates[i] = vertex;
+ }
+ // close ring
+ coordinates[nrVertices] = coordinates[0];
+
+ Geometry g1 = new GeometryFactory().createLinearRing(coordinates);
+ LinearRing[] holes = new LinearRing[] {};
+ Polygon polygon = (Polygon) new GeometryFactory().createPolygon(
+ (LinearRing) g1, holes);
+ System.out.println(polygon);
+
+ double area = originalSignedArea(coordinates);
+ double area2 = accurateSignedArea(coordinates);
+ double exactArea = 0.5 * nrVertices * Math.sin(2 * Math.PI / nrVertices);
+
+ double eps = exactArea - area;
+ double eps2 = exactArea - area2;
+
+ System.out.println(nrVertices + " orig err: " + eps
+ + " acc err: " + eps2);
+ }
+ System.out.println("Time: " + (System.currentTimeMillis() - start) / 1000.0);
+ }
+
+ public static double originalSignedArea(Coordinate[] ring)
+ {
+ if (ring.length < 3)
+ return 0.0;
+ double sum = 0.0;
+ for (int i = 0; i < ring.length - 1; i++) {
+ double bx = ring[i].x;
+ double by = ring[i].y;
+ double cx = ring[i + 1].x;
+ double cy = ring[i + 1].y;
+ sum += (bx + cx) * (cy - by);
+ }
+ return -sum / 2.0;
+ }
+
+ public static double accurateSignedArea(Coordinate[] ring)
+ {
+ if (ring.length < 3)
+ return 0.0;
+ double sum = 0.0;
+ // http://en.wikipedia.org/wiki/Shoelace_formula
+ double x0 = ring[0].x;
+ for (int i = 1; i < ring.length - 1; i++) {
+ double x = ring[i].x - x0;
+ double y1 = ring[i + 1].y;
+ double y2 = ring[i == 0 ? ring.length - 1 : i - 1].y;
+ sum += x * (y2 - y1);
+ }
+ return sum / 2.0;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/DDOrientationIndexAccuracyTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/DDOrientationIndexAccuracyTest.java
new file mode 100644
index 0000000..bd0d023
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/DDOrientationIndexAccuracyTest.java
@@ -0,0 +1,91 @@
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.math.DD;
+
+import junit.textui.TestRunner;
+import test.jts.GeometryTestCase;
+
+/**
+ * Test the accuracy of DD orientation index computation,
+ * using the built-in double value conversion and an experimental
+ * conversion approach with better decimal accuracy.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DDOrientationIndexAccuracyTest extends GeometryTestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(DDOrientationIndexAccuracyTest.class);
+ }
+
+ public DDOrientationIndexAccuracyTest(String name) {
+ super(name);
+ }
+
+ public void testRightTriangleForDeterminant() {
+ checkLine45(1, 100, 100);
+ }
+
+ private void checkLine45(int width, int nPts, double precision) {
+ Coordinate p1 = new Coordinate(0, width);
+ Coordinate p2 = new Coordinate(width, 0);
+ for (int i = 0; i <= nPts; i++) {
+ double d = width / (double) nPts;
+ Coordinate q = new Coordinate(0.0 + i * d, width - i * d);
+ PrecisionModel pm = new PrecisionModel(precision);
+ pm.makePrecise(q);
+ checkPointOnSeg(p1, p2, q);
+ }
+ }
+
+
+
+ private void checkPointOnSeg(Coordinate p1, Coordinate p2, Coordinate q) {
+ System.out.println(" Pt: " + WKTWriter.toPoint(q) + " seg: " + WKTWriter.toLineString(p1, p2)
+ + " --- DDstd = " + orientationDet(p1, p2, q, DD_STD)
+ + " --- DDdec = " + orientationDet(p1, p2, q, DD_DEC)
+ );
+ }
+
+ public static DD orientationDet(Coordinate p1, Coordinate p2, Coordinate q, DDConverter conv) {
+ // normalize coordinates
+ DD dx1 = conv.convert(p2.x).selfAdd(conv.convert(-p1.x));
+ DD dy1 = conv.convert(p2.y).selfAdd(conv.convert(-p1.y));
+ DD dx2 = conv.convert(q.x).selfAdd(conv.convert(-p2.x));
+ DD dy2 = conv.convert(q.y).selfAdd(conv.convert(-p2.y));
+
+ // sign of determinant - unrolled for performance
+ return dx1.selfMultiply(dy2).selfSubtract(dy1.selfMultiply(dx2));
+ }
+
+ private static final boolean USE_ACCURATE_CONVERSION = false;
+
+ private static DD convertToDD(double x) {
+ if (USE_ACCURATE_CONVERSION) {
+ // convert more accurately to DD from decimal representation
+ // very slow though - should be a better way
+ return DD.valueOf(x + "");
+ }
+
+ // current built-in conversion - introduces jitter
+ return DD.valueOf(x);
+ }
+
+ static interface DDConverter {
+ DD convert(double x);
+ }
+ static final DDConverter DD_STD = new DDConverter() {
+ public DD convert(double x) {
+ return DD.valueOf(x);
+ }
+ };
+ static final DDConverter DD_DEC = new DDConverter() {
+ public DD convert(double x) {
+ return DD.valueOf(x + "");
+ }
+ };
+}
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/DistanceLineLineStressTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/DistanceLineLineStressTest.java
new file mode 100644
index 0000000..74822ab
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/DistanceLineLineStressTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.algorithm;
+
+import java.util.Random;
+
+import org.locationtech.jts.algorithm.Distance;
+import org.locationtech.jts.geom.Coordinate;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+public class DistanceLineLineStressTest extends TestCase
+{
+
+ public static void main(String args[])
+ {
+ TestRunner.run(DistanceLineLineStressTest.class);
+ }
+
+ public DistanceLineLineStressTest(String name)
+ {
+ super(name);
+ }
+
+ public void testRandomDisjointCollinearSegments() throws Exception
+ {
+ int n = 1000000;
+ int failCount = 0;
+ for (int i = 0; i < n; i++) {
+ //System.out.println(i);
+ Coordinate[] seg = randomDisjointCollinearSegments();
+ if (0 == Distance.segmentToSegment(seg[0], seg[1], seg[2], seg[3])) {
+ /*
+ System.out.println("FAILED! - "
+ + WKTWriter.toLineString(seg[0], seg[1]) + " - "
+ + WKTWriter.toLineString(seg[2], seg[3]));
+ */
+ failCount++;
+ }
+ }
+ System.out.println("# failed = " + failCount + " out of " + n);
+ }
+
+ // make results reproducible
+ static Random randGen = new Random(123456);
+
+ private static Coordinate[] randomDisjointCollinearSegments()
+ {
+ double slope = randGen.nextDouble();
+ Coordinate[] seg = new Coordinate[4];
+
+ double gap = 1;
+ double x1 = 10;
+ double x2 = x1 + gap;
+ double x3 = x1 + gap + 10;
+ seg[0] = new Coordinate(0, 0);
+ seg[1] = new Coordinate(x1, slope * x1);
+ seg[2] = new Coordinate(x2, slope * x2);
+ seg[3] = new Coordinate(x3, slope * x3);
+
+ return seg;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/IndexedPointInAreaStressTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/IndexedPointInAreaStressTest.java
new file mode 100644
index 0000000..70dab08
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/IndexedPointInAreaStressTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.algorithm.PerturbedGridPolygonBuilder;
+import org.locationtech.jts.algorithm.locate.IndexedPointInAreaLocator;
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+public class IndexedPointInAreaStressTest extends TestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(IndexedPointInAreaStressTest.class);
+ }
+
+ PrecisionModel pmFixed_1 = new PrecisionModel(1.0);
+
+ public IndexedPointInAreaStressTest(String name) {
+ super(name);
+ }
+
+ public void testGrid()
+ {
+ // Use fixed PM to try and get at least some points hitting the boundary
+ GeometryFactory geomFactory = new GeometryFactory(pmFixed_1);
+// GeometryFactory geomFactory = new GeometryFactory();
+
+ PerturbedGridPolygonBuilder gridBuilder = new PerturbedGridPolygonBuilder(geomFactory);
+ gridBuilder.setNumLines(20);
+ gridBuilder.setLineWidth(10.0);
+ gridBuilder.setSeed(1185072199562L);
+ Geometry area = gridBuilder.getGeometry();
+
+// PointInAreaLocator pia = new IndexedPointInAreaLocator(area);
+ PointOnGeometryLocator pia = new IndexedPointInAreaLocator(area);
+
+ PointInAreaStressTester gridTester = new PointInAreaStressTester(geomFactory, area);
+ gridTester.setNumPoints(100000);
+ gridTester.setPIA(pia);
+
+ boolean isCorrect = gridTester.run();
+ assertTrue(isCorrect);
+ }
+}
+
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/MCIndexedPointInAreaLocator.java b/modules/core/src/test/java/test/jts/perf/algorithm/MCIndexedPointInAreaLocator.java
new file mode 100644
index 0000000..5207558
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/MCIndexedPointInAreaLocator.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.algorithm;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.RayCrossingCounter;
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.chain.MonotoneChain;
+import org.locationtech.jts.index.chain.MonotoneChainBuilder;
+import org.locationtech.jts.index.chain.MonotoneChainSelectAction;
+import org.locationtech.jts.index.strtree.STRtree;
+import org.locationtech.jts.noding.BasicSegmentString;
+import org.locationtech.jts.noding.SegmentString;
+
+
+/**
+ * Determines the location of {@link Coordinate}s relative to
+ * a {@link Polygonal} geometry, using indexing for efficiency.
+ * This algorithm is suitable for use in cases where
+ * many points will be tested against a given area.
+ *
+ * @author Martin Davis
+ *
+ */
+public class MCIndexedPointInAreaLocator
+ implements PointOnGeometryLocator
+{
+ private Geometry areaGeom;
+ private MCIndexedGeometry index;
+ private double maxXExtent;
+
+ public MCIndexedPointInAreaLocator(Geometry g)
+ {
+ areaGeom = g;
+ if (! (g instanceof Polygonal))
+ throw new IllegalArgumentException("Argument must be Polygonal");
+ buildIndex(g);
+ Envelope env = g.getEnvelopeInternal();
+ maxXExtent = env.getMaxX() + 1.0;
+ }
+
+ private void buildIndex(Geometry g)
+ {
+ index = new MCIndexedGeometry(g);
+ }
+
+ /**
+ * Determines the {@link Location} of a point in an areal {@link Geometry}.
+ *
+ * @param p the point to test
+ * @return the location of the point in the geometry
+ */
+ public int locate(Coordinate p)
+ {
+ RayCrossingCounter rcc = new RayCrossingCounter(p);
+ MCSegmentCounter mcSegCounter = new MCSegmentCounter(rcc);
+ Envelope rayEnv = new Envelope(p.x, maxXExtent, p.y, p.y);
+ List mcs = index.query(rayEnv);
+ countSegs(rcc, rayEnv, mcs, mcSegCounter);
+
+ return rcc.getLocation();
+ }
+
+ private void countSegs(RayCrossingCounter rcc, Envelope rayEnv, List monoChains, MCSegmentCounter mcSegCounter)
+ {
+ for (Iterator i = monoChains.iterator(); i.hasNext(); ) {
+ MonotoneChain mc = (MonotoneChain) i.next();
+ mc.select(rayEnv, mcSegCounter);
+ // short-circuit if possible
+ if (rcc.isOnSegment()) return;
+ }
+ }
+
+ static class MCSegmentCounter extends MonotoneChainSelectAction
+ {
+ RayCrossingCounter rcc;
+
+ public MCSegmentCounter(RayCrossingCounter rcc)
+ {
+ this.rcc = rcc;
+ }
+
+ public void select(LineSegment ls)
+ {
+ rcc.countSegment(ls.getCoordinate(0), ls.getCoordinate(1));
+ }
+ }
+
+}
+
+class MCIndexedGeometry
+{
+ private SpatialIndex index= new STRtree();
+
+ public MCIndexedGeometry(Geometry geom)
+ {
+ init(geom);
+ }
+
+ private void init(Geometry geom)
+ {
+ List lines = LinearComponentExtracter.getLines(geom);
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ Coordinate[] pts = line.getCoordinates();
+ addLine(pts);
+ }
+ }
+
+ private void addLine(Coordinate[] pts)
+ {
+ SegmentString segStr = new BasicSegmentString(pts, null);
+ List segChains = MonotoneChainBuilder.getChains(segStr.getCoordinates(), segStr);
+ for (Iterator i = segChains.iterator(); i.hasNext(); ) {
+ MonotoneChain mc = (MonotoneChain) i.next();
+ index.insert(mc.getEnvelope(), mc);
+ }
+ }
+
+ public List query(Envelope searchEnv)
+ {
+ return index.query(searchEnv);
+ }
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/MinimumBoundingCircleStressTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/MinimumBoundingCircleStressTest.java
new file mode 100644
index 0000000..9afb497
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/MinimumBoundingCircleStressTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.algorithm.MinimumBoundingCircle;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.util.Assert;
+
+public class MinimumBoundingCircleStressTest
+{
+ GeometryFactory geomFact = new GeometryFactory();
+
+ public static void main(String args[]) {
+ try {
+ (new MinimumBoundingCircleStressTest()).run();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ }
+
+ public MinimumBoundingCircleStressTest()
+ {
+
+ }
+
+ void run()
+ {
+ while (true) {
+ int n = (int) ( 10000 * Math.random());
+ run(n);
+ }
+ }
+
+ void run(int nPts)
+ {
+ Coordinate[] randPts = createRandomPoints(nPts);
+ Geometry mp = geomFact.createMultiPoint(randPts);
+ MinimumBoundingCircle mbc = new MinimumBoundingCircle(mp);
+ Coordinate centre = mbc.getCentre();
+ double radius = mbc.getRadius();
+ System.out.println("Testing " + nPts + " random points. Radius = " + radius);
+
+ checkWithinCircle(randPts, centre, radius, 0.0001);
+ }
+
+ void checkWithinCircle(Coordinate[] pts, Coordinate centre, double radius, double tolerance)
+ {
+ for (int i = 0; i < pts.length; i++ ) {
+ Coordinate p = pts[i];
+ double ptRadius = centre.distance(p);
+ double error = ptRadius - radius;
+ if (error > tolerance) {
+ Assert.shouldNeverReachHere();
+ }
+ }
+ }
+ Coordinate[] createRandomPoints(int n)
+ {
+ Coordinate[] pts = new Coordinate[n];
+ for(int i = 0; i < n; i++) {
+ double x = 100 * Math.random();
+ double y = 100 * Math.random();
+ pts[i] = new Coordinate(x, y);
+ }
+ return pts;
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaPerfTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaPerfTest.java
new file mode 100644
index 0000000..3ed6aa9
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaPerfTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.algorithm;
+
+
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.util.Stopwatch;
+
+public class PointInAreaPerfTest {
+
+ public static void main(String args[]) {
+ PointInAreaPerfTest test = new PointInAreaPerfTest();
+ test.run();
+ }
+
+ PrecisionModel pmFixed_1 = new PrecisionModel(1.0);
+
+ public PointInAreaPerfTest() {
+ }
+
+ public void run()
+ {
+ GeometryFactory geomFactory = new GeometryFactory();
+
+ SineStarFactory ssFact = new SineStarFactory();
+ ssFact.setSize(1000.0);
+ ssFact.setNumPoints(2000);
+ ssFact.setArmLengthRatio(0.1);
+ ssFact.setNumArms(100);
+
+ Geometry area = ssFact.createSineStar();
+ System.out.println(area);
+
+ Stopwatch sw = new Stopwatch();
+
+ PointOnGeometryLocator pia = new MCIndexedPointInAreaLocator(area);
+// PointInAreaLocator pia = new IntervalIndexedPointInAreaLocator(area);
+// PointInAreaLocator pia = new SimplePointInAreaLocator(area);
+
+ PointInAreaPerfTester perfTester = new PointInAreaPerfTester(geomFactory, area);
+ perfTester.setNumPoints(50000);
+ perfTester.setPIA(pia);
+ perfTester.run();
+
+ System.out.println("Overall time: " + sw.getTimeString());
+ }
+}
+
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaPerfTester.java b/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaPerfTester.java
new file mode 100644
index 0000000..cc578f6
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaPerfTester.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.util.Stopwatch;
+
+/**
+ * Creates a perturbed, buffered grid and tests a set
+ * of points against using two PointInArea classes.
+ *
+ * @author mbdavis
+ *
+ */
+public class PointInAreaPerfTester
+{
+ private GeometryFactory geomFactory;
+ private Geometry area;
+
+ private int numPts = 10000;
+ private PointOnGeometryLocator pia1;
+ private int[] locationCount = new int[3];
+
+ public PointInAreaPerfTester(GeometryFactory geomFactory, Geometry area)
+ {
+ this.geomFactory = geomFactory;
+ this.area = area;
+ }
+
+ public void setNumPoints(int numPoints)
+ {
+ this.numPts = numPoints;
+ }
+
+ public void setPIA(PointOnGeometryLocator pia)
+ {
+ this.pia1 = pia;
+ }
+
+ /**
+ *
+ * @return true if all point locations were computed correctly
+ */
+ public boolean run()
+ {
+ Stopwatch sw = new Stopwatch();
+
+ int ptGridWidth = (int) Math.sqrt(numPts);
+
+ Envelope areaEnv = area.getEnvelopeInternal();
+ double xStep = areaEnv.getWidth() / (ptGridWidth - 1);
+ double yStep = areaEnv.getHeight() / (ptGridWidth - 1);
+
+ for (int i = 0; i < ptGridWidth; i++) {
+ for (int j = 0; j < ptGridWidth; j++) {
+
+ // compute test point
+ double x = areaEnv.getMinX() + i * xStep;
+ double y = areaEnv.getMinY() + j * yStep;
+ Coordinate pt = new Coordinate(x, y);
+ geomFactory.getPrecisionModel().makePrecise(pt);
+
+ int loc = pia1.locate(pt);
+ locationCount[loc]++;
+ }
+ }
+ System.out.println("Test completed in " + sw.getTimeString());
+ printStats();
+ return true;
+ }
+
+ public void printStats()
+ {
+ System.out.println("Location counts: "
+ + " Boundary = " + locationCount[Location.BOUNDARY]
+ + " Interior = " + locationCount[Location.INTERIOR]
+ + " Exterior = " + locationCount[Location.EXTERIOR]
+ );
+ }
+
+
+}
+
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaStressTester.java b/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaStressTester.java
new file mode 100644
index 0000000..81f4bcb
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/PointInAreaStressTester.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.algorithm.locate.SimplePointInAreaLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.util.Stopwatch;
+
+/**
+ * Creates a perturbed, buffered grid and tests a set
+ * of points against using two PointInArea classes.
+ *
+ * @author mbdavis
+ *
+ */
+public class PointInAreaStressTester
+{
+ private GeometryFactory geomFactory;
+ private Geometry area;
+ private boolean ignoreBoundaryResults = true;
+
+ private int numPts = 10000;
+ private PointOnGeometryLocator pia1;
+ private PointOnGeometryLocator pia2;
+ private int[] locationCount = new int[3];
+
+ public PointInAreaStressTester(GeometryFactory geomFactory, Geometry area)
+ {
+ this.geomFactory = geomFactory;
+ this.area = area;
+
+ }
+
+ public void setNumPoints(int numPoints)
+ {
+ this.numPts = numPoints;
+ }
+
+
+ public void setPIA(PointOnGeometryLocator pia)
+ {
+ this.pia1 = pia;
+ }
+
+ public void setExpected(PointOnGeometryLocator pia)
+ {
+ this.pia2 = pia;
+ }
+
+ public void setIgnoreBoundaryResults(boolean ignoreBoundaryResults)
+ {
+ this.ignoreBoundaryResults = ignoreBoundaryResults;
+ }
+
+ /**
+ *
+ * @return true if all point locations were computed correctly
+ */
+ public boolean run()
+ {
+ Stopwatch sw = new Stopwatch();
+
+ // default is to use the simple, non-indexed tester
+ if (pia2 == null)
+ pia2 = new SimplePointInAreaLocator(area);
+
+
+ int ptGridWidth = (int) Math.sqrt(numPts);
+
+ Envelope areaEnv = area.getEnvelopeInternal();
+ double xStep = areaEnv.getWidth() / (ptGridWidth - 1);
+ double yStep = areaEnv.getHeight() / (ptGridWidth - 1);
+
+ for (int i = 0; i < ptGridWidth; i++) {
+ for (int j = 0; j < ptGridWidth; j++) {
+
+ // compute test point
+ double x = areaEnv.getMinX() + i * xStep;
+ double y = areaEnv.getMinY() + j * yStep;
+ Coordinate pt = new Coordinate(x, y);
+ geomFactory.getPrecisionModel().makePrecise(pt);
+
+ boolean isEqual = testPIA(pt);
+ if (! isEqual)
+ return false;
+ }
+ }
+ System.out.println("Test completed in " + sw.getTimeString());
+ printStats();
+ return true;
+ }
+
+ public void printStats()
+ {
+ System.out.println("Location counts: "
+ + " Boundary = " + locationCount[Location.BOUNDARY]
+ + " Interior = " + locationCount[Location.INTERIOR]
+ + " Exterior = " + locationCount[Location.EXTERIOR]
+ );
+ }
+ /**
+ *
+ * @param p
+ * @return true if the point location is determined to be the same by both PIA locators
+ */
+ private boolean testPIA(Coordinate p)
+ {
+ //System.out.println(WKTWriter.toPoint(p));
+
+ int loc1 = pia1.locate(p);
+ int loc2 = pia2.locate(p);
+
+ locationCount[loc1]++;
+
+ if ((loc1 == Location.BOUNDARY || loc2 == Location.BOUNDARY)
+ && ignoreBoundaryResults)
+ return true;
+
+ return loc1 == loc2;
+ }
+
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/PointInRingRobustnessTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/PointInRingRobustnessTest.java
new file mode 100644
index 0000000..3230a27
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/PointInRingRobustnessTest.java
@@ -0,0 +1,196 @@
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.algorithm.NonRobustRayCrossingCounter;
+import org.locationtech.jts.algorithm.Orientation;
+import org.locationtech.jts.algorithm.RayCrossingCounter;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.Location;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTWriter;
+
+import junit.textui.TestRunner;
+import test.jts.GeometryTestCase;
+
+/**
+ * Robustness test of Point-In-Ring algorithms.
+ * The input to each test is a triangle,
+ * and a point interpolated along the side.
+ * Almost always the point will not lie exactly on the side.
+ * The robustness test consists of comparing the result of computing Point-In-Ring and the result of
+ * determining the orientation of the point relative to the side.
+ * The test fails if these are not consistent.
+ * <p>
+ * The stress test reveals that the original {@link RayCrossingCounter}
+ * has inconsistencies with the
+ * {@link CGAlgorithmsDD#index(Coordinate, Coordinate, Coordinate)}
+ * orientation index computation
+ * (which is now the standard in JTS, due to its improved robustness).
+ * The {@link RayCrossingCounterDD} implementation is consistent,
+ * as expected.
+ * <p>
+ * Note that the inconsistency does not indicate which algorithm is
+ * "more correct" - just that they produce different results.
+ * However, it is highly likely that the original RCC algorithm
+ * is <b>not</b> as robust as RCCDD, since it uses a
+ * series of double-precision arithmetic operations.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PointInRingRobustnessTest extends GeometryTestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(PointInRingRobustnessTest.class);
+ }
+
+ private boolean isAllConsistent = true;
+ private int testCount;
+ private int failureCount;
+
+ public PointInRingRobustnessTest(String name) {
+ super(name);
+ }
+
+ public void init() {
+ testCount = 0;
+ failureCount = 0;
+ isAllConsistent = true;
+ }
+ public void testRightTriangles() {
+ init();
+ checkRightTriangles(200, 100, 1000);
+ System.out.println("Tests: " + testCount + " Failures: " + failureCount);
+ assertTrue(isAllConsistent);
+ }
+
+ public void XtestRandomTriangles() {
+ init();
+ checkRandomTriangles(1000, 100, 100);
+ System.out.println("Tests: " + testCount + " Failures: " + failureCount);
+ assertTrue(isAllConsistent);
+ }
+
+ private void checkRandomTriangles(int sideLen, int numTris, int numEdgePts) {
+ for (int i = 0; i < numTris; i++) {
+ Coordinate start = new Coordinate(randomInt(sideLen), randomInt(sideLen));
+ Coordinate[] triPts = new Coordinate[] {
+ start,
+ new Coordinate(randomInt(sideLen), randomInt(sideLen)),
+ new Coordinate(randomInt(sideLen), randomInt(sideLen)),
+ new Coordinate(start)
+ };
+ checkTriangleEdgePoints(triPts, numEdgePts);
+ }
+ }
+
+ private static int randomInt(int max) {
+ return (int) (Math.random() * max);
+ }
+
+ private void checkRightTriangles(double maxHeight, double width, int numEdgePts) {
+ for (int height = 0; height < maxHeight; height++) {
+ Coordinate[] triPts = new Coordinate[] {
+ new Coordinate(0,0),
+ new Coordinate(0, height),
+ new Coordinate(width, 0),
+ new Coordinate(0,0)
+ };
+ checkTriangleEdgePoints(triPts, numEdgePts);
+ }
+ }
+
+ public void checkTriangleEdgePoints(Coordinate[] triPts, int numEdgePts) {
+ for (int i = 0; i < numEdgePts; i++) {
+ double lenFrac = i / (double) (numEdgePts + 1);
+ checkTriangleConsistent(triPts, lenFrac);
+ }
+ }
+
+ boolean checkTriangleConsistent(Coordinate[] triPts, double lenFraction) {
+ testCount++;
+
+ LineSegment seg = new LineSegment(triPts[1], triPts[2]);
+ Coordinate pt = seg.pointAlong(lenFraction);
+
+ //boolean isPointInRing = CGAlgorithms.isPointInRing(pt, triPts);
+ //boolean isPointInRing = pointInRingWindingNumber(pt, triPts);
+ //boolean isPointInRing = Location.INTERIOR == RayCrossingCounter.locatePointInRing(pt, triPts);
+ boolean isPointInRing = Location.INTERIOR == NonRobustRayCrossingCounter.locatePointInRing(pt, triPts);
+
+ int orientation = Orientation.index(triPts[1], triPts[2], pt);
+ if (Orientation.isCCW(triPts)) {
+ orientation = -orientation;
+ }
+
+ // if collinear can't determine a failure
+ if (orientation == Orientation.COLLINEAR) return true;
+
+ boolean bothOutside = ! isPointInRing && orientation == Orientation.LEFT;
+ boolean bothInside = isPointInRing && orientation == Orientation.RIGHT;
+ boolean isConsistent = bothOutside || bothInside;
+
+ if (! isConsistent) {
+ isAllConsistent = false;
+ failureCount++;
+ System.out.println("Inconsistent: "
+ + "PIR=" + isPointInRing + " Orient=" + orientation
+ + " Pt: " + WKTWriter.toPoint(pt)
+ + " seg: " + WKTWriter.toLineString(triPts[1], triPts[2])
+ + " tri: " + toPolygon(triPts) );
+ }
+ return isConsistent;
+ }
+
+ public static String toPolygon(Coordinate[] coord)
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("POLYGON ");
+ if (coord.length == 0)
+ buf.append(" EMPTY");
+ else {
+ buf.append("((");
+ for (int i = 0; i < coord.length; i++) {
+ if (i > 0)
+ buf.append(", ");
+ buf.append(coord[i].x + " " + coord[i].y );
+ }
+ buf.append("))");
+ }
+ return buf.toString();
+ }
+
+ /**
+ * Winding Number algorithm included for comparison purposes.
+ * This is almost equivalent to the RayCrossing algorithm,
+ * except that it checks all crossing segments
+ * instead of just the ones to the right of the point.
+ * <p>
+ * This produces the same results as CGAlgorithmsDD
+ *
+ * @param p point to test
+ * @param ring coordinates of ring (with same first and last point)
+ * @return true if the point lies inside the ring
+ */
+ private static boolean pointInRingWindingNumber(Coordinate p, Coordinate[] ring) {
+ int winding = 0; // the winding number counter
+
+ int n = ring.length;
+
+ for (int i = 0; i < n-1; i++) {
+ if (ring[i].y <= p.y) {
+ // detect an upward crossing
+ if (ring[i + 1].y > p.y) {
+ if (Orientation.LEFT == Orientation.index(ring[i], ring[i + 1], p))
+ winding++;
+ }
+ } else {
+ // detect a downward crossing
+ if (ring[i + 1].y <= p.y)
+ if (Orientation.RIGHT == Orientation.index(ring[i], ring[i + 1], p))
+ winding--;
+ }
+ }
+ return winding != 0;
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/RectangleLineIntersectorPerfTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/RectangleLineIntersectorPerfTest.java
new file mode 100644
index 0000000..9fdefdd
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/RectangleLineIntersectorPerfTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.algorithm.LineIntersector;
+import org.locationtech.jts.algorithm.RectangleLineIntersector;
+import org.locationtech.jts.algorithm.RobustLineIntersector;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.util.Stopwatch;
+
+public class RectangleLineIntersectorPerfTest
+{
+ public static void main(String[] args) {
+ RectangleLineIntersectorPerfTest test = new RectangleLineIntersectorPerfTest();
+ test.runBoth(5);
+ test.runBoth(30);
+ test.runBoth(30);
+ test.runBoth(100);
+ test.runBoth(300);
+ test.runBoth(600);
+ test.runBoth(1000);
+ test.runBoth(6000);
+ }
+
+ private GeometryFactory geomFact = new GeometryFactory();
+
+ private double baseX = 0;
+ private double baseY = 0;
+ private double rectSize = 100;
+ private int numPts = 1000;
+ private Envelope rectEnv;
+ private Coordinate[] pts;
+
+ public RectangleLineIntersectorPerfTest()
+ {
+
+ }
+
+ public void init(int nPts)
+ {
+ rectEnv = createRectangle();
+ pts = createTestPoints(nPts);
+ }
+
+ public void runBoth(int nPts)
+ {
+ init(nPts);
+ run(true, false);
+ run(false, true);
+ }
+
+ public void run(boolean useSegInt, boolean useSideInt)
+ {
+ if (useSegInt) System.out.println("Using Segment Intersector");
+ if (useSideInt) System.out.println("Using Side Intersector");
+ System.out.println("# pts: " + pts.length);
+
+ RectangleLineIntersector rectSegIntersector = new RectangleLineIntersector(rectEnv);
+ SimpleRectangleIntersector rectSideIntersector = new SimpleRectangleIntersector(rectEnv);
+
+ Stopwatch sw = new Stopwatch();
+
+ for (int i = 0; i < pts.length; i++) {
+ for (int j = 0; j < pts.length; j++) {
+ if (i == j) continue;
+
+ boolean segResult = false;
+ if (useSegInt)
+ segResult = rectSegIntersector.intersects(pts[i], pts[j]);
+ boolean sideResult = false;
+ if (useSideInt)
+ sideResult = rectSideIntersector.intersects(pts[i], pts[j]);
+
+ if (useSegInt && useSideInt)
+ {
+ if (segResult != sideResult)
+ throw new IllegalStateException("Seg and Side values do not match");
+ }
+ }
+ }
+
+ System.out.println("Finished in " + sw.getTimeString());
+ System.out.println();
+ }
+
+ private Coordinate[] createTestPoints(int nPts)
+ {
+ Point pt = geomFact.createPoint(new Coordinate(baseX, baseY));
+ Geometry circle = pt.buffer(2 * rectSize, nPts/4);
+ return circle.getCoordinates();
+ }
+
+ private Envelope createRectangle()
+ {
+ Envelope rectEnv = new Envelope(
+ new Coordinate(baseX, baseY),
+ new Coordinate(baseX + rectSize, baseY + rectSize));
+ return rectEnv;
+ }
+
+}
+
+/**
+ * Tests intersection of a segment against a rectangle
+ * by computing intersection against all side segments.
+ *
+ * @author Martin Davis
+ *
+ */
+class SimpleRectangleIntersector
+{
+ // for intersection testing, don't need to set precision model
+ private LineIntersector li = new RobustLineIntersector();
+
+ private Envelope rectEnv;
+ /**
+ * The corners of the rectangle, in the order:
+ * 10
+ * 23
+ */
+ private Coordinate[] corner = new Coordinate[4];
+
+ public SimpleRectangleIntersector(Envelope rectEnv)
+ {
+ this.rectEnv = rectEnv;
+ initCorners(rectEnv);
+ }
+
+ private void initCorners(Envelope rectEnv)
+ {
+ corner[0] = new Coordinate(rectEnv.getMaxX(), rectEnv.getMaxY());
+ corner[1] = new Coordinate(rectEnv.getMinX(), rectEnv.getMaxY());
+ corner[2] = new Coordinate(rectEnv.getMinX(), rectEnv.getMinY());
+ corner[3] = new Coordinate(rectEnv.getMaxX(), rectEnv.getMinY());
+ }
+
+ public boolean intersects(Coordinate p0, Coordinate p1)
+ {
+ Envelope segEnv = new Envelope(p0, p1);
+ if (! rectEnv.intersects(segEnv))
+ return false;
+
+ li.computeIntersection(p0, p1, corner[0], corner[1]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[1], corner[2]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[2], corner[3]);
+ if (li.hasIntersection()) return true;
+ li.computeIntersection(p0, p1, corner[3], corner[0]);
+ if (li.hasIntersection()) return true;
+
+ return false;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/SimpleRayCrossingStressTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/SimpleRayCrossingStressTest.java
new file mode 100644
index 0000000..e0b079c
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/algorithm/SimpleRayCrossingStressTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.algorithm;
+
+import org.locationtech.jts.algorithm.PerturbedGridPolygonBuilder;
+import org.locationtech.jts.algorithm.RayCrossingCounter;
+import org.locationtech.jts.algorithm.locate.PointOnGeometryLocator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFilter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+
+
+public class SimpleRayCrossingStressTest extends TestCase {
+
+ public static void main(String args[]) {
+ TestRunner.run(SimpleRayCrossingStressTest.class);
+ }
+
+ PrecisionModel pmFixed_1 = new PrecisionModel(1.0);
+
+ public SimpleRayCrossingStressTest(String name) {
+ super(name);
+ }
+
+ public void testGrid()
+ {
+ // Use fixed PM to try and get at least some points hitting the boundary
+ GeometryFactory geomFactory = new GeometryFactory(pmFixed_1);
+// GeometryFactory geomFactory = new GeometryFactory();
+
+ PerturbedGridPolygonBuilder gridBuilder = new PerturbedGridPolygonBuilder(geomFactory);
+ gridBuilder.setNumLines(20);
+ gridBuilder.setLineWidth(10.0);
+ Geometry area = gridBuilder.getGeometry();
+
+ SimpleRayCrossingPointInAreaLocator pia = new SimpleRayCrossingPointInAreaLocator(area);
+
+ PointInAreaStressTester gridTester = new PointInAreaStressTester(geomFactory, area);
+ gridTester.setNumPoints(100000);
+ gridTester.setPIA(pia);
+
+ boolean isCorrect = gridTester.run();
+ assertTrue(isCorrect);
+ }
+
+ static class SimpleRayCrossingPointInAreaLocator
+ implements PointOnGeometryLocator
+ {
+ private Geometry geom;
+
+ public SimpleRayCrossingPointInAreaLocator(Geometry geom)
+ {
+ this.geom = geom;
+ }
+
+ public int locate(Coordinate p)
+ {
+ RayCrossingCounter rcc = new RayCrossingCounter(p);
+ RayCrossingSegmentFilter filter = new RayCrossingSegmentFilter(rcc);
+ geom.apply(filter);
+ return rcc.getLocation();
+ }
+
+ static class RayCrossingSegmentFilter implements CoordinateSequenceFilter
+ {
+ private RayCrossingCounter rcc;
+ private Coordinate p0 = new Coordinate();
+ private Coordinate p1 = new Coordinate();
+
+ public RayCrossingSegmentFilter(RayCrossingCounter rcc)
+ {
+ this.rcc = rcc;
+ }
+
+ public void filter(CoordinateSequence seq, int i)
+ {
+ if (i == 0) return;
+ seq.getCoordinate(i - 1, p0);
+ seq.getCoordinate(i, p1);
+ rcc.countSegment(p0, p1);
+ }
+
+ public boolean isDone() { return rcc.isOnSegment(); }
+
+ public boolean isGeometryChanged() { return false; }
+ }
+ }
+}
+
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/dissolve/LineDissolvePerfTest.java b/modules/core/src/test/java/test/jts/perf/dissolve/LineDissolvePerfTest.java
new file mode 100644
index 0000000..ff7e0fe
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/dissolve/LineDissolvePerfTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.dissolve;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.dissolve.LineDissolver;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.util.LinearComponentExtracter;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.operation.linemerge.LineMerger;
+import org.locationtech.jts.util.Memory;
+
+import test.jts.junit.GeometryUtils;
+import test.jts.perf.PerformanceTestCase;
+import test.jts.perf.PerformanceTestRunner;
+
+
+public class LineDissolvePerfTest extends PerformanceTestCase
+{
+ public static void main(String args[]) {
+ PerformanceTestRunner.run(LineDissolvePerfTest.class);
+ }
+
+ public LineDissolvePerfTest(String name) {
+ super(name);
+ setRunSize(new int[] {1, 2, 3, 4, 5});
+ setRunIterations(1);
+ }
+
+ Collection data;
+
+ public void setUp() throws IOException, ParseException
+ {
+ System.out.println("Loading data...");
+ data = GeometryUtils.readWKTFile("/Users/mdavis/myproj/jts/svn/jts-topo-suite/trunk/jts/testdata/world.wkt");
+ }
+
+ public void runDissolver_World()
+ {
+ LineDissolver dis = new LineDissolver();
+ dis.add(data);
+ Geometry result = dis.getResult();
+ System.out.println();
+ System.out.println(Memory.allString());
+ }
+
+ public void runBruteForce_World()
+ {
+ Geometry result = dissolveLines(data);
+ System.out.println(Memory.allString());
+ }
+
+ private Geometry dissolveLines(Collection lines) {
+ Geometry linesGeom = extractLines(lines);
+ return dissolveLines(linesGeom);
+ }
+
+ private Geometry dissolveLines(Geometry lines) {
+ Geometry dissolved = lines.union();
+ LineMerger merger = new LineMerger();
+ merger.add(dissolved);
+ Collection mergedColl = merger.getMergedLineStrings();
+ Geometry merged = lines.getFactory().buildGeometry(mergedColl);
+ return merged;
+ }
+
+ Geometry extractLines(Collection geoms)
+ {
+ GeometryFactory factory = null;
+ List lines = new ArrayList();
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ if (factory == null)
+ factory = g.getFactory();
+ lines.addAll(LinearComponentExtracter.getLines(g));
+ }
+ return factory.buildGeometry(geoms);
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/geom/impl/PackedCoordinateSequenceMemoryTest.java b/modules/core/src/test/java/test/jts/perf/geom/impl/PackedCoordinateSequenceMemoryTest.java
new file mode 100644
index 0000000..e16902d
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/geom/impl/PackedCoordinateSequenceMemoryTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.geom.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+public class PackedCoordinateSequenceMemoryTest
+{
+
+ public static void main(String args[]) {
+ PackedCoordinateSequenceMemoryTest test = new PackedCoordinateSequenceMemoryTest();
+ test.run();
+ }
+
+// PackedCoordinateSequenceFactory coordSeqFact = new PackedCoordinateSequenceFactory(PackedCoordinateSequenceFactory.DOUBLE, 2);
+ CoordinateArraySequenceFactory coordSeqFact = CoordinateArraySequenceFactory.instance();
+ GeometryFactory geomFact = new GeometryFactory(coordSeqFact);
+
+ PackedCoordinateSequenceMemoryTest()
+ {
+
+ }
+
+ static final int GEOMS = 1000;
+ static final int GEOM_SIZE = 1000;
+
+
+ void run()
+ {
+ runToMemoryOverflow();
+ }
+
+ void runToMemoryOverflow()
+ {
+ List geoms = new ArrayList();
+ while (true) {
+ geoms.add(createGeometry());
+ System.out.println(geoms.size());
+ }
+ }
+
+ Geometry createGeometry()
+ {
+ GeometricShapeFactory shapeFact = new GeometricShapeFactory(geomFact);
+ shapeFact.setSize(100.0);
+ shapeFact.setNumPoints(GEOM_SIZE);
+ return shapeFact.createCircle();
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedGeometryThreadSafeTest.java b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedGeometryThreadSafeTest.java
new file mode 100644
index 0000000..6bf9aa5
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedGeometryThreadSafeTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.geom.prep;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.prep.PreparedGeometry;
+import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
+import org.locationtech.jts.geom.util.SineStarFactory;
+
+import test.jts.perf.ThreadTestCase;
+import test.jts.perf.ThreadTestRunner;
+
+
+/**
+ * Tests for race conditions in the PreparedGeometry classes.
+ *
+ * @author Martin Davis
+ *
+ */
+public class PreparedGeometryThreadSafeTest extends ThreadTestCase
+{
+ public static void main(String[] args) {
+ ThreadTestRunner.run(new PreparedGeometryThreadSafeTest());
+ }
+
+ int nPts = 1000;
+ GeometryFactory factory = new GeometryFactory(new PrecisionModel(1.0));
+
+ protected PreparedGeometry pg;
+ protected Geometry g;
+
+ public PreparedGeometryThreadSafeTest()
+ {
+
+ }
+
+ public void setup()
+ {
+ Geometry sinePoly = createSineStar(new Coordinate(0, 0), 100000.0, nPts);
+ pg = PreparedGeometryFactory.prepare(sinePoly);
+ g = createSineStar(new Coordinate(10, 10), 100000.0, 100);
+ }
+
+ Geometry createSineStar(Coordinate origin, double size, int nPts) {
+ SineStarFactory gsf = new SineStarFactory(factory);
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ gsf.setArmLengthRatio(0.1);
+ gsf.setNumArms(20);
+ Geometry poly = gsf.createSineStar();
+ return poly;
+ }
+
+ @Override
+ public Runnable getRunnable(final int threadIndex)
+ {
+ return new Runnable() {
+
+ public void run()
+ {
+ while (true) {
+ System.out.println(threadIndex);
+ pg.intersects(g);
+ }
+ }
+
+ };
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedLineIntersectsPerfTest.java b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedLineIntersectsPerfTest.java
new file mode 100644
index 0000000..8704738
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedLineIntersectsPerfTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.geom.prep;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.prep.PreparedGeometry;
+import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
+import org.locationtech.jts.util.Stopwatch;
+
+
+public class PreparedLineIntersectsPerfTest
+{
+ static final int MAX_ITER = 1;
+
+ static final int NUM_AOI_PTS = 2000;
+ static final int NUM_LINES = 50000;
+ static final int NUM_LINE_PTS = 10;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+
+ TestDataBuilder builder = new TestDataBuilder();
+
+ Stopwatch sw = new Stopwatch();
+
+ public static void main(String[] args) {
+ PreparedLineIntersectsPerfTest test = new PreparedLineIntersectsPerfTest();
+ test.test();
+ }
+
+ boolean testFailed = false;
+
+ public PreparedLineIntersectsPerfTest() {
+ }
+
+ public void test()
+ {
+ test(5);
+ test(10);
+ test(500);
+ test(1000);
+ test(2000);
+ /*
+ test(100);
+ test(1000);
+ test(2000);
+ test(4000);
+ test(8000);
+ */
+ }
+
+ public void test(int nPts)
+ {
+ builder.setTestDimension(1);
+ Geometry target = builder.createSineStar(nPts).getBoundary();
+
+ List lines = builder.createTestGeoms(target.getEnvelopeInternal(),
+ NUM_LINES, 1.0, NUM_LINE_PTS);
+
+ System.out.println();
+ //System.out.println("Running with " + nPts + " points");
+ test(target, lines);
+ }
+
+ public void test(Geometry g, List lines)
+ {
+ System.out.println("AOI # pts: " + g.getNumPoints()
+ + " # lines: " + lines.size()
+ + " # pts in line: " + NUM_LINE_PTS
+ );
+
+ Stopwatch sw = new Stopwatch();
+ int count = 0;
+ for (int i = 0; i < MAX_ITER; i++)
+ {
+
+
+// count = testPrepGeomNotCached(g, lines);
+ count = testPrepGeomCached(g, lines);
+// count = testOriginal(g, lines);
+
+
+ }
+ System.out.println("Count of intersections = " + count);
+ System.out.println("Finished in " + sw.getTimeString());
+ }
+
+ public int testOriginal(Geometry g, List lines)
+ {
+ System.out.println("Using orginal JTS algorithm");
+ int count = 0;
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ if (g.intersects(line))
+ count++;
+ }
+ return count;
+ }
+
+ public int testPrepGeomCached(Geometry g, List lines)
+ {
+ System.out.println("Using cached Prepared Geometry");
+ PreparedGeometryFactory pgFact = new PreparedGeometryFactory();
+ PreparedGeometry prepGeom = pgFact.create(g);
+
+ int count = 0;
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+
+ if (prepGeom.intersects(line))
+ count++;
+ }
+ return count;
+ }
+
+ /**
+ * Tests using PreparedGeometry, but creating a new
+ * PreparedGeometry object each time.
+ * This tests whether there is a penalty for using
+ * the PG algorithm as a complete replacement for
+ * the original algorithm.
+ *
+ * @param g
+ * @param lines
+ * @return the count
+ */
+ public int testPrepGeomNotCached(Geometry g, List lines)
+ {
+ System.out.println("Using NON-CACHED Prepared Geometry");
+ PreparedGeometryFactory pgFact = new PreparedGeometryFactory();
+// PreparedGeometry prepGeom = pgFact.create(g);
+
+ int count = 0;
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+
+ // test performance of creating the prepared geometry each time
+ PreparedGeometry prepGeom = pgFact.create(g);
+
+ if (prepGeom.intersects(line))
+ count++;
+ }
+ return count;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedPolygonIntersectsPerfTest.java b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedPolygonIntersectsPerfTest.java
new file mode 100644
index 0000000..b13a323
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedPolygonIntersectsPerfTest.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.geom.prep;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.prep.PreparedGeometry;
+import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.GeometricShapeFactory;
+import org.locationtech.jts.util.Stopwatch;
+
+
+public class PreparedPolygonIntersectsPerfTest
+{
+ static final int MAX_ITER = 10;
+
+ static final int NUM_AOI_PTS = 2000;
+ static final int NUM_LINES = 10000;
+ static final int NUM_LINE_PTS = 100;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ Stopwatch sw = new Stopwatch();
+
+ public static void main(String[] args) {
+ PreparedPolygonIntersectsPerfTest test = new PreparedPolygonIntersectsPerfTest();
+ test.test();
+ }
+
+ boolean testFailed = false;
+
+ public PreparedPolygonIntersectsPerfTest() {
+ }
+
+ public void test()
+ {
+ test(5);
+ test(10);
+ test(500);
+ test(1000);
+ test(2000);
+ test(4000);
+ /*
+ test(4000);
+ test(8000);
+ */
+ }
+
+ public void test(int nPts)
+ {
+// Geometry poly = createCircle(new Coordinate(0, 0), 100, nPts);
+ Geometry sinePoly = createSineStar(new Coordinate(0, 0), 100, nPts);
+// System.out.println(poly);
+// Geometry target = sinePoly.getBoundary();
+ Geometry target = sinePoly;
+
+ List lines = createLines(target.getEnvelopeInternal(), NUM_LINES, 1.0, NUM_LINE_PTS);
+
+ System.out.println();
+ //System.out.println("Running with " + nPts + " points");
+ test(target, lines);
+ }
+
+ Geometry createCircle(Coordinate origin, double size, int nPts) {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createCircle();
+ // Polygon gRect = gsf.createRectangle();
+ // Geometry g = gRect.getExteriorRing();
+ return circle;
+ }
+
+ Geometry createSineStar(Coordinate origin, double size, int nPts) {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ gsf.setArmLengthRatio(0.1);
+ gsf.setNumArms(50);
+ Geometry poly = gsf.createSineStar();
+ return poly;
+ }
+
+ List createLines(Envelope env, int nItems, double size, int nPts)
+ {
+ int nCells = (int) Math.sqrt(nItems);
+
+ List geoms = new ArrayList();
+ double width = env.getWidth();
+ double xInc = width / nCells;
+ double yInc = width / nCells;
+ for (int i = 0; i < nCells; i++) {
+ for (int j = 0; j < nCells; j++) {
+ Coordinate base = new Coordinate(
+ env.getMinX() + i * xInc,
+ env.getMinY() + j * yInc);
+ Geometry line = createLine(base, size, nPts);
+ geoms.add(line);
+ }
+ }
+ return geoms;
+ }
+
+ Geometry createLine(Coordinate base, double size, int nPts)
+ {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(base);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createSineStar();
+// System.out.println(circle);
+ return circle.getBoundary();
+ }
+
+ public void test(Geometry g, List lines)
+ {
+ System.out.println("AOI # pts: " + g.getNumPoints()
+ + " # lines: " + lines.size()
+ + " # pts in line: " + NUM_LINE_PTS
+ );
+
+ Stopwatch sw = new Stopwatch();
+ int count = 0;
+ for (int i = 0; i < MAX_ITER; i++) {
+// count = testPrepGeomNotCached(i, g, lines);
+ count = testPrepGeomCached(i, g, lines);
+// count = testOriginal(i, g, lines);
+ }
+ System.out.println("Count of intersections = " + count);
+ System.out.println("Finished in " + sw.getTimeString());
+ }
+
+
+ public int testOriginal(int iter, Geometry g, List lines)
+ {
+ if (iter == 0) System.out.println("Using orginal JTS algorithm");
+ int count = 0;
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+ if (g.intersects(line))
+ count++;
+ }
+ return count;
+ }
+
+ public int testPrepGeomCached(int iter, Geometry g, List lines)
+ {
+ if (iter == 0) System.out.println("Using cached Prepared Geometry");
+ PreparedGeometryFactory pgFact = new PreparedGeometryFactory();
+ PreparedGeometry prepGeom = pgFact.create(g);
+
+ int count = 0;
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+
+ if (prepGeom.intersects(line))
+ count++;
+ }
+ return count;
+ }
+
+ /**
+ * Tests using PreparedGeometry, but creating a new
+ * PreparedGeometry object each time.
+ * This tests whether there is a penalty for using
+ * the PG algorithm as a complete replacement for
+ * the original algorithm.
+ *
+ * @param g
+ * @param lines
+ * @return the count
+ */
+ public int testPrepGeomNotCached(int iter, Geometry g, List lines)
+ {
+ if (iter == 0) System.out.println("Using NON-CACHED Prepared Geometry");
+ PreparedGeometryFactory pgFact = new PreparedGeometryFactory();
+// PreparedGeometry prepGeom = pgFact.create(g);
+
+ int count = 0;
+ for (Iterator i = lines.iterator(); i.hasNext(); ) {
+ LineString line = (LineString) i.next();
+
+ // test performance of creating the prepared geometry each time
+ PreparedGeometry prepGeom = pgFact.create(g);
+
+ if (prepGeom.intersects(line))
+ count++;
+ }
+ return count;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/geom/prep/TestDataBuilder.java b/modules/core/src/test/java/test/jts/perf/geom/prep/TestDataBuilder.java
new file mode 100644
index 0000000..6318962
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/geom/prep/TestDataBuilder.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.geom.prep;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+
+
+public class TestDataBuilder
+{
+ private GeometryFactory geomFact = new GeometryFactory();
+
+ private Coordinate origin = new Coordinate(0, 0);
+ private double size = 100.0;
+ private int testDim = 1;
+
+ public TestDataBuilder()
+ {
+
+ }
+
+ public TestDataBuilder(GeometryFactory geomFact)
+ {
+ this.geomFact = geomFact;
+ }
+
+ public void setExtent(Coordinate origin, double size)
+ {
+ this.origin = origin;
+ this.size = size;
+ }
+
+ public void setTestDimension(int testDim)
+ {
+ this.testDim = testDim;
+ }
+
+ public Geometry createCircle(int nPts) {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createCircle();
+ // Polygon gRect = gsf.createRectangle();
+ // Geometry g = gRect.getExteriorRing();
+ return circle;
+ }
+
+ public Geometry createSineStar(int nPts) {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ gsf.setArmLengthRatio(0.1);
+ gsf.setNumArms(20);
+ Geometry poly = gsf.createSineStar();
+ return poly;
+ }
+
+ public List createTestGeoms(Envelope env, int nItems, double size, int nPts)
+ {
+ int nCells = (int) Math.sqrt(nItems);
+
+ List geoms = new ArrayList();
+ double width = env.getWidth();
+ double xInc = width / nCells;
+ double yInc = width / nCells;
+ for (int i = 0; i < nCells; i++) {
+ for (int j = 0; j < nCells; j++) {
+ Coordinate base = new Coordinate(
+ env.getMinX() + i * xInc,
+ env.getMinY() + j * yInc);
+ Geometry line = createLine(base, size, nPts);
+ geoms.add(line);
+ }
+ }
+ return geoms;
+ }
+
+ Geometry createLine(Coordinate base, double size, int nPts)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(base);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ Geometry circle = gsf.createCircle();
+// System.out.println(circle);
+ return circle.getBoundary();
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/math/DDExpressionPerf.java b/modules/core/src/test/java/test/jts/perf/math/DDExpressionPerf.java
new file mode 100644
index 0000000..392edaa
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/math/DDExpressionPerf.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.math;
+
+import java.math.BigDecimal;
+
+import org.locationtech.jts.math.DD;
+import org.locationtech.jts.util.Stopwatch;
+
+
+/**
+ * Times evaluating floating-point expressions using
+ * various extended precision APIs.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DDExpressionPerf
+{
+
+ public static void main(String[] args) throws Exception
+ {
+ DDExpressionPerf test = new DDExpressionPerf();
+ test.run();
+ }
+
+ public DDExpressionPerf() { }
+
+ public void run() {
+ int n = 1000000;
+ double doubleTime = runDouble(n);
+ double ddTime = runDoubleDouble(n);
+ double ddSelfTime = runDoubleDoubleSelf(n);
+ double bigDecTime = runBigDecimal(n);
+
+ System.out.println("BigDecimal VS double performance factor = " + bigDecTime/doubleTime);
+ System.out.println("BigDecimal VS DD performance factor = " + bigDecTime/ddTime);
+
+ System.out.println("DD VS double performance factor = " + ddTime/doubleTime);
+ System.out.println("DD-Self VS double performance factor = " + ddSelfTime/doubleTime);
+
+ }
+
+ public double runDouble(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+ double a = 9.0;
+ double factor = 10.0;
+
+ double aMul = factor * a;
+ double aDiv = a / factor;
+
+ double det = a * a - aMul * aDiv;
+// System.out.println(det);
+ }
+ sw.stop();
+ System.out.println("double: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+
+
+ public double runBigDecimal(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+
+ BigDecimal a = (new BigDecimal(9.0)).setScale(20);
+ BigDecimal factor = (new BigDecimal(10.0)).setScale(20);
+ BigDecimal aMul = factor.multiply(a);
+ BigDecimal aDiv = a.divide(factor, BigDecimal.ROUND_HALF_UP);
+
+ BigDecimal det = a.multiply(a)
+ .subtract(aMul.multiply(aDiv));
+// System.out.println(aDiv);
+// System.out.println(det);
+ }
+ sw.stop();
+ System.out.println("BigDecimal: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+
+ public double runDoubleDouble(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+
+ DD a = new DD(9.0);
+ DD factor = new DD(10.0);
+ DD aMul = factor.multiply(a);
+ DD aDiv = a.divide(factor);
+
+ DD det = a.multiply(a)
+ .subtract(aMul.multiply(aDiv));
+// System.out.println(aDiv);
+// System.out.println(det);
+ }
+ sw.stop();
+ System.out.println("DD: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+
+ public double xrunDoubleDoubleSelf(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+
+ DD a = new DD(9.0);
+ DD factor = new DD(10.0);
+ DD aMul = factor.multiply(a);
+ DD aDiv = a.divide(factor);
+
+ DD det = a.multiply(a)
+ .subtract(aMul.multiply(aDiv));
+// System.out.println(aDiv);
+// System.out.println(det);
+ }
+ sw.stop();
+ System.out.println("DD: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+
+ //*
+ public double runDoubleDoubleSelf(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+
+ double a = 9.0;
+ double factor = 10.0;
+ DD c = new DD(9.0);
+ c.selfMultiply(factor);
+ DD b = new DD(9.0);
+ b.selfDivide(factor);
+
+ DD a2 = new DD(a);
+ a2.selfMultiply(a);
+ DD b2 = new DD(b);
+ b2.selfMultiply(c);
+ a2.selfDivide(b2);
+ DD det = a2;
+// System.out.println(aDiv);
+// System.out.println(det);
+ }
+ sw.stop();
+ System.out.println("DD-Self: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+ //*/
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/test/jts/perf/math/InCirclePerf.java b/modules/core/src/test/java/test/jts/perf/math/InCirclePerf.java
new file mode 100644
index 0000000..8a63049
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/math/InCirclePerf.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.math;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.util.Stopwatch;
+
+
+/**
+ * Test performance of evaluating Triangle predicate computations
+ * using
+ * various extended precision APIs.
+ *
+ * @author Martin Davis
+ *
+ */
+public class InCirclePerf
+{
+
+ public static void main(String[] args) throws Exception
+ {
+ InCirclePerf test = new InCirclePerf();
+ test.run();
+ }
+
+ public InCirclePerf() { }
+
+ Coordinate pa= new Coordinate(687958.05, 7460725.97);
+ Coordinate pb= new Coordinate(687957.43, 7460725.93);
+ Coordinate pc= new Coordinate(687957.58, 7460721);
+ Coordinate pp= new Coordinate(687958.13, 7460720.99);
+
+ public void run() {
+ System.out.println("InCircle perf");
+ int n = 1000000;
+ double doubleTime = runDouble(n);
+ double ddSelfTime = runDDSelf(n);
+ double ddSelf2Time = runDDSelf2(n);
+ double ddTime = runDD(n);
+// double ddSelfTime = runDoubleDoubleSelf(10000000);
+
+ System.out.println("DD VS double performance factor = " + ddTime/doubleTime);
+ System.out.println("DDSelf VS double performance factor = " + ddSelfTime/doubleTime);
+ System.out.println("DDSelf2 VS double performance factor = " + ddSelf2Time/doubleTime);
+ }
+
+ public double runDouble(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+ TriPredicate.isInCircle(pa, pb, pc, pp);
+ }
+ sw.stop();
+ System.out.println("double: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+
+ public double runDD(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+ TriPredicate.isInCircleDD(pa, pb, pc, pp);
+ }
+ sw.stop();
+ System.out.println("DD: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+
+ public double runDDSelf(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+ TriPredicate.isInCircleDD2(pa, pb, pc, pp);
+ }
+ sw.stop();
+ System.out.println("DD-Self: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+ public double runDDSelf2(int nIter)
+ {
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < nIter; i++) {
+ TriPredicate.isInCircleDD3(pa, pb, pc, pp);
+ }
+ sw.stop();
+ System.out.println("DD-Self2: nIter = " + nIter
+ + " time = " + sw.getTimeString());
+ return sw.getTime() / (double) nIter;
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/test/jts/perf/math/TriPredicate.java b/modules/core/src/test/java/test/jts/perf/math/TriPredicate.java
new file mode 100644
index 0000000..cfe21e5
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/math/TriPredicate.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.math;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Triangle;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.math.DD;
+
+/**
+ * Algorithms for computing values and predicates
+ * associated with triangles.
+ * For some algorithms extended-precision
+ * versions are provided, which are more robust
+ * (i.e. they produce correct answers in more cases).
+ * These are used in triangulation algorithms.
+ *
+ * @author Martin Davis
+ *
+ */
+public class TriPredicate
+{
+ /**
+ * Tests if a point is inside the circle defined by the points a, b, c.
+ * This test uses simple
+ * double-precision arithmetic, and thus may not be robust.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircle(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ boolean isInCircle =
+ (a.x * a.x + a.y * a.y) * triArea(b, c, p)
+ - (b.x * b.x + b.y * b.y) * triArea(a, c, p)
+ + (c.x * c.x + c.y * c.y) * triArea(a, b, p)
+ - (p.x * p.x + p.y * p.y) * triArea(a, b, c)
+ > 0;
+ return isInCircle;
+ }
+
+ /**
+ * Computes twice the area of the oriented triangle (a, b, c), i.e., the area is positive if the
+ * triangle is oriented counterclockwise.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ */
+ private static double triArea(Coordinate a, Coordinate b, Coordinate c) {
+ return (b.x - a.x) * (c.y - a.y)
+ - (b.y - a.y) * (c.x - a.x);
+ }
+
+ /**
+ * Tests if a point is inside the circle defined by the points a, b, c.
+ * This test uses robust computation.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleRobust(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p)
+ {
+ //checkRobustInCircle(a, b, c, p);
+ return isInCircleDD(a, b, c, p);
+ }
+
+ /**
+ * Tests if a point is inside the circle defined by the points a, b, c.
+ * The computation uses {@link DD} arithmetic for robustness.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleDD(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ DD px = new DD(p.x);
+ DD py = new DD(p.y);
+ DD ax = new DD(a.x);
+ DD ay = new DD(a.y);
+ DD bx = new DD(b.x);
+ DD by = new DD(b.y);
+ DD cx = new DD(c.x);
+ DD cy = new DD(c.y);
+
+ DD aTerm = (ax.multiply(ax).add(ay.multiply(ay)))
+ .multiply(triAreaDD(bx, by, cx, cy, px, py));
+ DD bTerm = (bx.multiply(bx).add(by.multiply(by)))
+ .multiply(triAreaDD(ax, ay, cx, cy, px, py));
+ DD cTerm = (cx.multiply(cx).add(cy.multiply(cy)))
+ .multiply(triAreaDD(ax, ay, bx, by, px, py));
+ DD pTerm = (px.multiply(px).add(py.multiply(py)))
+ .multiply(triAreaDD(ax, ay, bx, by, cx, cy));
+
+ DD sum = aTerm.subtract(bTerm).add(cTerm).subtract(pTerm);
+ boolean isInCircle = sum.doubleValue() > 0;
+
+ return isInCircle;
+ }
+ public static boolean isInCircleDD2(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ DD aTerm = (DD.sqr(a.x).selfAdd(DD.sqr(a.y)))
+ .selfMultiply(triAreaDD2(b, c, p));
+ DD bTerm = (DD.sqr(b.x).selfAdd(DD.sqr(b.y)))
+ .selfMultiply(triAreaDD2(a, c, p));
+ DD cTerm = (DD.sqr(c.x).selfAdd(DD.sqr(c.y)))
+ .selfMultiply(triAreaDD2(a, b, p));
+ DD pTerm = (DD.sqr(p.x).selfAdd(DD.sqr(p.y)))
+ .selfMultiply(triAreaDD2(a, b, c));
+
+ DD sum = aTerm.selfSubtract(bTerm).selfAdd(cTerm).selfSubtract(pTerm);
+ boolean isInCircle = sum.doubleValue() > 0;
+
+ return isInCircle;
+ }
+ public static boolean isInCircleDD3(
+ Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ DD adx = DD.valueOf(a.x).selfSubtract(p.x);
+ DD ady = DD.valueOf(a.y).selfSubtract(p.y);
+ DD bdx = DD.valueOf(b.x).selfSubtract(p.x);
+ DD bdy = DD.valueOf(b.y).selfSubtract(p.y);
+ DD cdx = DD.valueOf(c.x).selfSubtract(p.x);
+ DD cdy = DD.valueOf(c.y).selfSubtract(p.y);
+
+ DD abdet = adx.multiply(bdy).selfSubtract(bdx.multiply(ady));
+ DD bcdet = bdx.multiply(cdy).selfSubtract(cdx.multiply(bdy));
+ DD cadet = cdx.multiply(ady).selfSubtract(adx.multiply(cdy));
+ DD alift = adx.multiply(adx).selfSubtract(ady.multiply(ady));
+ DD blift = bdx.multiply(bdx).selfSubtract(bdy.multiply(bdy));
+ DD clift = cdx.multiply(cdx).selfSubtract(cdy.multiply(cdy));
+
+ DD sum = alift.selfMultiply(bcdet)
+ .selfAdd(blift.selfMultiply(cadet))
+ .selfAdd(clift.selfMultiply(abdet));
+
+ boolean isInCircle = sum.doubleValue() > 0;
+
+ return isInCircle;
+ }
+
+ /**
+ * Computes twice the area of the oriented triangle (a, b, c), i.e., the area
+ * is positive if the triangle is oriented counterclockwise.
+ * The computation uses {@link DD} arithmetic for robustness.
+ *
+ * @param ax the x ordinate of a vertex of the triangle
+ * @param ay the y ordinate of a vertex of the triangle
+ * @param bx the x ordinate of a vertex of the triangle
+ * @param by the y ordinate of a vertex of the triangle
+ * @param cx the x ordinate of a vertex of the triangle
+ * @param cy the y ordinate of a vertex of the triangle
+ */
+ public static DD triAreaDD(DD ax, DD ay,
+ DD bx, DD by, DD cx, DD cy) {
+ return (bx.subtract(ax).multiply(cy.subtract(ay)).subtract(by.subtract(ay)
+ .multiply(cx.subtract(ax))));
+ }
+
+ public static DD triAreaDD2(
+ Coordinate a, Coordinate b, Coordinate c) {
+
+ DD t1 = DD.valueOf(b.x).selfSubtract(a.x)
+ .selfMultiply(
+ DD.valueOf(c.y).selfSubtract(a.y));
+
+ DD t2 = DD.valueOf(b.y).selfSubtract(a.y)
+ .selfMultiply(
+ DD.valueOf(c.x).selfSubtract(a.x));
+
+ return t1.selfSubtract(t2);
+ }
+
+ /**
+ * Computes the inCircle test using distance from the circumcentre.
+ * Uses standard double-precision arithmetic.
+ * <p>
+ * In general this doesn't
+ * appear to be any more robust than the standard calculation. However, there
+ * is at least one case where the test point is far enough from the
+ * circumcircle that this test gives the correct answer.
+ * <pre>
+ * LINESTRING
+ * (1507029.9878 518325.7547, 1507022.1120341457 518332.8225183258,
+ * 1507029.9833 518325.7458, 1507029.9896965567 518325.744909031)
+ * </pre>
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ * @return true if this point is inside the circle defined by the points a, b, c
+ */
+ public static boolean isInCircleCC(Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p) {
+ Coordinate cc = Triangle.circumcentre(a, b, c);
+ double ccRadius = a.distance(cc);
+ double pRadiusDiff = p.distance(cc) - ccRadius;
+ return pRadiusDiff <= 0;
+ }
+
+ /**
+ * Checks if the computed value for isInCircle is correct, using
+ * double-double precision arithmetic.
+ *
+ * @param a a vertex of the triangle
+ * @param b a vertex of the triangle
+ * @param c a vertex of the triangle
+ * @param p the point to test
+ */
+private static void checkRobustInCircle(Coordinate a, Coordinate b, Coordinate c,
+ Coordinate p)
+{
+ boolean nonRobustInCircle = isInCircle(a, b, c, p);
+ boolean isInCircleDD = TriPredicate.isInCircleDD(a, b, c, p);
+ boolean isInCircleCC = TriPredicate.isInCircleCC(a, b, c, p);
+
+ Coordinate circumCentre = Triangle.circumcentre(a, b, c);
+ System.out.println("p radius diff a = "
+ + Math.abs(p.distance(circumCentre) - a.distance(circumCentre))
+ / a.distance(circumCentre));
+
+ if (nonRobustInCircle != isInCircleDD || nonRobustInCircle != isInCircleCC) {
+ System.out.println("inCircle robustness failure (double result = "
+ + nonRobustInCircle
+ + ", DD result = " + isInCircleDD
+ + ", CC result = " + isInCircleCC + ")");
+ System.out.println(WKTWriter.toLineString(new CoordinateArraySequence(
+ new Coordinate[] { a, b, c, p })));
+ System.out.println("Circumcentre = " + WKTWriter.toPoint(circumCentre)
+ + " radius = " + a.distance(circumCentre));
+ System.out.println("p radius diff a = "
+ + Math.abs(p.distance(circumCentre)/a.distance(circumCentre) - 1));
+ System.out.println("p radius diff b = "
+ + Math.abs(p.distance(circumCentre)/b.distance(circumCentre) - 1));
+ System.out.println("p radius diff c = "
+ + Math.abs(p.distance(circumCentre)/c.distance(circumCentre) - 1));
+ System.out.println();
+ }
+}
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/BufferCorrectnessTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/BufferCorrectnessTest.java
new file mode 100644
index 0000000..08a8477
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/BufferCorrectnessTest.java
@@ -0,0 +1,138 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.buffer;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.operation.buffer.BufferOp;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+/**
+ * Tests self-snapping issues
+ *
+ * @version 1.7
+ */
+public class BufferCorrectnessTest
+{
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader rdr = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ try {
+ (new BufferCorrectnessTest()).run7();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ }
+
+ public BufferCorrectnessTest() { }
+
+ void run7()
+ throws Exception
+ {
+ // buffer fails
+ String wkt = "MULTILINESTRING ((1335558.59524 631743.01449, 1335572.28215 631775.89056, 1335573.2578018496 631782.1915185435), (1335573.2578018496 631782.1915185435, 1335576.62035 631803.90754), (1335573.2578018496 631782.1915185435, 1335580.70187 631802.08139))";
+ Geometry g = rdr.read(wkt);
+ Geometry buf = g.buffer(15);
+ System.out.println(buf);
+ };
+
+ void run6()
+ throws Exception
+ {
+ // polygon with two vertices very close - mitred negative buffer lies outside input
+ String wkt = "POLYGON ((589081.1515112884 4518509.334764771, 589103.7370954598 4518497.015419995, 589099.8017397423 4518490.719003885, 589097.1198886324 4518486.20858194, 589090.9424687021 4518475.819013388, 589081.1515112884 4518509.334764771))";
+ Geometry g = rdr.read(wkt);
+
+ BufferParameters params = new BufferParameters(8, BufferParameters.CAP_ROUND, BufferParameters.JOIN_MITRE, 5);
+ Geometry buf = new BufferOp(g, params).getResultGeometry(-5);
+
+ System.out.println(buf);
+ };
+
+ void run5()
+ throws Exception
+ {
+ // polygon with two vertices very close - mitred negative buffer lies outside input
+ String wkt = "POLYGON ((588722.7612465625 4518964.956739423, 588755.2073151038 4518948.2420851765, 588750.2892019567 4518938.490656119, 588750.2892047082 4518938.490654858, 588741.1098934844 4518920.290260831, 588722.7612465625 4518964.956739423))";
+ Geometry g = rdr.read(wkt);
+
+ BufferParameters params = new BufferParameters(8, BufferParameters.CAP_ROUND, BufferParameters.JOIN_MITRE, 5);
+ Geometry buf = new BufferOp(g, params).getResultGeometry(-5);
+
+ System.out.println(buf);
+ };
+
+ void run4()
+ throws Exception
+ {
+// String wkt = "LINESTRING (1872699.676 530329.155, 1872712.232 530255.793, 1872724.601 530183.526, 1872737.157 530110.164, 1872749.713 530036.802, 1872762.082 529964.535, 1872774.638 529891.173, 1872787.194 529817.811, 1872799.563 529745.545, 1872812.119 529672.183, 1872824.675 529598.821, 1872837.044 529526.555, 1872849.6 529453.194, 1872862.156 529379.832, 1872874.524 529307.566, 1872887.08 529234.205, 1872899.636 529160.844, 1872912.005 529088.578, 1872924.561 529015.217, 1872937. [...]
+// String wkt = "LINESTRING(1872762.082 529964.535, 1872774.638 529891.173, 1872787.194 529817.811)";
+ String wkt = "LINESTRING (1872612.157 530840.503, 1872624.713 530767.14, 1872637.269 530693.777)";
+ Geometry g = rdr.read(wkt);
+
+ BufferParameters params = new BufferParameters(10, BufferParameters.CAP_SQUARE, BufferParameters.JOIN_MITRE, 10);
+ Geometry buf = new BufferOp(g, params).getResultGeometry(200);
+
+
+ System.out.println(buf);
+ };
+
+ void run3()
+ throws Exception
+ {
+ String wkt = "MULTILINESTRING ((1335558.59524 631743.01449, 1335572.28215 631775.89056, 1335573.2578018496 631782.1915185435), (1335573.2578018496 631782.1915185435, 1335576.62035 631803.90754), (1335558.59524 631743.01449, 1335573.2578018496 631782.1915185435), (1335573.2578018496 631782.1915185435, 1335580.70187 631802.08139))";
+ Geometry g = rdr.read(wkt);
+ Geometry buf = g.buffer(15);
+ System.out.println(buf);
+ };
+
+ void run2()
+ throws Exception
+ {
+ String wkt = "POLYGON ((-2531.310546875 -17.19328498840332, -2518.694580078125 -27.471830368041992, -2564.515869140625 -44.53504943847656, -2531.310546875 -17.19328498840332))";
+ Geometry g = rdr.read(wkt);
+ Geometry buf = g.buffer(1.0, 1);
+ System.out.println(buf);
+ }
+
+ void run()
+ throws Exception
+ {
+ doBuffer("LINESTRING (110 320, 280 290, 170 150)", 20.0, -1);
+// doBuffer("LINESTRING (10 0, 0 0, 10 1)");
+ };
+
+ void doBuffer(String wkt, double dist)
+ throws Exception
+ {
+ Geometry g = rdr.read(wkt);
+ Geometry buf = g.buffer(dist, -4);
+ System.out.println(buf);
+ };
+
+ void doBuffer(String wkt, double dist, int quadSegs)
+ throws Exception
+ {
+ Geometry g = rdr.read(wkt);
+ Geometry buf = g.buffer(dist, quadSegs);
+ System.out.println(buf);
+ };
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/DepthSegmentStressTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/DepthSegmentStressTest.java
new file mode 100644
index 0000000..7f0032a
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/DepthSegmentStressTest.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.buffer;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.locationtech.jts.geom.LineSegment;
+
+import test.jts.perf.PerformanceTestCase;
+import test.jts.perf.PerformanceTestRunner;
+
+/**
+ * Stress tests {@link DepthSegment} to determine if the compare contract is maintained.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DepthSegmentStressTest
+extends PerformanceTestCase
+{
+
+ public static void main(String args[]) {
+ PerformanceTestRunner.run(DepthSegmentStressTest.class);
+ }
+
+ public DepthSegmentStressTest(String name)
+ {
+ super(name);
+ setRunSize(new int[] {20});
+ setRunIterations(100);
+ }
+
+ public void startRun(int size)
+ {
+ System.out.println("Running with size " + size);
+ iter = 0;
+ }
+
+ private int iter = 0;
+
+ public void XXrunSort()
+ {
+ System.out.println("Iter # " + iter++);
+ // do test work here
+ List segs = createRandomDepthSegments(100);
+ Collections.sort(segs);
+ }
+
+ public void runMin()
+ {
+ System.out.println("Iter # " + iter++);
+ // do test work here
+ List segs = createRandomDepthSegments(100);
+ Collections.min(segs);
+ }
+
+ public void runCompare()
+ {
+ System.out.println("Iter # " + iter++);
+ DepthSegment seg1 = createRandomDepthSegment();
+ DepthSegment seg2 = createRandomDepthSegment();
+ DepthSegment seg3 = createRandomDepthSegment();
+
+ // do test work here
+ boolean fails = false;
+ if (! isSymmetric(seg1, seg2))
+ fails = true;
+ if (! isTransitive(seg1, seg2, seg3))
+ fails = true;
+
+ if (fails ){
+ System.out.println("FAILS!");
+ throw new RuntimeException("FAILS!");
+ }
+
+ }
+
+ public boolean isSymmetric(DepthSegment seg1, DepthSegment seg2) {
+ int cmp12 = seg1.compareTo(seg2);
+ int cmp21 = seg2.compareTo(seg1);
+ return cmp12 == -cmp21;
+ }
+ public boolean isTransitive(DepthSegment seg1, DepthSegment seg2, DepthSegment seg3) {
+ int cmp12 = seg1.compareTo(seg2);
+ int cmp23 = seg2.compareTo(seg3);
+ int cmp13 = seg1.compareTo(seg3);
+ if (cmp12 > 0 && cmp23 > 0) {
+ if (cmp13 <= 0) {
+ System.out.println(seg1 + " " + seg2 + " " + seg3);
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public List createRandomDepthSegments(int n)
+ {
+ List segs = new ArrayList();
+ for (int i = 0; i < n; i++) {
+ segs.add(createRandomDepthSegment());
+ }
+ return segs;
+ }
+
+ int randint(int max) {
+ return (int) (max * Math.random());
+ }
+
+ private DepthSegment createRandomDepthSegment() {
+ double scale = 10;
+ int max = 10;
+ double x0 = randint(max);
+ double y0 = randint(max);
+ double ang = 2 * Math.PI * Math.random();
+ double x1 = Math.rint(x0 + max * Math.cos(ang));
+ double y1 = Math.rint(y0 + max * Math.sin(ang));
+ LineSegment seg = new LineSegment(x0,y0,x1,y1);
+ seg.normalize();
+ return new DepthSegment(seg, 0);
+ }
+
+ double round(double x, double scale)
+ {
+ return Math.round(x * scale) / scale;
+ }
+
+ /**
+ * A segment from a directed edge which has been assigned a depth value
+ * for its sides.
+ */
+ private class DepthSegment
+ implements Comparable
+ {
+ private LineSegment upwardSeg;
+ private int leftDepth;
+
+ public DepthSegment(LineSegment seg, int depth)
+ {
+ // input seg is assumed to be normalized
+ upwardSeg = new LineSegment(seg);
+ //upwardSeg.normalize();
+ this.leftDepth = depth;
+ }
+ /**
+ * Defines a comparison operation on DepthSegments
+ * which orders them left to right
+ *
+ * <pre>
+ * DS1 < DS2 if DS1.seg is left of DS2.seg
+ * DS1 > DS2 if DS1.seg is right of DS2.seg
+ * </pre>
+ *
+ * @param obj
+ * @return the comparison value
+ */
+ public int compareTo(Object obj)
+ {
+ DepthSegment other = (DepthSegment) obj;
+
+ if (! envelopesOverlap(upwardSeg, other.upwardSeg))
+ return upwardSeg.compareTo(other.upwardSeg);
+ // check orientations
+ int orientIndex = upwardSeg.orientationIndex(other.upwardSeg);
+ if (orientIndex != 0) return orientIndex;
+ orientIndex = - other.upwardSeg.orientationIndex(upwardSeg);
+ if (orientIndex != 0) return orientIndex;
+ // segments cross or are collinear. Use segment ordering
+ return upwardSeg.compareTo(other.upwardSeg);
+
+ }
+
+ public int XcompareTo(Object obj)
+ {
+ DepthSegment other = (DepthSegment) obj;
+
+ // if segments are collinear and vertical compare endpoints
+ if (isVertical() && other.isVertical()
+ && upwardSeg.p0.x == other.upwardSeg.p0.x)
+ return compareX(this.upwardSeg, other.upwardSeg);
+ // check if segments are trivially ordered along X
+ if (upwardSeg.maxX() <= other.upwardSeg.minX()) return -1;
+ if (upwardSeg.minX() >= other.upwardSeg.maxX()) return 1;
+ /**
+ * try and compute a determinate orientation for the segments.
+ * Test returns 1 if other is left of this (i.e. this > other)
+ */
+ int orientIndex = upwardSeg.orientationIndex(other.upwardSeg);
+ // if orientation is determinate, return it
+ if (orientIndex != 0)
+ return orientIndex;
+
+ /**
+ * If comparison between this and other is indeterminate,
+ * try the opposite call order.
+ * orientationIndex value is 1 if this is left of other,
+ * so have to flip sign to get proper comparison value of
+ * -1 if this is leftmost
+ */
+ if (orientIndex == 0)
+ orientIndex = -1 * other.upwardSeg.orientationIndex(upwardSeg);
+
+ // if orientation is determinate, return it
+ if (orientIndex != 0)
+ return orientIndex;
+
+ // otherwise, segs must be collinear - sort based on minimum X value
+ return compareX(this.upwardSeg, other.upwardSeg);
+ }
+
+ public boolean isVertical() {
+ return upwardSeg.p0.x == upwardSeg.p1.x;
+ }
+
+ public boolean envelopesOverlap(LineSegment seg1, LineSegment seg2) {
+ if (seg1.maxX() <= seg2.minX()) return false;
+ if (seg2.maxX() <= seg1.minX()) return false;
+ if (seg1.maxY() <= seg2.minY()) return false;
+ if (seg2.maxY() <= seg1.minY()) return false;
+ return true;
+ }
+ /**
+ * Compare two collinear segments for left-most ordering.
+ * If segs are vertical, use vertical ordering for comparison.
+ * If segs are equal, return 0.
+ * Segments are assumed to be directed so that the second coordinate is >= to the first
+ * (e.g. up and to the right).
+ *
+ * @param seg0 a segment to compare
+ * @param seg1 a segment to compare
+ * @return
+ */
+ private int compareX(LineSegment seg0, LineSegment seg1)
+ {
+ int compare0 = seg0.p0.compareTo(seg1.p0);
+ if (compare0 != 0)
+ return compare0;
+ return seg0.p1.compareTo(seg1.p1);
+
+ }
+ public String toString()
+ {
+ return upwardSeg.toString();
+ }
+
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/FileBufferPerfTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/FileBufferPerfTest.java
new file mode 100644
index 0000000..bf6ad64
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/FileBufferPerfTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.buffer;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.util.Stopwatch;
+
+import test.jts.TestFiles;
+
+public class FileBufferPerfTest
+{
+ static final int MAX_ITER = 1;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+
+ GeometryFactory factory = new GeometryFactory();
+
+ public static void main(String[] args) {
+ FileBufferPerfTest test = new FileBufferPerfTest();
+ try {
+ test.test();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ boolean testFailed = false;
+
+ public FileBufferPerfTest() {
+ }
+
+ public void test()
+ throws Exception
+ {
+ test(TestFiles.getResourceFilePath("africa.wkt"));
+ // test(TestFiles.getResourceFilePath("world.wkt"));
+ // test(TestFiles.getResourceFilePath("bc-250k.wkt"));
+ // test(TestFiles.getResourceFilePath("bc_20K.wkt"));
+ }
+
+ public void test(String filename)
+ throws Exception
+ {
+ WKTFileReader fileRdr = new WKTFileReader(filename, wktRdr);
+ List polys = fileRdr.read();
+
+ runAll(polys, 0.01);
+ runAll(polys, 0.1);
+ runAll(polys, 1.0);
+ runAll(polys, 10.0);
+ runAll(polys, 100.0);
+ runAll(polys, 1000.0);
+ }
+
+ void runAll(List polys, double distance)
+ {
+ System.out.println("Geom count = " + polys.size() + " distance = " + distance);
+ Stopwatch sw = new Stopwatch();
+ for (Iterator i = polys.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ g.buffer(distance);
+ System.out.print(".");
+ }
+ System.out.println();
+ System.out.println(" Time = " + sw.getTimeString());
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/FileBufferResultValidatorTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/FileBufferResultValidatorTest.java
new file mode 100644
index 0000000..148152c
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/FileBufferResultValidatorTest.java
@@ -0,0 +1,104 @@
+
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.buffer;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.operation.buffer.validate.BufferResultValidator;
+import org.locationtech.jts.util.Stopwatch;
+
+import junit.framework.TestCase;
+
+
+/**
+ * @version 1.7
+ */
+public class FileBufferResultValidatorTest extends TestCase {
+
+ static int MAX_FEATURE = 1;
+
+ WKTReader rdr = new WKTReader();
+
+ public FileBufferResultValidatorTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(FileBufferResultValidatorTest.class);
+ }
+
+ public void testAfrica() throws Exception
+ {
+ // runTest(TestFiles.getResourceFilePath("world.wkt"));
+ runTest("/testdata/africa.wkt");
+ }
+
+ void runTest(String resource)
+ throws Exception
+ {
+ InputStream is = this.getClass().getResourceAsStream(resource);
+ runTest(new WKTFileReader(new InputStreamReader(is), rdr));
+ }
+
+ void runTest(WKTFileReader fileRdr)
+ throws Exception
+ {
+ List polys = fileRdr.read();
+
+ runAll(polys, 0.01);
+ runAll(polys, 0.1);
+ runAll(polys, 1.0);
+ runAll(polys, 10.0);
+ runAll(polys, 100.0);
+ runAll(polys, 1000.0);
+
+ }
+
+ void runAll(List geoms, double dist)
+ {
+ Stopwatch sw = new Stopwatch();
+ //System.out.println("Geom count = " + geoms.size() + " distance = " + dist);
+ int count = 0;
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry g = (Geometry) i.next();
+ runBuffer(g, dist);
+ runBuffer(g.reverse(), dist);
+ //System.out.print(".");
+ count++;
+ if (count > MAX_FEATURE) return;
+ }
+ //System.out.println(" " + sw.getTimeString());
+
+ }
+ void runBuffer(Geometry g, double dist)
+ {
+ Geometry buf = g.buffer(dist);
+ BufferResultValidator validator = new BufferResultValidator(g, dist, buf);
+
+ if (! validator.isValid()) {
+ String msg = validator.getErrorMessage();
+
+ System.out.println(msg);
+ System.out.println(WKTWriter.toPoint(validator.getErrorLocation()));
+ System.out.println(g);
+ }
+ assertTrue(validator.isValid());
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/IteratedBufferStressTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/IteratedBufferStressTest.java
new file mode 100644
index 0000000..0220421
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/IteratedBufferStressTest.java
@@ -0,0 +1,80 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.buffer;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.util.Stopwatch;
+
+/**
+ * Test repeated buffering of a given input shape.
+ * Intended to test the robustness of buffering.
+ * Repeated buffering tends to generate challenging
+ * somewhat pathological linework, which stresses the buffer algorithm.
+ *
+ * @version 1.7
+ */
+public class IteratedBufferStressTest
+{
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+// private PrecisionModel precisionModel = new PrecisionModel(1);
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader rdr = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ try {
+ (new IteratedBufferStressTest()).run();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ }
+
+ String inputWKT =
+ "POLYGON ((110 320, 190 220, 60 200, 180 120, 120 40, 290 150, 410 40, 410 230, 500 340, 320 310, 260 370, 220 310, 110 320), (220 260, 250 180, 290 220, 360 150, 350 250, 260 280, 220 260))";
+
+ public IteratedBufferStressTest() { }
+
+ void run()
+ throws Exception
+ {
+ Stopwatch totalSW = new Stopwatch();
+ Geometry base = rdr.read(inputWKT);
+ double dist = 1.0;
+ while (true) {
+ Geometry b1 = doBuffer(base, dist);
+ Geometry b2 = doBuffer(b1, -dist);
+ dist += 1;
+ base = b2;
+ System.out.println("---------------------- " + totalSW.getTimeString());
+ System.out.println();
+ }
+ }
+
+ Geometry doBuffer(Geometry g, double dist)
+ {
+ System.out.println("Buffering with dist = " + dist);
+ Geometry buf = g.buffer(dist);
+ System.out.println("Buffer result has " + buf.getNumPoints() + " vertices");
+
+ System.out.println(buf);
+ return buf;
+
+ }
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/OffsetCurveCorrectnessTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/OffsetCurveCorrectnessTest.java
new file mode 100644
index 0000000..2611cc4
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/OffsetCurveCorrectnessTest.java
@@ -0,0 +1,76 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.buffer;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.operation.buffer.OffsetCurveBuilder;
+/**
+ * Tests self-snapping issues
+ *
+ * @version 1.7
+ */
+public class OffsetCurveCorrectnessTest
+{
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader rdr = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ try {
+ (new OffsetCurveCorrectnessTest()).run7();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ }
+
+ public OffsetCurveCorrectnessTest() { }
+
+ void run7()
+ throws Exception
+ {
+ // buffer fails
+ String wkt = "MULTILINESTRING ((1335558.59524 631743.01449, 1335572.28215 631775.89056, 1335573.2578018496 631782.1915185435), (1335573.2578018496 631782.1915185435, 1335576.62035 631803.90754), (1335558.59524 631743.01449, 1335573.2578018496 631782.1915185435), (1335573.2578018496 631782.1915185435, 1335580.70187 631802.08139))";
+ Geometry g = rdr.read(wkt);
+ Geometry curve = bufferOffsetCurve(g, 15);
+ System.out.println(curve);
+ //assert(curve.isValid());
+ }
+
+ public static Geometry bufferOffsetCurve(Geometry g, double distance)
+ {
+ OffsetCurveBuilder ocb = new OffsetCurveBuilder(
+ g.getFactory().getPrecisionModel(),
+ new BufferParameters());
+ Coordinate[] pts = g.getCoordinates();
+ Coordinate[] curvePts = null;
+ if (g instanceof Polygonal) {
+ curvePts = ocb.getRingCurve(pts, 1, distance);
+ }
+ else {
+ curvePts = ocb.getLineCurve(pts, distance);
+ }
+ Geometry curve = g.getFactory().createLineString(curvePts);
+ return curve;
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/PolygonBufferStressTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/PolygonBufferStressTest.java
new file mode 100644
index 0000000..9a51994
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/PolygonBufferStressTest.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.buffer;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.GeometricShapeFactory;
+import org.locationtech.jts.util.Stopwatch;
+
+/**
+ * Stress-tests buffering by repeatedly buffering a geometry
+ * using alternate positive and negative distances.
+ *
+ * In older versions of JTS this used to quickly cause failure due to robustness
+ * issues (bad noding causing topology failures).
+ * However by ver 1.13 (at least) this test should pass perfectly.
+ * This is due to the many heuristics introduced to improve buffer
+ * robustness.
+ *
+ *
+ * @author Martin Davis
+ *
+ */
+public class PolygonBufferStressTest {
+
+ static final int MAX_ITER = 50;
+
+ static PrecisionModel pm = new PrecisionModel();
+ //static PrecisionModel pm = new PrecisionModel(10);
+
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ Stopwatch sw = new Stopwatch();
+
+ public static void main(String[] args) {
+ PolygonBufferStressTest test = new PolygonBufferStressTest();
+ test.test();
+ }
+
+ boolean testFailed = false;
+
+ public PolygonBufferStressTest() {
+ }
+
+ public void test()
+ {
+ String geomStr;
+ GeometricShapeFactory shapeFact = new GeometricShapeFactory(fact);
+
+ Geometry g = getSampleGeometry();
+
+// Geometry g = GeometricShapeFactory.createArc(fact, 0, 0, 200.0, 0.0, 6.0, 100);
+
+ //Geometry circle = GeometricShapeFactory.createCircle(fact, 0, 0, 200, 100);
+ //Geometry g = circle;
+
+// Geometry sq = GeometricShapeFactory.createBox(fact, 0, 0, 1, 120);
+// Geometry g = sq.difference(circle);
+
+// Geometry handle = GeometricShapeFactory.createRectangle(fact, 0, 0, 400, 20, 1);
+// Geometry g = circle.union(handle);
+
+ System.out.println(g);
+ test(g);
+ }
+
+ private Geometry getSampleGeometry()
+ {
+ String wkt;
+// triangle
+//wkt ="POLYGON (( 233 221, 210 172, 262 181, 233 221 ))";
+
+//star polygon with hole
+ wkt ="POLYGON ((260 400, 220 300, 80 300, 180 220, 40 200, 180 160, 60 20, 200 80, 280 20, 260 140, 440 20, 340 180, 520 160, 280 220, 460 340, 300 300, 260 400), (260 320, 240 260, 220 220, 160 180, 220 160, 200 100, 260 160, 300 140, 320 180, 260 200, 260 320))";
+
+//star polygon with NO hole
+// wkt ="POLYGON ((260 400, 220 300, 80 300, 180 220, 40 200, 180 160, 60 20, 200 80, 280 20, 260 140, 440 20, 340 180, 520 160, 280 220, 460 340, 300 300, 260 400))";
+
+//star polygon with NO hole, 10x size
+// wkt ="POLYGON ((2600 4000, 2200 3000, 800 3000, 1800 2200, 400 2000, 1800 1600, 600 200, 2000 800, 2800 200, 2600 1400, 4400 200, 3400 1800, 5200 1600, 2800 2200, 4600 3400, 3000 3000, 2600 4000))";
+
+ Geometry g = null;
+ try {
+ g = wktRdr.read(wkt);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ testFailed = true;
+ }
+ return g;
+ }
+ public void test(Geometry g)
+ {
+ int maxCount = MAX_ITER;
+ //doIteratedBuffer(g, 1, -120.01, maxCount);
+ //doIteratedBuffer(g, 1, 2, maxCount);
+ doAlternatingIteratedBuffer(g, 1, maxCount);
+ if (testFailed) {
+ System.out.println("FAILED!");
+ }
+ }
+
+ public void doIteratedBuffer(Geometry g, double initDist, double distanceInc, int maxCount)
+ {
+ int i = 0;
+ double dist = initDist;
+ while (i < maxCount) {
+ i++;
+ System.out.println("Iter: " + i + " --------------------------------------------------------");
+
+ dist += distanceInc;
+ System.out.println("Buffer (" + dist + ")");
+ g = getBuffer(g, dist);
+//if (((Polygon) g).getNumInteriorRing() > 0)
+// return;
+ }
+ }
+
+ public void doAlternatingIteratedBuffer(Geometry g, double dist, int maxCount)
+ {
+ int i = 0;
+ while (i < maxCount) {
+ i++;
+ System.out.println("Iter: " + i + " --------------------------------------------------------");
+
+ dist += 1.0;
+ System.out.println("Pos Buffer (" + dist + ")");
+ g = getBuffer(g, dist);
+ System.out.println("Neg Buffer (" + -dist + ")");
+ g = getBuffer(g, -dist);
+ }
+ }
+
+ private Geometry getBuffer(Geometry geom, double dist)
+ {
+ Geometry buf = geom.buffer(dist);
+ //System.out.println(buf);
+ System.out.println(sw.getTimeString());
+ if (! buf.isValid()) throw new RuntimeException("buffer not valid!");
+ return buf;
+ }
+}
\ No newline at end of file
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/RandomLineBufferStressTest.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/RandomLineBufferStressTest.java
new file mode 100644
index 0000000..778cce7
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/RandomLineBufferStressTest.java
@@ -0,0 +1,103 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.buffer;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.operation.buffer.validate.BufferResultValidator;
+
+/**
+ * Test buffers generated around set of random linestrings.
+ * Intended to stress-test the correctness of buffer generation.
+ * The random linestring sets tend to have numerous holes when buffered,
+ * which is a good test.
+ *
+ * @version 1.7
+ */
+public class RandomLineBufferStressTest
+{
+
+ private PrecisionModel precisionModel = new PrecisionModel();
+ private GeometryFactory geometryFactory = new GeometryFactory(precisionModel, 0);
+ WKTReader rdr = new WKTReader(geometryFactory);
+
+ public static void main(String args[]) {
+ try {
+ (new RandomLineBufferStressTest()).run();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ }
+
+ public RandomLineBufferStressTest() { }
+
+ void run()
+ throws Exception
+ {
+ while (true) {
+ run(10);
+ run(100);
+ run(200);
+ }
+ }
+
+ void run(int numPts)
+ throws Exception
+ {
+ double lineScale = 1.0;
+
+ Geometry line = RandomOffsetLineStringGenerator.generate(lineScale, numPts, geometryFactory);
+ System.out.println();
+ System.out.println(line);
+
+ runCase(line, 10, lineScale, numPts);
+ runCase(line, 1, lineScale, numPts);
+ runCase(line, .1, lineScale, numPts);
+ }
+
+ private int caseCount = 0;
+
+ void runCase(Geometry line, double dist, double lineScale, int numPts)
+ throws Exception
+ {
+ caseCount++;
+ System.out.println("Running case " + caseCount
+ + " (line scale = " + lineScale
+ + " buffer dist = " + dist
+ + " num pts = " + numPts
+ + " )");
+ checkBuffer(line, dist);
+ }
+
+ void checkBuffer(Geometry g, double distance)
+ {
+ Geometry buf = g.buffer(distance);
+ String isValidMsg = BufferResultValidator.isValidMsg(g, distance, buf);
+ if (isValidMsg != null) {
+ System.out.println("Input: ");
+ System.out.println(g);
+ System.out.println("Buffer: ");
+ System.out.println(buf);
+
+ throw new IllegalStateException(isValidMsg);
+ }
+ }
+
+
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/operation/buffer/RandomOffsetLineStringGenerator.java b/modules/core/src/test/java/test/jts/perf/operation/buffer/RandomOffsetLineStringGenerator.java
new file mode 100644
index 0000000..5052c5d
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/buffer/RandomOffsetLineStringGenerator.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.buffer;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineSegment;
+import org.locationtech.jts.geom.LineString;
+
+
+/**
+ * Generates random {@link LineString}s, which are somewhat coherent
+ * in terms of how far they deviate from a given line segment,
+ * and how much they twist around.
+ * <p>
+ * The method is to recursively perturb line segment midpoints by a random offset.
+ *
+ * @author mbdavis
+ *
+ */
+public class RandomOffsetLineStringGenerator
+{
+ public static Geometry generate(double maxSegLen, int numPts, GeometryFactory fact)
+ {
+ RandomOffsetLineStringGenerator rlg = new RandomOffsetLineStringGenerator(maxSegLen, numPts);
+ return rlg.generate(fact);
+ }
+
+ private double maxSegLen;
+ private int numPts;
+ private int exponent2 = 5;
+ private Coordinate[] pts;
+ private Coordinate endPoint;
+
+
+ public RandomOffsetLineStringGenerator(double maxSegLen, int numPts)
+ {
+ this.maxSegLen = maxSegLen;
+
+ exponent2 = (int) (Math.log(numPts) / Math.log(2));
+ int pow2 = pow2(exponent2);
+ if (pow2 < numPts)
+ exponent2 += 1;
+
+ this.numPts = pow2(exponent2) + 1;
+ }
+
+ public Geometry generate(GeometryFactory fact)
+ {
+ pts = new Coordinate[numPts];
+
+ pts[0] = new Coordinate();
+
+ double ang = Math.PI * Math.random();
+ endPoint = new Coordinate(maxSegLen * Math.cos(ang),maxSegLen * Math.sin(ang));
+ pts[numPts - 1] = endPoint;
+
+
+ int interval = numPts / 2;
+ while (interval >= 1) {
+ createRandomOffsets(interval);
+ interval /= 2;
+ }
+ return fact.createLineString(pts);
+ }
+
+ private void createRandomOffsets(int interval)
+ {
+// for (int i = 0; i )
+ int inc = pow2(exponent2);
+
+ while (inc > 1) {
+ computeRandomOffsets(inc);
+ inc /= 2;
+ }
+ }
+
+ private void computeRandomOffsets(int inc)
+ {
+ int inc2 = inc / 2;
+ for (int i = 0; i + inc2 < numPts; i += inc) {
+ int midIndex = i + inc2;
+ int endIndex = i + inc;
+
+ Coordinate segEndPoint;
+
+ double segFrac = 0.5 + randomFractionPerturbation();
+
+ if (endIndex >= numPts) {
+ segEndPoint = endPoint;
+ segFrac = midIndex / numPts;
+ }
+ else {
+ segEndPoint = pts[i + inc];
+ }
+ pts[midIndex] = computeRandomOffset(pts[i], segEndPoint, segFrac);
+ }
+ }
+
+ private Coordinate computeRandomOffset(Coordinate p0, Coordinate p1, double segFrac)
+ {
+ double len = p0.distance(p1);
+ double len2 = len / 2;
+ double offsetLen = (len * Math.random()) - len2;
+ LineSegment seg = new LineSegment(p0, p1);
+ return seg.pointAlongOffset(segFrac, offsetLen);
+ }
+
+ private double randomFractionPerturbation()
+ {
+ double rnd = Math.random();
+ double mag = rnd * rnd * rnd;
+ int sign = Math.random() > 0.5 ? 1 : -1;
+ return sign * mag;
+ }
+
+ private static int pow2(int exponent)
+ {
+ int pow2 = 1;
+ for (int i = 0; i < exponent; i++) {
+ pow2 *= 2;
+ }
+ return pow2;
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/distance/CachedBABDistance.java b/modules/core/src/test/java/test/jts/perf/operation/distance/CachedBABDistance.java
new file mode 100644
index 0000000..b515aea
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/distance/CachedBABDistance.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.distance;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.operation.distance.IndexedFacetDistance;
+
+public class CachedBABDistance
+{
+
+ private static Geometry cacheGeom = null;
+ private static IndexedFacetDistance babDist;
+
+ public CachedBABDistance() {
+ super();
+ }
+
+ static double getDistance(Geometry g1, Geometry g2)
+ {
+ if (cacheGeom != g1) {
+ babDist = new IndexedFacetDistance(g1);
+ cacheGeom = g1;
+ }
+ return babDist.getDistance(g2);
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceGeomPair.java b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceGeomPair.java
new file mode 100644
index 0000000..dff4eb7
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceGeomPair.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.distance;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.operation.distance.IndexedFacetDistance;
+import org.locationtech.jts.util.GeometricShapeFactory;
+import org.locationtech.jts.util.Stopwatch;
+
+public class TestPerfDistanceGeomPair
+{
+
+ static final int MAX_ITER = 100;
+
+ public static void main(String[] args) {
+ TestPerfDistanceGeomPair test = new TestPerfDistanceGeomPair();
+// test.test();
+ test.test2();
+ }
+
+ boolean testFailed = false;
+ boolean verbose = true;
+
+ public TestPerfDistanceGeomPair() {
+ }
+
+ public void test()
+ {
+
+
+// test(5000);
+// test(8001);
+
+ test(10);
+ test(10);
+ test(100);
+ test(500);
+ test(1000);
+ test(5000);
+ test(10000);
+ test(50000);
+ test(100000);
+ }
+
+ public void test2()
+ {
+ verbose = false;
+
+ for (int i = 100; i <= 2000; i += 100) {
+ test(i);
+ }
+ }
+
+ double size = 100;
+ double separationDist = size * 2;
+
+ public void test(int nPts)
+ {
+
+// Geometry[] geom = createCircles(nPts);
+ Geometry[] geom = createSineStars(nPts);
+
+ if (verbose) System.out.println("Running with " + nPts + " points");
+ if (! verbose) System.out.print(nPts + ": ");
+ test(geom);
+ }
+
+ public void test(Geometry[] geom)
+ {
+ Stopwatch sw = new Stopwatch();
+ double dist = 0.0;
+ double dist2 = 0.0;
+ for (int i = 0; i < MAX_ITER; i++) {
+
+// dist = geom[0].distance(geom[1]);
+// dist = SortedBoundsFacetDistance.distance(g1, g2);
+// dist2 = BranchAndBoundFacetDistance.distance(geom[0], geom[1]);
+// if (dist != dist2) System.out.println("distance discrepancy found!");
+
+
+ computeDistanceToAllPoints(geom);
+ }
+ if (! verbose) System.out.println(sw.getTimeString());
+ if (verbose) {
+ System.out.println("Finished in " + sw.getTimeString());
+ System.out.println(" (Distance = " + dist + ")");
+ }
+ }
+
+ void computeDistanceToAllPoints(Geometry[] geom)
+ {
+ Coordinate[] pts = geom[1].getCoordinates();
+ double dist = 0.0;
+ double dist2 = 0.0;
+ IndexedFacetDistance fastDist = new IndexedFacetDistance(geom[0]);
+ for (int i = 0; i < pts.length; i++) {
+ Coordinate p = pts[i];
+
+ // slow N^2 distance
+ dist = geom[0].distance(geom[1].getFactory().createPoint(p));
+
+// dist2 = fastDist.getDistance(geom[1].getFactory().createPoint(p));
+
+// if (dist != dist2) System.out.println("distance discrepancy found!");
+ }
+ }
+
+ Geometry[] createCircles(int nPts)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(new Coordinate(0, 0));
+ gsf.setSize(100);
+ gsf.setNumPoints(nPts);
+
+ Polygon gRect = gsf.createCircle();
+
+ gsf.setCentre(new Coordinate(0, separationDist));
+
+ Polygon gRect2 = gsf.createCircle();
+
+ return new Geometry[] { gRect, gRect2 };
+
+ }
+
+ Geometry[] createSineStars(int nPts)
+ {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(new Coordinate(0, 0));
+ gsf.setSize(100);
+ gsf.setNumPoints(nPts);
+
+ Geometry g = gsf.createSineStar().getBoundary();
+
+ gsf.setCentre(new Coordinate(0, separationDist));
+
+ Geometry g2 = gsf.createSineStar().getBoundary();
+
+ return new Geometry[] { g, g2 };
+
+ }
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceGeomSet.java b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceGeomSet.java
new file mode 100644
index 0000000..ebbf7a4
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceGeomSet.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.distance;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.util.Stopwatch;
+
+public class TestPerfDistanceGeomSet
+{
+ static final int MAX_ITER = 1;
+ static final int NUM_GEOM = 100;
+ static final double GEOM_SIZE = 1;
+ static final double MAX_X = 100;
+
+ public static void main(String[] args) {
+ TestPerfDistanceGeomSet test = new TestPerfDistanceGeomSet();
+// test.test();
+ test.test();
+ }
+
+ boolean testFailed = false;
+ boolean verbose = false;
+
+ public TestPerfDistanceGeomSet() {
+ }
+
+ public void test()
+ {
+
+
+// test(5000);
+// test(8001);
+
+ test(10);
+ test(3);
+ test(4);
+ test(5);
+ test(10);
+ test(20);
+ test(30);
+ test(40);
+ test(50);
+ test(60);
+ test(100);
+ test(200);
+ test(500);
+ test(1000);
+ test(5000);
+ test(10000);
+ test(50000);
+ test(100000);
+ }
+
+ public void test2()
+ {
+ verbose = false;
+
+ for (int i = 800; i <= 2000; i += 100) {
+ test(i);
+ }
+ }
+
+ double size = 100;
+ double separationDist = size * 2;
+
+ public void test(int num)
+ {
+
+// Geometry[] geom = createRandomCircles(nPts);
+ Geometry[] geom = createRandomCircles(100, 5, num);
+// Geometry[] geom = createSineStarsRandomLocation(nPts);
+
+ if (verbose) System.out.println("Running with " + num + " points");
+ if (! verbose) System.out.print(num + ", ");
+ test(geom);
+ }
+
+ public void test(Geometry[] geom)
+ {
+ Stopwatch sw = new Stopwatch();
+ double dist = 0.0;
+ for (int i = 0; i < MAX_ITER; i++) {
+ testAll(geom);
+ }
+ if (! verbose) System.out.println(sw.getTimeString());
+ if (verbose) {
+ System.out.println("Finished in " + sw.getTimeString());
+ System.out.println(" (Distance = " + dist + ")");
+ }
+ }
+
+ void testAll(Geometry[] geom)
+ {
+ for (int i = 0; i < geom.length; i++ ) {
+ for (int j = 0; j < geom.length; j++ ) {
+ double dist = geom[i].distance(geom[j]);
+// double dist = SortedBoundsFacetDistance.distance(g1, g2);
+// double dist = BranchAndBoundFacetDistance.distance(geom[i], geom[j]);
+// double dist = CachedBABDistance.getDistance(geom[i], geom[j]);
+
+ }
+ }
+ }
+
+ Geometry[] createRandomCircles(int nPts)
+ {
+ Geometry[] geoms = new Geometry[NUM_GEOM];
+ for (int i = 0; i < NUM_GEOM; i++) {
+ geoms[i] = createCircleRandomLocation(nPts);
+ }
+ return geoms;
+ }
+
+ Geometry[] createRandomCircles(int numGeom, int nPtsMin, int nPtsMax)
+ {
+ int nPtsRange = nPtsMax - nPtsMin + 1;
+ Geometry[] geoms = new Geometry[numGeom];
+ for (int i = 0; i < numGeom; i++) {
+ int nPts = (int) (nPtsRange * Math.random()) + nPtsMin;
+ geoms[i] = createCircleRandomLocation(nPts);
+ }
+ return geoms;
+ }
+
+ Geometry createCircleRandomLocation(int nPts)
+ {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(randomLocation());
+ gsf.setSize(GEOM_SIZE);
+ gsf.setNumPoints(nPts);
+
+ Polygon g = gsf.createCircle();
+// Geometry g = gsf.createSineStar();
+
+ return g;
+ }
+
+ Coordinate randomLocation()
+ {
+ double x = Math.random() * MAX_X;
+ double y = Math.random() * MAX_X;
+ return new Coordinate(x, y);
+ }
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceLinesPoints.java b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceLinesPoints.java
new file mode 100644
index 0000000..58f7029
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfDistanceLinesPoints.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.distance;
+
+import java.util.List;
+
+import org.locationtech.jts.densify.Densifier;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.operation.distance.DistanceOp;
+import org.locationtech.jts.operation.distance.IndexedFacetDistance;
+import org.locationtech.jts.util.Stopwatch;
+
+
+/**
+ * Tests performance of {@link IndexedFacetDistance} versus standard
+ * {@link DistanceOp}
+ * using a grid of points to a target set of lines
+ *
+ * @author Martin Davis
+ *
+ */
+public class TestPerfDistanceLinesPoints
+{
+ static final boolean USE_INDEXED_DIST = true;
+
+ static GeometryFactory geomFact = new GeometryFactory();
+
+ static final int MAX_ITER = 1;
+ static final int NUM_TARGET_ITEMS = 4000;
+ static final double EXTENT = 1000;
+ static final int NUM_PTS_SIDE = 100;
+
+
+ public static void main(String[] args) {
+ TestPerfDistanceLinesPoints test = new TestPerfDistanceLinesPoints();
+ try {
+ test.test();
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+
+ boolean verbose = true;
+
+ public TestPerfDistanceLinesPoints() {
+ }
+
+ public void test()
+ throws Exception
+ {
+
+ //test(200);
+ //if (true) return;
+
+// test(5000);
+// test(8001);
+
+ //test(50);
+ test(100);
+ test(200);
+ test(500);
+ test(1000);
+ //test(5000);
+ //test(10000);
+ //test(50000);
+ //test(100000);
+ }
+
+ public void test(int num)
+ throws Exception
+ {
+ //Geometry lines = createLine(EXTENT, num);
+ Geometry target = createDiagonalCircles(EXTENT, NUM_TARGET_ITEMS);
+ Geometry[] pts = createPoints(target.getEnvelopeInternal(), num);
+
+ /*
+ Geometry target = loadData("C:\\data\\martin\\proj\\jts\\testing\\distance\\bc_coast.wkt");
+ Envelope bcEnv_Albers = new Envelope(-45838, 1882064, 255756, 1733287);
+ Geometry[] pts = createPoints(bcEnv_Albers, num);
+ */
+ test(pts, target);
+ }
+
+ public void xtest(int num)
+ throws Exception
+ {
+ Geometry target = loadData("C:\\proj\\JTS\\test\\g2e\\ffmwdec08.wkt");
+ Envelope bcEnv_Albers = new Envelope(-45838, 1882064, 255756, 1733287);
+ Geometry[] pts = createPoints(bcEnv_Albers, num);
+
+ test(pts, target);
+ }
+
+ public void test(Geometry[] pts, Geometry target)
+ {
+ if (verbose) System.out.println("Query points = " + pts.length
+ + " Target points = " + target.getNumPoints());
+// if (! verbose) System.out.print(num + ", ");
+
+ Stopwatch sw = new Stopwatch();
+ double dist = 0.0;
+ for (int i = 0; i < MAX_ITER; i++) {
+ computeDistance(pts, target);
+ }
+ if (! verbose) System.out.println(sw.getTimeString());
+ if (verbose) {
+ String name = USE_INDEXED_DIST ? "IndexedFacetDistance" : "Distance";
+ System.out.println(name + " - Run time: " + sw.getTimeString());
+ //System.out.println(" (Distance = " + dist + ")\n");
+ System.out.println();
+ }
+ }
+
+ void computeDistance(Geometry[] pts, Geometry geom)
+ {
+ IndexedFacetDistance bbd = null;
+ if (USE_INDEXED_DIST)
+ bbd = new IndexedFacetDistance(geom);
+ for (int i = 0; i < pts.length; i++ ) {
+ if (USE_INDEXED_DIST) {
+ double dist = bbd.getDistance(pts[i]);
+// double dist = bbd.getDistanceWithin(pts[i].getCoordinate(), 100000);
+ }
+ else {
+ double dist = geom.distance(pts[i]);
+ }
+ }
+ }
+
+ Geometry createDiagonalCircles(double extent, int nSegs)
+ {
+ Polygon[] circles = new Polygon[nSegs];
+ double inc = extent / nSegs;
+ for (int i = 0; i < nSegs; i++) {
+ double ord = i * inc;
+ Coordinate p = new Coordinate(ord, ord);
+ Geometry pt = geomFact.createPoint(p);
+ circles[i] = (Polygon) pt.buffer(inc/2);
+ }
+ return geomFact.createMultiPolygon(circles);
+
+ }
+
+ Geometry createLine(double extent, int nSegs)
+ {
+ Coordinate[] pts =
+ new Coordinate[] {
+ new Coordinate(0,0),
+ new Coordinate(0, extent),
+ new Coordinate(extent, extent),
+ new Coordinate(extent, 0)
+
+ };
+ Geometry outline = geomFact.createLineString(pts);
+ double inc = extent / nSegs;
+ return Densifier.densify(outline, inc);
+
+ }
+
+ Geometry createDiagonalLine(double extent, int nSegs)
+ {
+ Coordinate[] pts = new Coordinate[nSegs + 1];
+ pts[0] = new Coordinate(0,0);
+ double inc = extent / nSegs;
+ for (int i = 1; i <= nSegs; i++) {
+ double ord = i * inc;
+ pts[i] = new Coordinate(ord, ord);
+ }
+ return geomFact.createLineString(pts);
+ }
+
+ Geometry[] createPoints(Envelope extent, int nPtsSide)
+ {
+ Geometry[] pts = new Geometry[nPtsSide * nPtsSide];
+ int index = 0;
+ double xinc = extent.getWidth() / nPtsSide;
+ double yinc = extent.getHeight() / nPtsSide;
+ for (int i = 0; i < nPtsSide; i++) {
+ for (int j = 0; j < nPtsSide; j++) {
+ pts[index++] = geomFact.createPoint(
+ new Coordinate(
+ extent.getMinX() + i * xinc,
+ extent.getMinY() + j * yinc));
+ }
+ }
+ return pts;
+ }
+
+ Geometry loadData(String file)
+ throws Exception
+ {
+ List geoms = loadWKT(file);
+ return geomFact.buildGeometry(geoms);
+ }
+
+ List loadWKT(String filename) throws Exception {
+ WKTReader rdr = new WKTReader();
+ WKTFileReader fileRdr = new WKTFileReader(filename, rdr);
+ return fileRdr.read();
+ }
+
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfFastDistanceFile.java b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfFastDistanceFile.java
new file mode 100644
index 0000000..59ce255
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/distance/TestPerfFastDistanceFile.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.distance;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.util.Stopwatch;
+
+
+public class TestPerfFastDistanceFile
+{
+ public static void main(String[] args) {
+ TestPerfFastDistanceFile test = new TestPerfFastDistanceFile();
+ try {
+ test.test();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ private static final int MAX_GEOMS = 40;
+
+ boolean testFailed = false;
+
+ public TestPerfFastDistanceFile() {
+ }
+
+
+ public void test()
+ throws Exception
+{
+
+// List geoms = loadWKT("C:\\data\\martin\\proj\\jts\\sandbox\\jts\\testdata\\africa.wkt");
+ List geoms = loadWKT("C:\\data\\martin\\proj\\jts\\sandbox\\jts\\testdata\\world.wkt");
+
+// testAllDistances(geoms, 100);
+
+ testAllDistances(geoms, 1);
+ testAllDistances(geoms, 2);
+ testAllDistances(geoms, 5);
+ testAllDistances(geoms, 10);
+ testAllDistances(geoms, 20);
+ testAllDistances(geoms, 30);
+ testAllDistances(geoms, 40);
+ testAllDistances(geoms, 50);
+}
+
+ static List loadWKT(String filename) throws Exception {
+ WKTReader rdr = new WKTReader();
+ WKTFileReader fileRdr = new WKTFileReader(filename, rdr);
+ return fileRdr.read();
+ }
+
+ void testAllDistances(List geoms, int maxToScan)
+ {
+ Stopwatch sw = new Stopwatch();
+
+ computeAllDistances(geoms, maxToScan);
+// computePairDistance(geoms, 1, 3);
+// computePairDistance(geoms, 55, 77);
+
+ System.out.println("Count = " + maxToScan
+ + " Finished in " + sw.getTimeString());
+ }
+
+ void computeAllDistances(List geoms, int maxToScan) {
+ int numGeoms1 = geoms.size();
+ if (numGeoms1 > maxToScan)
+ numGeoms1 = maxToScan;
+
+ int numGeoms2 = geoms.size();
+
+ for (int i = 0; i < numGeoms1; i++) {
+ // PreparedGeometry pg = PreparedGeometryFactory.prepare((Geometry)
+ // geoms.get(i));
+ for (int j = 0; j < numGeoms2; j++) {
+ // don't compute distance to itself!
+ // if (i == j) continue;
+
+ Geometry g1 = (Geometry) geoms.get(i);
+ Geometry g2 = (Geometry) geoms.get(j);
+
+ // if (g1.getEnvelopeInternal().intersects(g2.getEnvelopeInternal()))
+ // continue;
+
+// double dist = g1.distance(g2);
+// double dist = BranchAndBoundFacetDistance.distance(g1, g2);
+ double dist = CachedBABDistance.getDistance(g1, g2);
+ // double distFast = SortedBoundsFacetDistance.distance(g1, g2);
+
+ // pg.intersects(g2);
+ }
+ }
+ }
+
+
+ static final int MAX_ITER = 10;
+
+ void computePairDistance(List geoms, int i, int j)
+ {
+ for (int n = 0; n < MAX_ITER; n++ ) {
+ Geometry g1 = (Geometry) geoms.get(i);
+ Geometry g2 = (Geometry) geoms.get(j);
+
+ double dist = g1.distance(g2);
+// double dist = SortedBoundsFacetDistance.distance(g1, g2);
+// double dist = BranchAndBoundFacetDistance.distance(g1, g2);
+ }
+ }
+
+
+
+}
+
+
diff --git a/modules/core/src/test/java/test/jts/perf/operation/overlay/OverlayNodingStressTest.java b/modules/core/src/test/java/test/jts/perf/operation/overlay/OverlayNodingStressTest.java
new file mode 100644
index 0000000..855f65d
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/overlay/OverlayNodingStressTest.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.overlay;
+
+import java.util.Random;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.operation.overlay.snap.SnapIfNeededOverlayOp;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests Noding checking during overlay.
+ * Intended to show that noding check failures due to robustness
+ * problems do not occur very often (i.e. that the heuristic is
+ * not triggering so often that a large performance penalty would be incurred.)
+ *
+ * The class generates test geometries for input to overlay which contain almost parallel lines
+ * - this should cause noding failures relatively frequently.
+ *
+ * Can also be used to check that the cross-snapping heuristic fix for robustness
+ * failures works well. If snapping ever fails to fix a case,
+ * an exception is thrown. It is expected (and has been observed)
+ * that cross-snapping works extremely well on this dataset.
+ *
+ * @version 1.7
+ */
+public class OverlayNodingStressTest
+ extends TestCase
+{
+ private static final int ITER_LIMIT = 10000;
+ private static final int BATCH_SIZE = 20;
+
+ private Random rand = new Random((long) (Math.PI * 10e8));
+ private int failureCount = 0;
+
+ public OverlayNodingStressTest(String name) {
+ super(name);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(OverlayNodingStressTest.class);
+ }
+
+ private double getRand()
+ {
+ double r = rand.nextDouble();
+ return r;
+ }
+
+ public void testNoding()
+ {
+ int iterLimit = ITER_LIMIT;
+ for (int i = 0; i < iterLimit; i++) {
+ System.out.println("Iter: " + i
+ + " Noding failure count = " + failureCount);
+ double ang1 = getRand() * Math.PI;
+ double ang2 = getRand() * Math.PI;
+// Geometry[] geom = generateGeometryStar(ang1, ang2);
+ Geometry[] geom = generateGeometryAccum(ang1, ang2);
+ checkIntersection(geom[0], geom[1]);
+ }
+ System.out.println(
+ "Test count = " + iterLimit
+ + " Noding failure count = " + failureCount
+ );
+ }
+
+ public Geometry[] generateGeometryStar(double angle1, double angle2) {
+ RotatedRectangleFactory rrFact = new RotatedRectangleFactory();
+ Polygon rr1 = rrFact.createRectangle(100, 20, angle1);
+ Polygon rr2 = rrFact.createRectangle(100, 20, angle2);
+
+ // this line can be used to test for the presence of noding failures for
+ // non-tricky cases
+ // Geometry star = rr2;
+ Geometry star = rr1.union(rr2);
+ return new Geometry[] { star, rr1 };
+ }
+
+ private static final double MAX_DISPLACEMENT = 60;
+
+ private Geometry baseAccum = null;
+ private int geomCount = 0;
+
+ public Geometry[] generateGeometryAccum(double angle1, double angle2) {
+ RotatedRectangleFactory rrFact = new RotatedRectangleFactory();
+ double basex = angle2 * MAX_DISPLACEMENT - (MAX_DISPLACEMENT / 2);
+ Coordinate base = new Coordinate(basex, basex);
+ Polygon rr1 = rrFact.createRectangle(100, 20, angle1, base);
+
+ // limit size of accumulated star
+ geomCount++;
+ if (geomCount >= BATCH_SIZE)
+ geomCount = 0;
+ if (geomCount == 0)
+ baseAccum = null;
+
+ if (baseAccum == null)
+ baseAccum = rr1;
+ else {
+ // this line can be used to test for the presence of noding failures for
+ // non-tricky cases
+ // Geometry star = rr2;
+ baseAccum = rr1.union(baseAccum);
+ }
+ return new Geometry[] { baseAccum, rr1 };
+ }
+
+ public void checkIntersection(Geometry base, Geometry testGeom) {
+
+ // this line can be used to test for the presence of noding failures for
+ // non-tricky cases
+ // Geometry star = rr2;
+ System.out.println("Star:");
+ System.out.println(base);
+ System.out.println("Rectangle:");
+ System.out.println(testGeom);
+
+ // test to see whether the basic overlay code fails
+ try {
+ Geometry intTrial = base.intersection(testGeom);
+ } catch (Exception ex) {
+ failureCount++;
+ }
+
+ // this will throw an intersection if a robustness error occurs,
+ // stopping the run
+ Geometry intersection = SnapIfNeededOverlayOp.intersection(base, testGeom);
+ System.out.println("Intersection:");
+ System.out.println(intersection);
+ }
+}
+
+class RotatedRectangleFactory
+{
+ public RotatedRectangleFactory()
+ {
+
+ }
+
+ private static double PI_OVER_2 = Math.PI / 2;
+ private GeometryFactory fact = new GeometryFactory();
+
+ public Polygon createRectangle(double length, double width, double angle)
+ {
+ return createRectangle(length, width, angle, new Coordinate(0,0));
+ }
+
+ public Polygon createRectangle(double length, double width, double angle, Coordinate base)
+ {
+ double posx = length / 2 * Math.cos(angle);
+ double posy = length / 2 * Math.sin(angle);
+ double negx = -posx;
+ double negy = -posy;
+ double widthOffsetx = (width / 2) * Math.cos(angle + PI_OVER_2);
+ double widthOffsety = (width / 2) * Math.sin(angle + PI_OVER_2);
+
+ Coordinate[] pts = new Coordinate[] {
+ new Coordinate(base.x + posx + widthOffsetx, base.y + posy + widthOffsety),
+ new Coordinate(base.x + posx - widthOffsetx, base.y + posy - widthOffsety),
+ new Coordinate(base.x + negx - widthOffsetx, base.y + negy - widthOffsety),
+ new Coordinate(base.x + negx + widthOffsetx, base.y + negy + widthOffsety),
+ new Coordinate(0,0),
+ };
+ // close polygon
+ pts[4] = new Coordinate(pts[0]);
+ Polygon poly = fact.createPolygon(fact.createLinearRing(pts), null);
+ return poly;
+ }
+
+
+}
+
\ No newline at end of file
diff --git a/modules/core/src/test/java/test/jts/perf/operation/predicate/RectangleIntersectsPerfTest.java b/modules/core/src/test/java/test/jts/perf/operation/predicate/RectangleIntersectsPerfTest.java
new file mode 100644
index 0000000..c9f6094
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/predicate/RectangleIntersectsPerfTest.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.predicate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.util.SineStarFactory;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.precision.GeometryPrecisionReducer;
+import org.locationtech.jts.util.GeometricShapeFactory;
+import org.locationtech.jts.util.Stopwatch;
+
+
+public class RectangleIntersectsPerfTest
+{
+ static final int MAX_ITER = 10;
+
+ static final int NUM_AOI_PTS = 2000;
+ static final int NUM_LINES = 5000;
+ static final int NUM_LINE_PTS = 1000;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ Stopwatch sw = new Stopwatch();
+
+ public static void main(String[] args) {
+ RectangleIntersectsPerfTest test = new RectangleIntersectsPerfTest();
+ test.test();
+ }
+
+ boolean testFailed = false;
+
+ public RectangleIntersectsPerfTest() {
+ }
+
+ public void test()
+ {
+// test(5);
+// test(10);
+ test(500);
+// test(1000);
+// test(2000);
+ test(100000);
+ /*
+ test(100);
+ test(1000);
+ test(2000);
+ test(4000);
+ test(8000);
+ */
+ }
+
+ void test(int nPts)
+ {
+ double size = 100;
+ Coordinate origin = new Coordinate(0, 0);
+ Geometry sinePoly = createSineStar(origin, size, nPts).getBoundary();
+ /**
+ * Make the geometry "crinkly" by rounding off the points.
+ * This defeats the MonotoneChain optimization in the full relate
+ * algorithm, and provides a more realistic test.
+ */
+ Geometry sinePolyCrinkly = GeometryPrecisionReducer.reduce(sinePoly,
+ new PrecisionModel(size / 10));
+ Geometry target = sinePolyCrinkly;
+
+ Geometry rect = createRectangle(origin, 5);
+// System.out.println(target);
+ //System.out.println("Running with " + nPts + " points");
+ testRectangles(target, 100, 5);
+ }
+
+ void testRectangles(Geometry target, int nRect, double rectSize)
+ {
+ Geometry[] rects = createRectangles(target.getEnvelopeInternal(), nRect, rectSize);
+ test(rects, target);
+ }
+
+ void test(Geometry[] rect, Geometry g)
+ {
+ System.out.println("Target # pts: " + g.getNumPoints()
+ + " -- # Rectangles: " + rect.length
+ );
+
+ int maxCount = MAX_ITER;
+ Stopwatch sw = new Stopwatch();
+ int count = 0;
+ for (int i = 0; i < MAX_ITER; i++) {
+ for (int j = 0; j < rect.length; j++) {
+// rect[j].relate(g);
+ rect[j].intersects(g);
+ }
+ }
+ System.out.println("Finished in " + sw.getTimeString());
+ System.out.println();
+ }
+
+ /**
+ * Creates a set of rectangular Polygons which
+ * cover the given envelope.
+ * The rectangles
+ * At least nRect rectangles are created.
+ *
+ * @param env
+ * @param nRect
+ * @param rectSize
+ * @return
+ */
+ Geometry[] createRectangles(Envelope env, int nRect, double rectSize )
+ {
+ int nSide = 1 + (int)Math.sqrt((double) nRect);
+ double dx = env.getWidth() / nSide;
+ double dy = env.getHeight() / nSide;
+
+ List rectList = new ArrayList();
+ for (int i = 0; i < nSide; i++) {
+ for (int j = 0; j < nSide; j++) {
+ double baseX = env.getMinX() + i * dx;
+ double baseY = env.getMinY() + j * dy;
+ Envelope envRect = new Envelope(
+ baseX, baseX + dx,
+ baseY, baseY + dy);
+ Geometry rect = fact.toGeometry(envRect);
+ rectList.add(rect);
+ }
+ }
+ return GeometryFactory.toGeometryArray(rectList);
+ }
+
+ Geometry createRectangle(Coordinate origin, double size) {
+ GeometricShapeFactory gsf = new GeometricShapeFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(4);
+ Geometry g = gsf.createRectangle();
+ // Polygon gRect = gsf.createRectangle();
+ // Geometry g = gRect.getExteriorRing();
+ return g;
+ }
+
+ Geometry createSineStar(Coordinate origin, double size, int nPts) {
+ SineStarFactory gsf = new SineStarFactory();
+ gsf.setCentre(origin);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+ gsf.setArmLengthRatio(2);
+ gsf.setNumArms(20);
+ Geometry poly = gsf.createSineStar();
+ return poly;
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/relate/RelateMonotoneLinesPerfTest.java b/modules/core/src/test/java/test/jts/perf/operation/relate/RelateMonotoneLinesPerfTest.java
new file mode 100644
index 0000000..f44ac2e
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/relate/RelateMonotoneLinesPerfTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.relate;
+
+import java.io.PrintStream;
+
+import org.locationtech.jts.densify.Densifier;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.operation.relate.RelateOp;
+
+import test.jts.perf.PerformanceTestCase;
+import test.jts.perf.PerformanceTestRunner;
+import test.jts.util.IOUtil;
+
+
+/**
+ * Tests the performance of {@link RelateOp} (via {@link Geometry#intersects(Geometry)}
+ * on monotone linestrings, to confirm that the Monotone Chain comparison logic
+ * is working as expected.
+ * (In particular, Monotone Chains can be tested for intersections very efficiently,
+ * since the monotone property allows subchain envelopes to be computed dynamically,
+ * and thus binary search can be used to determine if two monotone chains intersect).
+ * This should result in roughly linear performance for testing intersection of
+ * chains (since the construction of the chain dominates the computation).
+ * This test demonstrates that this occurs in practice.
+ *
+ * @author mdavis
+ *
+ */
+public class RelateMonotoneLinesPerfTest extends PerformanceTestCase
+{
+ private static final int DENSIFY_FACTOR = 1000;
+
+ public static void main(String args[]) {
+ PerformanceTestRunner.run(RelateMonotoneLinesPerfTest.class);
+ }
+
+ public RelateMonotoneLinesPerfTest(String name) {
+ super(name);
+ setRunSize(new int[] { 2, 4, 8, 16, 32, 64, 128, 256, 512 });
+ setRunIterations(1);
+ }
+
+ LineString line1;
+ LineString line2;
+
+ public void startRun(int runSize) {
+ int nVertices = runSize * DENSIFY_FACTOR;
+ line1 = createLine("LINESTRING (0 0, 100 100)", nVertices);
+ line2 = createLine("LINESTRING (0 1, 100 99)", nVertices );
+
+ // force compilation of intersects code
+ line1.intersects(line2);
+ }
+
+ private LineString createLine(String wkt, int nVertices) {
+ double distanceTolerance = 100.0 / nVertices;
+ Geometry line = IOUtil.read(wkt);
+ LineString lineDense = (LineString) Densifier.densify(line, distanceTolerance);
+ return lineDense;
+ }
+
+ public void runIntersects()
+ {
+ System.out.println("Line size: " + line2.getNumPoints());
+ @SuppressWarnings("unused")
+ boolean isIntersects = line1.intersects(line2);
+ }
+
+ public void tearDown() {
+ double[] timeFactor = computeTimeFactors();
+ System.out.print("Time factors: ");
+ printArray(timeFactor, System.out);
+ System.out.println();
+ }
+
+ private void printArray(double[] timeFactor, PrintStream out) {
+ for (double d : timeFactor) {
+ out.print(d + " ");
+ }
+ }
+
+ private double[] computeTimeFactors() {
+ long[] runTime = getRunTime();
+ double[] timeFactor = new double[runTime.length - 1];
+ for (int i = 0; i < runTime.length - 1; i++) {
+ timeFactor[i] = (double) runTime[i + 1] / (double) runTime[i];
+ }
+ return timeFactor;
+ }
+
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/union/FileUnionPerfTest.java b/modules/core/src/test/java/test/jts/perf/operation/union/FileUnionPerfTest.java
new file mode 100644
index 0000000..f082c56
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/union/FileUnionPerfTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.union;
+
+import java.util.List;
+
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTFileReader;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+
+import test.jts.TestFiles;
+
+public class FileUnionPerfTest
+{
+ static final int MAX_ITER = 1;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ GeometryFactory factory = new GeometryFactory();
+
+ public static void main(String[] args) {
+ FileUnionPerfTest test = new FileUnionPerfTest();
+ try {
+ test.test();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ boolean testFailed = false;
+
+ public FileUnionPerfTest() {
+ }
+
+ public void test()
+ throws Exception
+ {
+ test(TestFiles.getResourceFilePath("africa.wkt"));
+ // test(TestFiles.getResourceFilePath("world.wkt"));
+ // test(TestFiles.getResourceFilePath("bc-250k.wkt"));
+ // test(TestFiles.getResourceFilePath("bc_20K.wkt"));
+ }
+
+ public void test(String filename)
+ throws Exception
+ {
+ WKTFileReader fileRdr = new WKTFileReader(filename, wktRdr);
+ List polys = fileRdr.read();
+
+ UnionPerfTester tester = new UnionPerfTester(polys);
+ tester.runAll();
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/union/PolygonUnionPerfTest.java b/modules/core/src/test/java/test/jts/perf/operation/union/PolygonUnionPerfTest.java
new file mode 100644
index 0000000..afb2ff8
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/union/PolygonUnionPerfTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.union;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.util.GeometricShapeFactory;
+
+
+public class PolygonUnionPerfTest
+{
+
+ static final int MAX_ITER = 1;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ GeometryFactory factory = new GeometryFactory();
+
+ public static void main(String[] args) {
+ PolygonUnionPerfTest test = new PolygonUnionPerfTest();
+
+// test.test();
+ test.testRampItems();
+
+ }
+
+ boolean testFailed = false;
+
+ public PolygonUnionPerfTest() {
+ }
+
+ public void testRampItems()
+ {
+ int nPts = 1000;
+
+ test(5, nPts, 10.0);
+ test(5, nPts, 10.0);
+ test(25, nPts, 10.0);
+ test(50, nPts, 10.0);
+ test(100, nPts, 10.0);
+ test(200, nPts, 10.0);
+ test(400, nPts, 10.0);
+ test(500, nPts, 10.0);
+ test(1000, nPts, 10.0);
+ test(2000, nPts, 10.0);
+ test(4000, nPts, 10.0);
+ }
+
+ public void test()
+ {
+// test(5, 100, 10.0);
+ test(1000, 100, 10.0);
+ }
+
+ public void test(int nItems, int nPts, double size)
+ {
+ System.out.println("---------------------------------------------------------");
+ System.out.println("# pts/item: " + nPts);
+
+ List polys = createPolys(nItems, size, nPts);
+
+// System.out.println();
+ //System.out.println("Running with " + nPts + " points");
+
+ UnionPerfTester tester = new UnionPerfTester(polys);
+ tester.runAll();
+ }
+
+ /**
+ * Creates a grid of circles with a small percentage of overlap
+ * in both directions.
+ * This approximated likely real-world cases well,
+ * and seems to produce
+ * close to worst-case performance for the Iterated algorithm.
+ *
+ * Sample times:
+ * 1000 items/100 pts - Cascaded: 2718 ms, Iterated 150 s
+ *
+ * @param nItems
+ * @param size
+ * @param nPts
+ * @return
+ */
+ List createPolys(int nItems, double size, int nPts)
+ {
+
+ // between 0 and 1
+ double overlapPct = 0.2;
+
+
+ int nCells = (int) Math.sqrt(nItems);
+
+ List geoms = new ArrayList();
+// double width = env.getWidth();
+ double width = nCells * (1 - overlapPct) * size;
+
+ // this results in many final polys
+ double height = nCells * 2 * size;
+
+ // this results in a single final polygon
+// double height = width;
+
+ double xInc = width / nCells;
+ double yInc = height / nCells;
+ for (int i = 0; i < nCells; i++) {
+ for (int j = 0; j < nCells; j++) {
+ Coordinate base = new Coordinate(
+ i * xInc,
+ j * yInc);
+ Geometry poly = createPoly(base, size, nPts);
+ geoms.add(poly);
+// System.out.println(poly);
+ }
+ }
+ return geoms;
+ }
+
+ Geometry createPoly(Coordinate base, double size, int nPts)
+ {
+ GeometricShapeFactory gsf = new GeometricShapeFactory(factory);
+ gsf.setCentre(base);
+ gsf.setSize(size);
+ gsf.setNumPoints(nPts);
+
+ Geometry poly = gsf.createCircle();
+// Geometry poly = gsf.createRectangle();
+
+// System.out.println(circle);
+ return poly;
+ }
+
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/union/UnionPerfTester.java b/modules/core/src/test/java/test/jts/perf/operation/union/UnionPerfTester.java
new file mode 100644
index 0000000..f594cfb
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/union/UnionPerfTester.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.union;
+
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
+import org.locationtech.jts.operation.union.CascadedPolygonUnion;
+import org.locationtech.jts.util.Stopwatch;
+
+
+
+public class UnionPerfTester
+{
+ public static final int CASCADED = 1;
+ public static final int ITERATED = 2;
+ public static final int BUFFER0 = 3;
+ public static final int ORDERED = 4;
+
+ public static void run(String testName, int testType, List polys)
+ {
+ UnionPerfTester test = new UnionPerfTester(polys);
+ test.run(testName, testType);
+ }
+
+ public static void runAll(List polys)
+ {
+ UnionPerfTester test = new UnionPerfTester(polys);
+ test.runAll();
+ }
+
+ static final int MAX_ITER = 1;
+
+ static PrecisionModel pm = new PrecisionModel();
+ static GeometryFactory fact = new GeometryFactory(pm, 0);
+ static WKTReader wktRdr = new WKTReader(fact);
+ static WKTWriter wktWriter = new WKTWriter();
+
+ Stopwatch sw = new Stopwatch();
+ GeometryFactory factory = new GeometryFactory();
+
+ private List polys;
+
+ public UnionPerfTester(List polys) {
+ this.polys = polys;
+ }
+
+
+
+ public void runAll()
+ {
+ System.out.println("# items: " + polys.size());
+ run("Cascaded", CASCADED, polys);
+// run("Buffer-0", BUFFER0, polys);
+
+ run("Iterated", ITERATED, polys);
+
+ }
+
+ public void run(String testName, int testType)
+ {
+ System.out.println();
+ System.out.println("======= Union Algorithm: " + testName + " ===========");
+
+ Stopwatch sw = new Stopwatch();
+ for (int i = 0; i < MAX_ITER; i++) {
+ Geometry union = null;
+ switch (testType) {
+ case CASCADED:
+ union = unionCascaded(polys);
+ break;
+ case ITERATED:
+ union = unionAllSimple(polys);
+ break;
+ case BUFFER0:
+ union = unionAllBuffer(polys);
+ break;
+ }
+
+// printFormatted(union);
+
+ }
+ System.out.println("Finished in " + sw.getTimeString());
+ }
+
+ void printFormatted(Geometry geom)
+ {
+ WKTWriter writer = new WKTWriter();
+ System.out.println(writer.writeFormatted(geom));
+ }
+
+ public Geometry unionAllSimple(List geoms)
+ {
+ Geometry unionAll = null;
+ int count = 0;
+ for (Iterator i = geoms.iterator(); i.hasNext(); ) {
+ Geometry geom = (Geometry) i.next();
+
+ if (unionAll == null) {
+ unionAll = (Geometry) geom.copy();
+ }
+ else {
+ unionAll = unionAll.union(geom);
+ }
+
+ count++;
+ if (count % 100 == 0) {
+ System.out.print(".");
+// System.out.println("Adding geom #" + count);
+ }
+ }
+ return unionAll;
+ }
+
+ public Geometry unionAllBuffer(List geoms)
+ {
+
+ Geometry gColl = factory.buildGeometry(geoms);
+ Geometry unionAll = gColl.buffer(0.0);
+ return unionAll;
+ }
+
+ public Geometry unionCascaded(List geoms)
+ {
+ return CascadedPolygonUnion.union(geoms);
+ }
+
+ /*
+ public Geometry unionAllOrdered(List geoms)
+ {
+// return OrderedUnion.union(geoms);
+ }
+ */
+
+ void printItemEnvelopes(List tree)
+ {
+ Envelope itemEnv = new Envelope();
+ for (Iterator i = tree.iterator(); i.hasNext(); ) {
+ Object o = i.next();
+ if (o instanceof List) {
+ printItemEnvelopes((List) o);
+ }
+ else if (o instanceof Geometry) {
+ itemEnv.expandToInclude( ((Geometry) o).getEnvelopeInternal());
+ }
+ }
+ System.out.println(factory.toGeometry(itemEnv));
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/valid/QuadtreeNestedRingTester.java b/modules/core/src/test/java/test/jts/perf/operation/valid/QuadtreeNestedRingTester.java
new file mode 100644
index 0000000..31752c9
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/valid/QuadtreeNestedRingTester.java
@@ -0,0 +1,100 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.valid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.index.quadtree.Quadtree;
+import org.locationtech.jts.operation.valid.IsValidOp;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Tests whether any of a set of {@link LinearRing}s are
+ * nested inside another ring in the set, using a {@link Quadtree}
+ * index to speed up the comparisons.
+ *
+ * @version 1.7
+ */
+public class QuadtreeNestedRingTester
+{
+
+ private GeometryGraph graph; // used to find non-node vertices
+ private List rings = new ArrayList();
+ private Envelope totalEnv = new Envelope();
+ private Quadtree quadtree;
+ private Coordinate nestedPt;
+
+ public QuadtreeNestedRingTester(GeometryGraph graph)
+ {
+ this.graph = graph;
+ }
+
+ public Coordinate getNestedPoint() { return nestedPt; }
+
+ public void add(LinearRing ring)
+ {
+ rings.add(ring);
+ totalEnv.expandToInclude(ring.getEnvelopeInternal());
+ }
+
+ public boolean isNonNested()
+ {
+ buildQuadtree();
+
+ for (int i = 0; i < rings.size(); i++) {
+ LinearRing innerRing = (LinearRing) rings.get(i);
+ Coordinate[] innerRingPts = innerRing.getCoordinates();
+
+ List results = quadtree.query(innerRing.getEnvelopeInternal());
+//System.out.println(results.size());
+ for (int j = 0; j < results.size(); j++) {
+ LinearRing searchRing = (LinearRing) results.get(j);
+ Coordinate[] searchRingPts = searchRing.getCoordinates();
+
+ if (innerRing == searchRing)
+ continue;
+
+ if (! innerRing.getEnvelopeInternal().intersects(searchRing.getEnvelopeInternal()))
+ continue;
+
+ Coordinate innerRingPt = IsValidOp.findPtNotNode(innerRingPts, searchRing, graph);
+ Assert.isTrue(innerRingPt != null, "Unable to find a ring point not a node of the search ring");
+ //Coordinate innerRingPt = innerRingPts[0];
+
+ boolean isInside = PointLocation.isInRing(innerRingPt, searchRingPts);
+ if (isInside) {
+ nestedPt = innerRingPt;
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ private void buildQuadtree()
+ {
+ quadtree = new Quadtree();
+
+ for (int i = 0; i < rings.size(); i++) {
+ LinearRing ring = (LinearRing) rings.get(i);
+ Envelope env = ring.getEnvelopeInternal();
+ quadtree.insert(env, ring);
+ }
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/valid/SweeplineNestedRingTester.java b/modules/core/src/test/java/test/jts/perf/operation/valid/SweeplineNestedRingTester.java
new file mode 100644
index 0000000..58102c1
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/valid/SweeplineNestedRingTester.java
@@ -0,0 +1,115 @@
+
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package test.jts.perf.operation.valid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.algorithm.PointLocation;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geomgraph.GeometryGraph;
+import org.locationtech.jts.index.sweepline.SweepLineIndex;
+import org.locationtech.jts.index.sweepline.SweepLineInterval;
+import org.locationtech.jts.index.sweepline.SweepLineOverlapAction;
+import org.locationtech.jts.operation.valid.IsValidOp;
+import org.locationtech.jts.util.Assert;
+
+/**
+ * Tests whether any of a set of {@link LinearRing}s are
+ * nested inside another ring in the set, using a {@link SweepLineIndex}
+ * index to speed up the comparisons.
+ *
+ * @version 1.7
+ */
+public class SweeplineNestedRingTester
+{
+
+ private GeometryGraph graph; // used to find non-node vertices
+ private List rings = new ArrayList();
+ //private Envelope totalEnv = new Envelope();
+ private SweepLineIndex sweepLine;
+ private Coordinate nestedPt = null;
+
+ public SweeplineNestedRingTester(GeometryGraph graph)
+ {
+ this.graph = graph;
+ }
+
+ public Coordinate getNestedPoint() { return nestedPt; }
+
+ public void add(LinearRing ring)
+ {
+ rings.add(ring);
+ }
+
+ public boolean isNonNested()
+ {
+ buildIndex();
+
+ OverlapAction action = new OverlapAction();
+
+ sweepLine.computeOverlaps(action);
+ return action.isNonNested;
+ }
+
+ private void buildIndex()
+ {
+ sweepLine = new SweepLineIndex();
+
+ for (int i = 0; i < rings.size(); i++) {
+ LinearRing ring = (LinearRing) rings.get(i);
+ Envelope env = ring.getEnvelopeInternal();
+ SweepLineInterval sweepInt = new SweepLineInterval(env.getMinX(), env.getMaxX(), ring);
+ sweepLine.add(sweepInt);
+ }
+ }
+
+ private boolean isInside(LinearRing innerRing, LinearRing searchRing)
+ {
+ Coordinate[] innerRingPts = innerRing.getCoordinates();
+ Coordinate[] searchRingPts = searchRing.getCoordinates();
+
+ if (! innerRing.getEnvelopeInternal().intersects(searchRing.getEnvelopeInternal()))
+ return false;
+
+ Coordinate innerRingPt = IsValidOp.findPtNotNode(innerRingPts, searchRing, graph);
+ Assert.isTrue(innerRingPt != null, "Unable to find a ring point not a node of the search ring");
+
+ boolean isInside = PointLocation.isInRing(innerRingPt, searchRingPts);
+ if (isInside) {
+ nestedPt = innerRingPt;
+ return true;
+ }
+ return false;
+ }
+
+
+ class OverlapAction
+ implements SweepLineOverlapAction
+ {
+ boolean isNonNested = true;
+
+ public void overlap(SweepLineInterval s0, SweepLineInterval s1)
+ {
+ LinearRing innerRing = (LinearRing) s0.getItem();
+ LinearRing searchRing = (LinearRing) s1.getItem();
+ if (innerRing == searchRing) return;
+
+ if (isInside(innerRing, searchRing))
+ isNonNested = false;
+ }
+
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/operation/valid/ValidStressTest.java b/modules/core/src/test/java/test/jts/perf/operation/valid/ValidStressTest.java
new file mode 100644
index 0000000..d924b3d
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/operation/valid/ValidStressTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.operation.valid;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.util.AffineTransformation;
+import org.locationtech.jts.operation.valid.IsValidOp;
+import org.locationtech.jts.util.Stopwatch;
+
+/**
+ * Stress-tests {@link IsValidOp}
+ * by running it on an invalid MultiPolygon with many intersections.
+ * In JTS 1.14 and earlier this takes a very long time to run,
+ * since all intersections are computed before the invalid result is returned.
+ * In fact it is only necessary to detect a single intersection in order
+ * to determine invalidity, and this provides much faster performance.
+ *
+ * @author mdavis
+ *
+ */
+public class ValidStressTest
+{
+ public static void main(String args[]) {
+ (new ValidStressTest()).runComb();
+ (new ValidStressTest()).runStarCrossPoly();
+ (new ValidStressTest()).runStarCrossRing();
+ }
+
+ public ValidStressTest() {
+ }
+
+ public static int SIZE = 10000;
+
+ static GeometryFactory geomFact = new GeometryFactory();
+
+ public void runComb()
+ {
+ int size = 400;
+ Envelope env = new Envelope(0,100,0,100);
+ Geometry geom = Comb.crossedComb(env, size, geomFact);
+ System.out.println(geom);
+ checkValid("Crossed combs (size = " + size + " )", geom);
+ }
+
+ public void runStarCrossPoly()
+ {
+ int size = 1000;
+ Envelope env = new Envelope(0,100,0,100);
+ Polygon geom = StarCross.star(env, size, geomFact);
+ //System.out.println(geom);
+ checkValid("StarCross " + geom.getGeometryType() + " (size = " + size + " )", geom);
+ }
+
+ public void runStarCrossRing()
+ {
+ int size = 1000;
+ Envelope env = new Envelope(0,100,0,100);
+ Polygon poly = StarCross.star(env, size, geomFact);
+ Geometry geom = poly.getBoundary();
+ //System.out.println(geom);
+ checkValid("StarCross " + geom.getGeometryType() + " (size = " + size + " )", geom);
+ }
+
+ public void checkValid(String name, Geometry g)
+ {
+ System.out.println("Running " + name);
+ Stopwatch sw = new Stopwatch();
+ boolean isValid = g.isValid();
+ System.out.println("Is Valid = " + isValid
+ + " Time: " + sw.getTimeString() );
+ }
+
+
+}
+
+class StarCross
+{
+ public static Polygon star(Envelope env, int nSeg, GeometryFactory geomFact)
+ {
+ Coordinate[] pts = new Coordinate[nSeg + 1];
+ Coordinate centre = env.centre();
+ double len = 0.5 * Math.min(env.getHeight(), env.getWidth());
+ double angInc = Math.PI + 2 * Math.PI / nSeg;
+
+ double ang = 0;
+ for (int i = 0; i < nSeg; i++) {
+ double x = centre.x + len * Math.cos(ang);
+ double y = centre.x + len * Math.sin(ang);
+ pts[i] = new Coordinate(x, y);
+ ang += angInc;
+ }
+ pts[nSeg] = new Coordinate(pts[0]);
+ return geomFact.createPolygon(pts);
+ }
+}
+
+/**
+ * Creates comb-like geometries.
+ * Crossed combs provide a geometry with a very high ratio of intersections to edges.
+ *
+ * @author Martin Davis
+ *
+ */
+class Comb
+{
+
+ public static MultiPolygon crossedComb(Envelope env, int size, GeometryFactory geomFact) {
+ Polygon comb1 = comb(env, size, geomFact);
+ Coordinate centre = env.centre();
+ AffineTransformation trans = AffineTransformation.rotationInstance(0.5 * Math.PI, centre.x, centre.y);
+ Polygon comb2 = (Polygon) trans.transform(comb1);
+ MultiPolygon mp = geomFact.createMultiPolygon(new Polygon[] { comb1, comb2 } );
+ return mp;
+ }
+
+ public static Polygon comb(Envelope env, int nArms, GeometryFactory geomFact)
+ {
+ int npts = 4 * (nArms - 1) + 2 + 2 + 1;
+ Coordinate[] pts = new Coordinate[npts];
+ double armWidth = env.getWidth() / (2 * nArms - 1);
+ double armLen = env.getHeight() - armWidth;
+
+ double xBase = env.getMinX();
+ double yBase = env.getMinY();
+
+ int ipts = 0;
+ for (int i = 0; i < nArms; i++) {
+ double x1 = xBase + i * 2 * armWidth;
+ double y1 = yBase + armLen + armWidth;
+ pts[ipts++] = new Coordinate(x1, y1);
+ pts[ipts++] = new Coordinate(x1 + armWidth, y1);
+ if (i < nArms - 1) {
+ pts[ipts++] = new Coordinate(x1 + armWidth, yBase + armWidth);
+ pts[ipts++] = new Coordinate(x1 + 2 * armWidth, yBase + armWidth);
+ }
+ }
+ pts[ipts++] = new Coordinate(env.getMaxX(), yBase);
+ pts[ipts++] = new Coordinate(xBase, yBase);
+ pts[ipts++] = new Coordinate(pts[0]);
+
+ return geomFact.createPolygon(pts);
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/perf/triangulate/DelaunayPerfTest.java b/modules/core/src/test/java/test/jts/perf/triangulate/DelaunayPerfTest.java
new file mode 100644
index 0000000..192ec66
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/triangulate/DelaunayPerfTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.triangulate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.triangulate.DelaunayTriangulationBuilder;
+import org.locationtech.jts.util.Memory;
+import org.locationtech.jts.util.Stopwatch;
+
+public class DelaunayPerfTest
+{
+ public static void main(String args[]) {
+ DelaunayPerfTest test = new DelaunayPerfTest();
+ test.run();
+ }
+
+ public void run()
+ {
+ run(10);
+ run(10);
+ run(100);
+ run(1000);
+ run(10000);
+ run(20000);
+ run(30000);
+ run(100000);
+ run(200000);
+ run(300000);
+ run(1000000);
+// run(2000000);
+ run(3000000);
+ }
+
+ final static GeometryFactory geomFact = new GeometryFactory();
+
+ final static double SIDE_LEN = 10.0;
+
+ public void run(int nPts)
+ {
+ List pts = randomPoints(nPts);
+ System.out.println("# pts: " + pts.size());
+ Stopwatch sw = new Stopwatch();
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(pts);
+
+// Geometry g = builder.getEdges(geomFact);
+ // don't actually form output geometry, to save time and memory
+ builder.getSubdivision();
+
+ System.out.println(" -- Time: " + sw.getTimeString()
+ + " Mem: " + Memory.usedTotalString());
+// System.out.println(g);
+ }
+
+ List randomPointsInGrid(int nPts)
+ {
+ List pts = new ArrayList();
+
+ int nSide = (int) Math.sqrt(nPts) + 1;
+
+ for (int i = 0; i < nSide; i++) {
+ for (int j = 0; j < nSide; j++) {
+ double x = i * SIDE_LEN + SIDE_LEN * Math.random();
+ double y = j * SIDE_LEN + SIDE_LEN * Math.random();
+ pts.add(new Coordinate(x, y));
+ }
+ }
+ return pts;
+ }
+
+ List randomPoints(int nPts)
+ {
+ List pts = new ArrayList();
+
+ for (int i = 0; i < nPts; i++) {
+ double x = SIDE_LEN * Math.random();
+ double y = SIDE_LEN * Math.random();
+ pts.add(new Coordinate(x, y));
+ }
+ return pts;
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/triangulate/DelaunayRobustTest.java b/modules/core/src/test/java/test/jts/perf/triangulate/DelaunayRobustTest.java
new file mode 100644
index 0000000..98862af
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/triangulate/DelaunayRobustTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2016 Martin Davis.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.triangulate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.triangulate.DelaunayTriangulationBuilder;
+import org.locationtech.jts.util.Memory;
+import org.locationtech.jts.util.Stopwatch;
+
+/**
+ * Test robustness of Delaunay computation.
+ * Test dataset is constructed to have many points
+ * with a large base offset. This reduces
+ * the precision available for the arithmetic in the inCircle test.
+ * This causes incorrect values to be computed by using
+ * the simple double-precision approach.
+ *
+ * @author Martin Davis
+ *
+ */
+public class DelaunayRobustTest
+{
+ public static void main(String args[]) {
+ DelaunayRobustTest test = new DelaunayRobustTest();
+ test.run();
+ }
+
+ public void run()
+ {
+ run(100000);
+ }
+
+ final static GeometryFactory geomFact = new GeometryFactory();
+
+ final static double SIDE_LEN = 1.0;
+ final static double BASE_OFFSET = 1.0e7;
+
+ public void run(int nPts)
+ {
+ System.out.println("Base offset: " + BASE_OFFSET);
+
+
+ List pts = randomPointsInGrid(nPts, BASE_OFFSET, BASE_OFFSET);
+ System.out.println("# pts: " + pts.size());
+ Stopwatch sw = new Stopwatch();
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(pts);
+
+// Geometry g = builder.getEdges(geomFact);
+ // don't actually form output geometry, to save time and memory
+ builder.getSubdivision();
+
+ System.out.println(" -- Time: " + sw.getTimeString()
+ + " Mem: " + Memory.usedTotalString());
+// System.out.println(g);
+ }
+
+ List randomPointsInGrid(int nPts, double basex, double basey)
+ {
+ List pts = new ArrayList();
+
+ int nSide = (int) Math.sqrt(nPts) + 1;
+
+ for (int i = 0; i < nSide; i++) {
+ for (int j = 0; j < nSide; j++) {
+ double x = basex + i * SIDE_LEN + SIDE_LEN * Math.random();
+ double y = basey + j * SIDE_LEN + SIDE_LEN * Math.random();
+ pts.add(new Coordinate(x, y));
+ }
+ }
+ return pts;
+ }
+
+ List randomPoints(int nPts)
+ {
+ List pts = new ArrayList();
+
+ for (int i = 0; i < nPts; i++) {
+ double x = SIDE_LEN * Math.random();
+ double y = SIDE_LEN * Math.random();
+ pts.add(new Coordinate(x, y));
+ }
+ return pts;
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/perf/triangulate/VoronoiPerfTest.java b/modules/core/src/test/java/test/jts/perf/triangulate/VoronoiPerfTest.java
new file mode 100644
index 0000000..0725913
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/perf/triangulate/VoronoiPerfTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.perf.triangulate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.triangulate.DelaunayTriangulationBuilder;
+import org.locationtech.jts.util.Stopwatch;
+
+public class VoronoiPerfTest
+{
+ public static void main(String args[]) {
+ VoronoiPerfTest test = new VoronoiPerfTest();
+ test.run();
+ }
+
+ public void run()
+ {
+ run(10);
+ run(100);
+ run(1000);
+ run(10000);
+ run(100000);
+ run(1000000);
+ }
+
+ final static GeometryFactory geomFact = new GeometryFactory();
+
+ final static double SIDE_LEN = 10.0;
+
+ public void run(int nPts)
+ {
+ List pts = randomPoints(nPts);
+ Stopwatch sw = new Stopwatch();
+ DelaunayTriangulationBuilder builder = new DelaunayTriangulationBuilder();
+ builder.setSites(pts);
+
+ Geometry g = builder.getEdges(geomFact);
+ System.out.println("# pts: " + pts.size() + " -- " + sw.getTimeString());
+// System.out.println(g);
+ }
+
+ List randomPoints(int nPts)
+ {
+ List pts = new ArrayList();
+
+ int nSide = (int) Math.sqrt(nPts) + 1;
+
+ for (int i = 0; i < nSide; i++) {
+ for (int j = 0; j < nSide; j++) {
+ double x = i * SIDE_LEN + SIDE_LEN * Math.random();
+ double y = j * SIDE_LEN + SIDE_LEN * Math.random();
+ pts.add(new Coordinate(x, y));
+ }
+ }
+ return pts;
+ }
+}
diff --git a/modules/core/src/test/java/test/jts/util/IOUtil.java b/modules/core/src/test/java/test/jts/util/IOUtil.java
new file mode 100644
index 0000000..692abef
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/util/IOUtil.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package test.jts.util;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+
+public class IOUtil {
+ public static Geometry read(String wkt)
+ {
+ WKTReader rdr = new WKTReader();
+ try {
+ return rdr.read(wkt);
+ }
+ catch (ParseException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
diff --git a/modules/core/src/test/java/test/jts/util/SerializationUtil.java b/modules/core/src/test/java/test/jts/util/SerializationUtil.java
new file mode 100644
index 0000000..9be1f02
--- /dev/null
+++ b/modules/core/src/test/java/test/jts/util/SerializationUtil.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.