This is an automated email from the ASF dual-hosted git repository.
jsorel pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git.
from e0b32d6 fix(SQLStore): add missing origin table on SQL column
definition.
add 41cca84 SQL/MM : regroup all functions in an internal package
add e735e9a SQL/MM : add all specification expressions
new fef9516 Merge branch 'feat/sqlmm' into geoapi-4.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/sis/filter/ArithmeticFunction.java | 8 +-
.../java/org/apache/sis/filter/BinaryFunction.java | 1 +
.../org/apache/sis/filter/ComparisonFunction.java | 15 +-
.../java/org/apache/sis/filter/DefaultBBOX.java | 2 +-
.../apache/sis/filter/DefaultFilterFactory.java | 3 +-
.../java/org/apache/sis/filter/DefaultLike.java | 3 +-
.../org/apache/sis/filter/FilterByIdentifier.java | 3 +-
.../sis/filter/InvalidExpressionException.java | 1 +
.../java/org/apache/sis/filter/LeafExpression.java | 5 +-
.../org/apache/sis/filter/LogicalFunction.java | 5 +-
.../src/main/java/org/apache/sis/filter/SQLMM.java | 113 ------
.../java/org/apache/sis/filter/ST_Intersects.java | 187 ----------
.../main/java/org/apache/sis/filter/ST_Point.java | 126 -------
.../org/apache/sis/filter/SpatialFunction.java | 237 +++----------
.../org/apache/sis/filter/TemporalFunction.java | 28 +-
.../java/org/apache/sis/filter/UnaryFunction.java | 5 +-
.../sis/internal/feature/jts/JTSMapping.java | 373 ++++++++++++++++++++
.../sis/internal/filter/FilterGeometryUtils.java | 281 +++++++++++++++
.../sis/{ => internal}/filter/NamedFunction.java | 9 +-
.../org/apache/sis/{ => internal}/filter/Node.java | 10 +-
.../sqlmm/AbstractAccessorSpatialFunction.java | 64 ++++
.../sqlmm/AbstractBinarySpatialFunction.java | 85 +++++
.../filter/sqlmm/AbstractGeomConstructor.java | 78 +++++
.../filter/sqlmm/AbstractSpatialFunction.java | 113 ++++++
.../apache/sis/internal/filter/sqlmm/SQLMM.java | 278 +++++++++++++++
.../apache/sis/internal/filter/sqlmm/ST_Area.java | 69 ++++
.../sis/internal/filter/sqlmm/ST_AsBinary.java | 68 ++++
.../apache/sis/internal/filter/sqlmm/ST_AsGML.java | 68 ++++
.../sis/internal/filter/sqlmm/ST_AsText.java | 70 ++++
.../sis/internal/filter/sqlmm/ST_Boundary.java | 72 ++++
.../filter/sqlmm}/ST_Buffer.java | 14 +-
.../filter/sqlmm}/ST_Centroid.java | 17 +-
.../sis/internal/filter/sqlmm/ST_Contains.java | 63 ++++
.../sis/internal/filter/sqlmm/ST_ConvexHull.java | 72 ++++
.../sis/internal/filter/sqlmm/ST_CoordDim.java | 72 ++++
.../sis/internal/filter/sqlmm/ST_Crosses.java | 63 ++++
.../sis/internal/filter/sqlmm/ST_Difference.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_Dimension.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_Disjoint.java | 63 ++++
.../sis/internal/filter/sqlmm/ST_Distance.java | 63 ++++
.../sis/internal/filter/sqlmm/ST_EndPoint.java | 73 ++++
.../filter/sqlmm}/ST_Envelope.java | 9 +-
.../sis/internal/filter/sqlmm/ST_Equals.java | 63 ++++
.../internal/filter/sqlmm/ST_ExplicitPoint.java | 75 ++++
.../sis/internal/filter/sqlmm/ST_ExteriorRing.java | 71 ++++
.../internal/filter/sqlmm/ST_GeomCollection.java | 52 +++
.../sis/internal/filter/sqlmm/ST_GeometryN.java | 83 +++++
.../sis/internal/filter/sqlmm/ST_GeometryType.java | 94 +++++
.../internal/filter/sqlmm/ST_InteriorRingN.java | 72 ++++
.../sis/internal/filter/sqlmm/ST_Intersection.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_Intersects.java | 63 ++++
.../apache/sis/internal/filter/sqlmm/ST_Is3D.java | 72 ++++
.../sis/internal/filter/sqlmm/ST_IsClosed.java | 69 ++++
.../sis/internal/filter/sqlmm/ST_IsEmpty.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_IsRing.java | 69 ++++
.../sis/internal/filter/sqlmm/ST_IsSimple.java | 68 ++++
.../sis/internal/filter/sqlmm/ST_IsValid.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_Length.java | 69 ++++
.../filter/sqlmm}/ST_LineString.java | 76 ++--
.../internal/filter/sqlmm/ST_MultiLineString.java | 52 +++
.../sis/internal/filter/sqlmm/ST_MultiPoint.java | 52 +++
.../sis/internal/filter/sqlmm/ST_MultiPolygon.java | 52 +++
.../internal/filter/sqlmm/ST_NumGeometries.java | 67 ++++
.../internal/filter/sqlmm/ST_NumInteriorRings.java | 69 ++++
.../sis/internal/filter/sqlmm/ST_NumPoints.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_Overlaps.java | 63 ++++
.../sis/internal/filter/sqlmm/ST_Perimeter.java | 71 ++++
.../apache/sis/internal/filter/sqlmm/ST_Point.java | 183 ++++++++++
.../sis/internal/filter/sqlmm/ST_PointN.java | 83 +++++
.../internal/filter/sqlmm/ST_PointOnSurface.java | 75 ++++
.../sis/internal/filter/sqlmm/ST_Polygon.java | 60 ++++
.../sis/internal/filter/sqlmm/ST_Relate.java | 74 ++++
.../apache/sis/internal/filter/sqlmm/ST_SRID.java | 67 ++++
.../filter/sqlmm}/ST_Simplify.java | 5 +-
.../filter/sqlmm}/ST_SimplifyPreserveTopology.java | 5 +-
.../sis/internal/filter/sqlmm/ST_StartPoint.java | 75 ++++
.../internal/filter/sqlmm/ST_SymDifference.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_ToGeomColl.java | 71 ++++
.../sis/internal/filter/sqlmm/ST_ToLineString.java | 71 ++++
.../sis/internal/filter/sqlmm/ST_ToMultiLine.java | 71 ++++
.../sis/internal/filter/sqlmm/ST_ToMultiPoint.java | 71 ++++
.../internal/filter/sqlmm/ST_ToMultiPolygon.java | 71 ++++
.../sis/internal/filter/sqlmm/ST_ToPoint.java | 71 ++++
.../sis/internal/filter/sqlmm/ST_ToPolygon.java | 71 ++++
.../sis/internal/filter/sqlmm/ST_Touches.java | 63 ++++
.../filter/sqlmm}/ST_Transform.java | 13 +-
.../apache/sis/internal/filter/sqlmm/ST_Union.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_Within.java | 63 ++++
.../org/apache/sis/internal/filter/sqlmm/ST_X.java | 67 ++++
.../sis/internal/filter/sqlmm/ST_XFromBinary.java | 385 +++++++++++++++++++++
.../sis/internal/filter/sqlmm/ST_XFromGML.java | 298 ++++++++++++++++
.../sis/internal/filter/sqlmm/ST_XFromText.java | 385 +++++++++++++++++++++
.../org/apache/sis/internal/filter/sqlmm/ST_Y.java | 68 ++++
.../org/apache/sis/internal/filter/sqlmm/ST_Z.java | 68 ++++
.../org/apache/sis/filter/BetweenFunctionTest.java | 1 +
.../filter/sqlmm}/SQLMMTest.java | 33 +-
.../apache/sis/test/suite/FeatureTestSuite.java | 2 +-
97 files changed, 6694 insertions(+), 723 deletions(-)
delete mode 100644
core/sis-feature/src/main/java/org/apache/sis/filter/SQLMM.java
delete mode 100644
core/sis-feature/src/main/java/org/apache/sis/filter/ST_Intersects.java
delete mode 100644
core/sis-feature/src/main/java/org/apache/sis/filter/ST_Point.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/JTSMapping.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/FilterGeometryUtils.java
rename core/sis-feature/src/main/java/org/apache/sis/{ =>
internal}/filter/NamedFunction.java (96%)
rename core/sis-feature/src/main/java/org/apache/sis/{ =>
internal}/filter/Node.java (95%)
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/AbstractAccessorSpatialFunction.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/AbstractBinarySpatialFunction.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/AbstractGeomConstructor.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/AbstractSpatialFunction.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SQLMM.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Area.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_AsBinary.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_AsGML.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_AsText.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Boundary.java
rename core/sis-feature/src/main/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/ST_Buffer.java (88%)
rename core/sis-feature/src/main/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/ST_Centroid.java (87%)
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Contains.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ConvexHull.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_CoordDim.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Crosses.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Difference.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Dimension.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Disjoint.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Distance.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_EndPoint.java
rename core/sis-feature/src/main/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/ST_Envelope.java (96%)
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Equals.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ExplicitPoint.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ExteriorRing.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_GeomCollection.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_GeometryN.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_GeometryType.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_InteriorRingN.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Intersection.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Intersects.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Is3D.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_IsClosed.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_IsEmpty.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_IsRing.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_IsSimple.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_IsValid.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Length.java
rename core/sis-feature/src/main/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/ST_LineString.java (64%)
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_MultiLineString.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_MultiPoint.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_MultiPolygon.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_NumGeometries.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_NumInteriorRings.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_NumPoints.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Overlaps.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Perimeter.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Point.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_PointN.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_PointOnSurface.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Polygon.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Relate.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_SRID.java
rename core/sis-feature/src/main/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/ST_Simplify.java (96%)
rename core/sis-feature/src/main/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/ST_SimplifyPreserveTopology.java (96%)
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_StartPoint.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_SymDifference.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ToGeomColl.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ToLineString.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ToMultiLine.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ToMultiPoint.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ToMultiPolygon.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ToPoint.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_ToPolygon.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Touches.java
rename core/sis-feature/src/main/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/ST_Transform.java (95%)
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Union.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Within.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_X.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_XFromBinary.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_XFromGML.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_XFromText.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Y.java
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Z.java
rename core/sis-feature/src/test/java/org/apache/sis/{filter =>
internal/filter/sqlmm}/SQLMMTest.java (94%)