You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2019/05/08 11:51:27 UTC
[jena] 06/08: JENA-664: Merge commit 'refs/pull/557/head' of
https://github.com/apache/jena into geosparql
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch geosparql
in repository https://gitbox.apache.org/repos/asf/jena.git
commit da2589f423520aba1b12af94f2d7eeec18b7e80b
Merge: b58c56f ef82bd9
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed May 8 12:02:48 2019 +0100
JENA-664: Merge commit 'refs/pull/557/head' of https://github.com/apache/jena into geosparql
jena-fuseki-geosparql/pom.xml | 221 ++++
.../jena/fuseki/geosparql/DatasetException.java | 33 +
.../jena/fuseki/geosparql/DatasetOperations.java | 213 ++++
.../jena/fuseki/geosparql/GeosparqlServer.java | 137 +++
.../org/apache/jena/fuseki/geosparql/Main.java | 72 ++
.../jena/fuseki/geosparql/cli/ArgsConfig.java | 203 ++++
.../fuseki/geosparql/cli/FileGraphDelimiter.java | 86 ++
.../jena/fuseki/geosparql/cli/FileGraphFormat.java | 87 ++
.../fuseki/geosparql/cli/IntegerListConverter.java | 40 +
.../fuseki/geosparql/cli/LongListConverter.java | 40 +
.../fuseki/geosparql/cli/RDFFileParameter.java | 91 ++
.../fuseki/geosparql/cli/TabFileParameter.java | 95 ++
.../src/main/resources/logback.xml | 47 +
.../org/apache/jena/fuseki/geosparql/MainTest.java | 124 ++
.../fuseki/geosparql/cli/RDFFileParameterTest.java | 101 ++
.../fuseki/geosparql/cli/TabFileParameterTest.java | 100 ++
jena-geosparql/pom.xml | 161 +++
.../geosparql/configuration/GeoSPARQLConfig.java | 277 +++++
.../configuration/GeoSPARQLOperations.java | 1172 ++++++++++++++++++
.../jena/geosparql/configuration/ModeSRS.java | 103 ++
.../jena/geosparql/configuration/SrsException.java | 33 +
.../GenericGeometryPropertyFunction.java | 168 +++
.../geo/topological/GenericPropertyFunction.java | 327 +++++
.../topological/SpatialObjectGeometryLiteral.java | 143 +++
.../property_functions/egenhofer/EhContainsPF.java | 34 +
.../egenhofer/EhCoveredByPF.java | 34 +
.../property_functions/egenhofer/EhCoversPF.java | 34 +
.../property_functions/egenhofer/EhDisjointPF.java | 34 +
.../property_functions/egenhofer/EhEqualsPF.java | 34 +
.../property_functions/egenhofer/EhInsidePF.java | 34 +
.../property_functions/egenhofer/EhMeetPF.java | 34 +
.../property_functions/egenhofer/EhOverlapPF.java | 33 +
.../geometry_property/CoordinateDimensionPF.java | 36 +
.../geometry_property/DimensionPF.java | 36 +
.../geometry_property/IsEmptyPF.java | 36 +
.../geometry_property/IsSimplePF.java | 36 +
.../geometry_property/IsValidPF.java | 37 +
.../geometry_property/SpatialDimensionPF.java | 36 +
.../property_functions/rcc8/RccDisconnectedPF.java | 33 +
.../property_functions/rcc8/RccEqualsPF.java | 34 +
.../rcc8/RccExternallyConnectedPF.java | 34 +
.../rcc8/RccNonTangentialProperPartInversePF.java | 34 +
.../rcc8/RccNonTangentialProperPartPF.java | 34 +
.../rcc8/RccPartiallyOverlappingPF.java | 34 +
.../rcc8/RccTangentialProperPartInversePF.java | 34 +
.../rcc8/RccTangentialProperPartPF.java | 34 +
.../simple_features/SfContainsPF.java | 34 +
.../simple_features/SfCrossesPF.java | 34 +
.../simple_features/SfDisjointPF.java | 34 +
.../simple_features/SfEqualsPF.java | 34 +
.../simple_features/SfIntersectsPF.java | 34 +
.../simple_features/SfOverlapsPF.java | 34 +
.../simple_features/SfTouchesPF.java | 34 +
.../simple_features/SfWithinPF.java | 34 +
.../filter_functions/BoundaryFF.java | 45 +
.../nontopological/filter_functions/BufferFF.java | 69 ++
.../filter_functions/ConvexHullFF.java | 46 +
.../filter_functions/DifferenceFF.java | 56 +
.../filter_functions/DistanceFF.java | 61 +
.../nontopological/filter_functions/EnvelopFF.java | 46 +
.../nontopological/filter_functions/GetSRIDFF.java | 46 +
.../filter_functions/IntersectionFF.java | 57 +
.../filter_functions/SymmetricDifferenceFF.java | 56 +
.../nontopological/filter_functions/UnionFF.java | 56 +
.../geof/topological/GenericFilterFunction.java | 81 ++
.../jena/geosparql/geof/topological/RelateFF.java | 64 +
.../filter_functions/egenhofer/EhContainsFF.java | 54 +
.../filter_functions/egenhofer/EhCoveredByFF.java | 53 +
.../filter_functions/egenhofer/EhCoversFF.java | 53 +
.../filter_functions/egenhofer/EhDisjointFF.java | 53 +
.../filter_functions/egenhofer/EhEqualsFF.java | 53 +
.../filter_functions/egenhofer/EhInsideFF.java | 53 +
.../filter_functions/egenhofer/EhMeetFF.java | 53 +
.../filter_functions/egenhofer/EhOverlapFF.java | 53 +
.../geometry_property/CoordinateDimensionFF.java | 45 +
.../geometry_property/DimensionFF.java | 45 +
.../geometry_property/IsEmptyFF.java | 45 +
.../geometry_property/IsSimpleFF.java | 45 +
.../geometry_property/IsValidFF.java | 46 +
.../geometry_property/SpatialDimensionFF.java | 45 +
.../filter_functions/rcc8/RccDisconnectedFF.java | 53 +
.../filter_functions/rcc8/RccEqualsFF.java | 53 +
.../rcc8/RccExternallyConnectedFF.java | 53 +
.../rcc8/RccNonTangentialProperPartFF.java | 53 +
.../rcc8/RccNonTangentialProperPartInverseFF.java | 53 +
.../rcc8/RccPartiallyOverlappingFF.java | 54 +
.../rcc8/RccTangentialProperPartFF.java | 53 +
.../rcc8/RccTangentialProperPartInverseFF.java | 53 +
.../simple_features/SfContainsFF.java | 53 +
.../simple_features/SfCrossesFF.java | 52 +
.../simple_features/SfDisjointFF.java | 52 +
.../simple_features/SfEqualsFF.java | 54 +
.../simple_features/SfIntersectsFF.java | 52 +
.../simple_features/SfOverlapsFF.java | 52 +
.../simple_features/SfTouchesFF.java | 52 +
.../simple_features/SfWithinFF.java | 52 +
.../geosparql/implementation/DimensionInfo.java | 216 ++++
.../geosparql/implementation/GeometryReverse.java | 226 ++++
.../geosparql/implementation/GeometryWrapper.java | 1248 ++++++++++++++++++++
.../implementation/GeometryWrapperFactory.java | 357 ++++++
.../jena/geosparql/implementation/SRSInfo.java | 325 +++++
.../geosparql/implementation/SRSInfoException.java | 33 +
.../implementation/UnitsConversionException.java | 33 +
.../geosparql/implementation/UnitsOfMeasure.java | 224 ++++
.../implementation/WKTLiteralFactory.java | 134 +++
.../implementation/datatype/GMLDatatype.java | 100 ++
.../implementation/datatype/GeometryDatatype.java | 104 ++
.../implementation/datatype/WKTDatatype.java | 103 ++
.../function_registration/Egenhofer.java | 84 ++
.../function_registration/GeometryProperty.java | 75 ++
.../function_registration/NonTopological.java | 61 +
.../implementation/function_registration/RCC8.java | 84 ++
.../function_registration/Relate.java | 45 +
.../function_registration/SimpleFeatures.java | 84 ++
.../function_registration/Spatial.java | 109 ++
.../implementation/great_circle/Angle.java | 112 ++
.../implementation/great_circle/Azimuth.java | 109 ++
.../great_circle/CoordinatePair.java | 152 +++
.../great_circle/GreatCircleDistance.java | 193 +++
.../great_circle/GreatCirclePointDistance.java | 197 +++
.../implementation/great_circle/LatLonPoint.java | 73 ++
.../implementation/index/CollisionResult.java | 26 +
.../implementation/index/GeometryLiteralIndex.java | 162 +++
.../index/GeometryTransformIndex.java | 159 +++
.../implementation/index/IndexConfiguration.java | 140 +++
.../implementation/index/QueryRewriteIndex.java | 301 +++++
.../EgenhoferIntersectionPattern.java | 47 +
.../RCC8IntersectionPattern.java | 42 +
.../SimpleFeaturesIntersectionPattern.java | 28 +
.../jts/CoordinateSequenceDimensions.java | 89 ++
.../jts/CustomCoordinateSequence.java | 569 +++++++++
.../jts/CustomCoordinateSequenceFactory.java | 57 +
.../implementation/jts/CustomGeometryFactory.java | 35 +
.../implementation/jts/GeometryTransformation.java | 235 ++++
.../implementation/parsers/ParserReader.java | 38 +
.../implementation/parsers/ParserWriter.java | 26 +
.../implementation/parsers/gml/GMLReader.java | 749 ++++++++++++
.../implementation/parsers/gml/GMLWriter.java | 282 +++++
.../implementation/parsers/wkt/WKTReader.java | 364 ++++++
.../implementation/parsers/wkt/WKTWriter.java | 290 +++++
.../registry/MathTransformRegistry.java | 59 +
.../implementation/registry/SRSRegistry.java | 140 +++
.../implementation/registry/UnitsRegistry.java | 138 +++
.../implementation/registry/UnitsURIException.java | 33 +
.../geosparql/implementation/vocabulary/Geo.java | 174 +++
.../implementation/vocabulary/GeoSPARQL_URI.java | 63 +
.../geosparql/implementation/vocabulary/Geof.java | 82 ++
.../implementation/vocabulary/Other_URI.java | 44 +
.../implementation/vocabulary/SRS_URI.java | 56 +
.../vocabulary/SpatialExtension.java | 76 ++
.../implementation/vocabulary/Unit_URI.java | 73 ++
.../jena/geosparql/spatial/CardinalDirection.java | 26 +
.../jena/geosparql/spatial/ConvertLatLon.java | 92 ++
.../jena/geosparql/spatial/ConvertLatLonBox.java | 76 ++
.../jena/geosparql/spatial/SearchEnvelope.java | 342 ++++++
.../jena/geosparql/spatial/SpatialIndex.java | 519 ++++++++
.../geosparql/spatial/SpatialIndexException.java | 33 +
.../jena/geosparql/spatial/SpatialIndexItem.java | 50 +
.../geosparql/spatial/SpatialIndexStorage.java | 101 ++
.../spatial/filter_functions/AngleDegreesFF.java | 67 ++
.../spatial/filter_functions/AngleFF.java | 66 ++
.../spatial/filter_functions/AzimuthDegreesFF.java | 66 ++
.../spatial/filter_functions/AzimuthFF.java | 66 ++
.../filter_functions/ConvertLatLonBoxFF.java | 41 +
.../spatial/filter_functions/ConvertLatLonFF.java | 43 +
.../spatial/filter_functions/DistanceFF.java | 61 +
.../spatial/filter_functions/EqualsFF.java | 54 +
.../spatial/filter_functions/GreatCircleFF.java | 83 ++
.../filter_functions/GreatCircleGeomFF.java | 61 +
.../spatial/filter_functions/NearbyFF.java | 76 ++
.../filter_functions/TransformDatatypeFF.java | 59 +
.../spatial/filter_functions/TransformFF.java | 74 ++
.../spatial/filter_functions/TransformSRSFF.java | 60 +
.../spatial/property_functions/EqualsPF.java | 34 +
.../GenericSpatialGeomPropertyFunction.java | 84 ++
.../GenericSpatialPropertyFunction.java | 203 ++++
.../property_functions/SpatialArguments.java | 87 ++
.../box/GenericSpatialBoxPropertyFunction.java | 89 ++
.../box/GenericSpatialGeomBoxPropertyFunction.java | 37 +
.../property_functions/box/IntersectBoxGeomPF.java | 43 +
.../property_functions/box/IntersectBoxPF.java | 43 +
.../property_functions/box/WithinBoxGeomPF.java | 43 +
.../property_functions/box/WithinBoxPF.java | 43 +
.../property_functions/cardinal/EastGeomPF.java | 33 +
.../property_functions/cardinal/EastPF.java | 33 +
.../GenericCardinalGeomPropertyFunction.java | 68 ++
.../cardinal/GenericCardinalPropertyFunction.java | 85 ++
.../property_functions/cardinal/NorthGeomPF.java | 33 +
.../property_functions/cardinal/NorthPF.java | 32 +
.../property_functions/cardinal/SouthGeomPF.java | 33 +
.../property_functions/cardinal/SouthPF.java | 33 +
.../property_functions/cardinal/WestGeomPF.java | 33 +
.../property_functions/cardinal/WestPF.java | 33 +
.../property_functions/nearby/NearbyGeomPF.java | 112 ++
.../property_functions/nearby/NearbyPF.java | 103 ++
.../schema/geosparql_vocab_all_v1_0_1_updated.rdf | 986 ++++++++++++++++
.../configuration/GeoSPARQLOperationsTest.java | 339 ++++++
.../jena/geosparql/configuration/ModeSRSTest.java | 103 ++
.../GenericGeometryPropertyFunctionTest.java | 140 +++
.../topological/GenericPropertyFunctionTest.java | 586 +++++++++
.../geo/topological/QueryRewriteTestData.java | 117 ++
.../SpatialObjectGeometryLiteralTest.java | 153 +++
.../egenhofer/EhContainsPFTest.java | 139 +++
.../egenhofer/EhCoveredByPFTest.java | 141 +++
.../egenhofer/EhCoversPFTest.java | 113 ++
.../egenhofer/EhDisjointPFTest.java | 139 +++
.../egenhofer/EhEqualsPFTest.java | 202 ++++
.../egenhofer/EhInsidePFTest.java | 169 +++
.../property_functions/egenhofer/EhMeetPFTest.java | 141 +++
.../egenhofer/EhOverlapPFTest.java | 130 ++
.../CoordinateDimensionPFTest.java | 107 ++
.../geometry_property/DimensionPFTest.java | 94 ++
.../geometry_property/IsEmptyPFTest.java | 81 ++
.../geometry_property/IsSimplePFTest.java | 81 ++
.../geometry_property/IsValidPFTest.java | 81 ++
.../geometry_property/SpatialDimensionPFTest.java | 107 ++
.../rcc8/RccDisconnectedPFTest.java | 84 ++
.../property_functions/rcc8/RccEqualsPFTest.java | 118 ++
.../rcc8/RccExternallyConnectedPFTest.java | 83 ++
.../RccNonTangentialProperPartInversePFTest.java | 83 ++
.../rcc8/RccNonTangentialProperPartPFTest.java | 83 ++
.../rcc8/RccPartiallyOverlappingPFTest.java | 82 ++
.../rcc8/RccTangentialProperPartInversePFTest.java | 84 ++
.../rcc8/RccTangentialProperPartPFTest.java | 84 ++
.../simple_features/SfContainsPFTest.java | 139 +++
.../simple_features/SfCrossesPFTest.java | 172 +++
.../simple_features/SfDisjointPFTest.java | 139 +++
.../simple_features/SfEqualsPFTest.java | 202 ++++
.../simple_features/SfIntersectsPFTest.java | 139 +++
.../simple_features/SfOverlapsPFTest.java | 141 +++
.../simple_features/SfTouchesPFTest.java | 140 +++
.../simple_features/SfWithinPFTest.java | 139 +++
.../filter_functions/BoundaryFFTest.java | 82 ++
.../filter_functions/BufferFFTest.java | 180 +++
.../filter_functions/ConvexHullFFTest.java | 80 ++
.../filter_functions/DifferenceFFTest.java | 68 ++
.../filter_functions/DistanceFFTest.java | 86 ++
.../filter_functions/EnvelopFFTest.java | 93 ++
.../filter_functions/GetSRIDFFTest.java | 81 ++
.../filter_functions/IntersectionFFTest.java | 96 ++
.../SymmetricDifferenceFFTest.java | 68 ++
.../filter_functions/UnionFFTest.java | 68 ++
.../egenhofer/EhContainsFFTest.java | 293 +++++
.../egenhofer/EhCoveredByFFTest.java | 295 +++++
.../filter_functions/egenhofer/EhCoversFFTest.java | 266 +++++
.../egenhofer/EhDisjointFFTest.java | 292 +++++
.../filter_functions/egenhofer/EhEqualsFFTest.java | 320 +++++
.../filter_functions/egenhofer/EhInsideFFTest.java | 322 +++++
.../filter_functions/egenhofer/EhMeetFFTest.java | 294 +++++
.../egenhofer/EhOverlapFFTest.java | 283 +++++
.../CoordinateDimensionFFTest.java | 106 ++
.../geometry_property/DimensionFFTest.java | 93 ++
.../geometry_property/IsEmptyFFTest.java | 80 ++
.../geometry_property/IsSimpleFFTest.java | 80 ++
.../geometry_property/IsValidFFTest.java | 80 ++
.../geometry_property/SpatialDimensionFFTest.java | 106 ++
.../rcc8/RccDisconnectedFFTest.java | 238 ++++
.../filter_functions/rcc8/RccEqualsFFTest.java | 237 ++++
.../rcc8/RccExternallyConnectedFFTest.java | 236 ++++
.../rcc8/RccNonTangentialProperPartFFTest.java | 236 ++++
.../RccNonTangentialProperPartInverseFFTest.java | 246 ++++
.../rcc8/RccPartiallyOverlappingFFTest.java | 236 ++++
.../rcc8/RccTangentialProperPartFFTest.java | 237 ++++
.../rcc8/RccTangentialProperPartInverseFFTest.java | 246 ++++
.../simple_features/SfContainsFFTest.java | 293 +++++
.../simple_features/SfCrossesFFTest.java | 325 +++++
.../simple_features/SfDisjointFFTest.java | 292 +++++
.../simple_features/SfEqualsFFTest.java | 320 +++++
.../simple_features/SfIntersectsFFTest.java | 292 +++++
.../simple_features/SfOverlapsFFTest.java | 294 +++++
.../simple_features/SfTouchesFFTest.java | 293 +++++
.../simple_features/SfWithinFFTest.java | 292 +++++
.../implementation/DimensionInfoTest.java | 102 ++
.../implementation/GeometryReverseTest.java | 293 +++++
.../implementation/GeometryWrapperFactoryTest.java | 159 +++
.../implementation/GeometryWrapperTest.java | 506 ++++++++
.../jena/geosparql/implementation/SRSInfoTest.java | 148 +++
.../implementation/UnitsOfMeasureTest.java | 303 +++++
.../implementation/datatype/GMLDatatypeTest.java | 304 +++++
.../datatype/GeometryDatatypeTest.java | 140 +++
.../implementation/datatype/WKTDatatypeTest.java | 450 +++++++
.../implementation/great_circle/AngleTest.java | 112 ++
.../implementation/great_circle/AzimuthTest.java | 142 +++
.../great_circle/CoordinatePairTest.java | 216 ++++
.../great_circle/GreatCircleDistanceTest.java | 82 ++
.../great_circle/GreatCirclePointDistanceTest.java | 205 ++++
.../jts/CoordinateSequenceDimensionsTest.java | 116 ++
.../implementation/jts/GeometryTransformTest.java | 110 ++
.../implementation/parsers/gml/GMLReaderTest.java | 743 ++++++++++++
.../implementation/parsers/gml/GMLWriterTest.java | 328 +++++
.../implementation/parsers/wkt/WKTReaderTest.java | 497 ++++++++
.../implementation/parsers/wkt/WKTWriterTest.java | 418 +++++++
.../implementation/registry/SRSRegistryTest.java | 139 +++
.../geosparql/spatial/ConvertLatLonBoxTest.java | 118 ++
.../jena/geosparql/spatial/ConvertLatLonTest.java | 198 ++++
.../jena/geosparql/spatial/SearchEnvelopeTest.java | 378 ++++++
.../geosparql/spatial/SpatialIndexTestData.java | 112 ++
.../filter_functions/AngleDegreesFFTest.java | 116 ++
.../spatial/filter_functions/AngleFFTest.java | 116 ++
.../filter_functions/AzimuthDegreesFFTest.java | 115 ++
.../spatial/filter_functions/AzimuthFFTest.java | 115 ++
.../filter_functions/ConvertLatLonBoxFFTest.java | 180 +++
.../filter_functions/ConvertLatLonFFTest.java | 143 +++
.../spatial/filter_functions/DistanceFFTest.java | 211 ++++
.../spatial/filter_functions/EqualsFFTest.java | 320 +++++
.../filter_functions/GreatCircleFFTest.java | 240 ++++
.../filter_functions/GreatCircleGeomFFTest.java | 196 +++
.../spatial/filter_functions/NearbyFFTest.java | 345 ++++++
.../filter_functions/TransformDatatypeFFTest.java | 146 +++
.../spatial/filter_functions/TransformFFTest.java | 196 +++
.../filter_functions/TransformSRSFFTest.java | 146 +++
.../spatial/property_functions/EqualsPFTest.java | 202 ++++
.../GenericSpatialGeomPropertyFunctionTest.java | 245 ++++
.../GenericSpatialPropertyFunctionTest.java | 227 ++++
.../box/GenericSpatialBoxPropertyFunctionTest.java | 353 ++++++
.../box/IntersectBoxGeomPFTest.java | 176 +++
.../property_functions/box/IntersectBoxPFTest.java | 172 +++
.../box/WithinBoxGeomPFTest.java | 176 +++
.../property_functions/box/WithinBoxPFTest.java | 173 +++
.../cardinal/EastGeomPFTest.java | 147 +++
.../property_functions/cardinal/EastPFTest.java | 146 +++
.../GenericCardinalGeomPropertyFunctionTest.java | 120 ++
.../GenericCardinalPropertyFunctionTest.java | 254 ++++
.../cardinal/NorthGeomPFTest.java | 110 ++
.../property_functions/cardinal/NorthPFTest.java | 109 ++
.../cardinal/SouthGeomPFTest.java | 111 ++
.../property_functions/cardinal/SouthPFTest.java | 109 ++
.../cardinal/WestGeomPFTest.java | 147 +++
.../property_functions/cardinal/WestPFTest.java | 146 +++
.../nearby/NearbyGeomPFTest.java | 448 +++++++
.../property_functions/nearby/NearbyPFTest.java | 406 +++++++
jena-geosparql/src/test/resources/logback-test.xml | 32 +
pom.xml | 576 ++++++---
333 files changed, 47323 insertions(+), 191 deletions(-)