MARMOTTA-584: merged pr #14 from @cuent (contribution from GSoC 2015) * cuent/MARMOTTA-584: (31 commits) Deleted patch file. MARMOTTA-584: applied patch by Xavier Sumba Added support for MULTIPOINT, LINESTRING AND POLYGON in isGeometry condition added new metadata value to keep track when the schema has been updated FIxed drop file. Improve documentation in upgrade file. Added test Cases of GeoSPARQL functions. Fixed ehMeet function. Added test Cases of GeoSPARQL functions. Fixed getSRID function. Added wktLiteral as data type to new geometries calculated (KiwiEvaluationStrategy): -buffer, convexHull, etc Direct support Insertion of geometries in functions: -example: geof:union(?geom1, "POLYGON(( -7 43, -2 43, -2 38, -7 38, -7 43))"^^geo:wktLiteral)) -example: geof:union(?geom1, geof:buffer(?geom2, 50, units:meter)) Added degrees and radians units supported for distance and buffer functions. Insert Direct Geometry in Functions Support Added drop extension postgis to drop_base_tables file. Added Test Cases for SF and non topological functions. Added unit "metre" to buffer and distance function. Fixed buffer function. Added String.format() to: SfWithinFunction DistanceFunction Updated max and min args for functions Fixed comments. Added getSRID, EH and RCC8 functions. Updated max and min args for functions. Add SRID support Add SRID support Modify load geometry literal in statements.properties Add SRID support. Updated max and min of args in SfIntersectsFunction ...
Signed-off-by: Sergio Fernández <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/47702ed7 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/47702ed7 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/47702ed7 Branch: refs/heads/MARMOTTA-584 Commit: 47702ed7535ea05576706220ccdecdf4215febc0 Parents: 4adec76 8d38242 Author: Sergio Fernández <[email protected]> Authored: Mon Aug 24 10:13:02 2015 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon Aug 24 10:13:02 2015 +0200 ---------------------------------------------------------------------- .../commons/sesame/model/Namespaces.java | 146 +- .../kiwi/sparql/builder/SQLBuilder.java | 31 +- .../marmotta/kiwi/sparql/builder/ValueType.java | 3 +- .../builder/eval/ValueExpressionEvaluator.java | 5 + .../evaluation/KiWiEvaluationStrategy.java | 16 + .../function/geosparql/BoundaryFunction.java | 148 ++ .../function/geosparql/BufferFunction.java | 156 ++ .../function/geosparql/ConvexHullFunction.java | 149 ++ .../function/geosparql/DifferenceFunction.java | 153 ++ .../function/geosparql/DistanceFunction.java | 160 ++ .../function/geosparql/EhContainsFunction.java | 152 ++ .../function/geosparql/EhCoveredByFunction.java | 152 ++ .../function/geosparql/EhCoversFunction.java | 152 ++ .../function/geosparql/EhDisjointFunction.java | 152 ++ .../function/geosparql/EhEqualsFunction.java | 152 ++ .../function/geosparql/EhInsideFunction.java | 152 ++ .../function/geosparql/EhMeetFunction.java | 152 ++ .../function/geosparql/EhOverlapFunction.java | 153 ++ .../function/geosparql/EnvelopeFunction.java | 148 ++ .../function/geosparql/GetSRIDFunction.java | 136 ++ .../geosparql/IntersectionFunction.java | 152 ++ .../function/geosparql/Rcc8DCFunction.java | 152 ++ .../function/geosparql/Rcc8ECFunction.java | 152 ++ .../function/geosparql/Rcc8EQFunction.java | 152 ++ .../function/geosparql/Rcc8NTPPFunction.java | 152 ++ .../function/geosparql/Rcc8NTPPiFunction.java | 152 ++ .../function/geosparql/Rcc8POFunction.java | 152 ++ .../function/geosparql/Rcc8TPPFunction.java | 152 ++ .../function/geosparql/Rcc8TPPiFunction.java | 152 ++ .../function/geosparql/RelateFunction.java | 152 ++ .../function/geosparql/SfContainsFunction.java | 152 ++ .../function/geosparql/SfCrossesFunction.java | 152 ++ .../function/geosparql/SfDisjointFunction.java | 152 ++ .../function/geosparql/SfEqualsFunction.java | 152 ++ .../geosparql/SfIntersectsFunction.java | 152 ++ .../function/geosparql/SfOverlapsFunction.java | 152 ++ .../function/geosparql/SfTouchesFunction.java | 152 ++ .../function/geosparql/SfWithinFunction.java | 152 ++ .../geosparql/SymDifferenceFunction.java | 152 ++ .../function/geosparql/UnionFunction.java | 152 ++ ...marmotta.kiwi.sparql.function.NativeFunction | 39 + ...f.query.algebra.evaluation.function.Function | 41 +- .../testgeosparql/GeoSPARQLFunctionsTest.java | 340 ++++ .../kiwi/sparql/testgeosparql/boundary.sparql | 28 + .../kiwi/sparql/testgeosparql/buffer.sparql | 30 + .../kiwi/sparql/testgeosparql/convexHull.sparql | 28 + .../testgeosparql/demo_data_spain_provinces.rdf | 66 + .../testgeosparql/demo_data_spain_rivers.rdf | 95 ++ .../testgeosparql/demo_data_spain_towns.rdf | 95 ++ .../kiwi/sparql/testgeosparql/difference.sparql | 33 + .../kiwi/sparql/testgeosparql/distance.sparql | 36 + .../kiwi/sparql/testgeosparql/ehContains.sparql | 35 + .../sparql/testgeosparql/ehCoveredBy.sparql | 35 + .../kiwi/sparql/testgeosparql/ehCovers.sparql | 35 + .../kiwi/sparql/testgeosparql/ehDisjoint.sparql | 35 + .../kiwi/sparql/testgeosparql/ehEquals.sparql | 34 + .../kiwi/sparql/testgeosparql/ehInside.sparql | 35 + .../kiwi/sparql/testgeosparql/ehMeet.sparql | 37 + .../kiwi/sparql/testgeosparql/ehOverlap.sparql | 35 + .../kiwi/sparql/testgeosparql/envelope.sparql | 28 + .../kiwi/sparql/testgeosparql/getSRID.sparql | 30 + .../sparql/testgeosparql/intersection.sparql | 33 + .../kiwi/sparql/testgeosparql/rcc8dc.sparql | 35 + .../kiwi/sparql/testgeosparql/rcc8ec.sparql | 37 + .../kiwi/sparql/testgeosparql/rcc8eq.sparql | 35 + .../kiwi/sparql/testgeosparql/rcc8ntpp.sparql | 35 + .../kiwi/sparql/testgeosparql/rcc8ntppi.sparql | 35 + .../kiwi/sparql/testgeosparql/rcc8po.sparql | 37 + .../kiwi/sparql/testgeosparql/rcc8tpp.sparql | 35 + .../kiwi/sparql/testgeosparql/rcc8tppi.sparql | 35 + .../kiwi/sparql/testgeosparql/relate.sparql | 35 + .../kiwi/sparql/testgeosparql/sfContains.sparql | 35 + .../kiwi/sparql/testgeosparql/sfCrosses.sparql | 35 + .../kiwi/sparql/testgeosparql/sfDisjoint.sparql | 35 + .../kiwi/sparql/testgeosparql/sfEquals.sparql | 34 + .../sparql/testgeosparql/sfIntersects.sparql | 35 + .../kiwi/sparql/testgeosparql/sfOverlaps.sparql | 35 + .../kiwi/sparql/testgeosparql/sfTouches.sparql | 35 + .../kiwi/sparql/testgeosparql/sfWithin.sparql | 35 + .../sparql/testgeosparql/symDifference.sparql | 33 + .../kiwi/sparql/testgeosparql/union.sparql | 33 + .../org/apache/marmotta/kiwi/io/KiWiIO.java | 110 ++ .../kiwi/model/rdf/KiWiGeometryLiteral.java | 103 ++ .../marmotta/kiwi/model/rdf/KiWiLiteral.java | 7 +- .../kiwi/persistence/KiWiConnection.java | 1546 ++++++++++-------- .../marmotta/kiwi/persistence/KiWiDialect.java | 47 +- .../marmotta/kiwi/sail/KiWiValueFactory.java | 332 ++-- .../marmotta/kiwi/vocabulary/FN_GEOSPARQL.java | 170 ++ .../kiwi/persistence/h2/create_base_tables.sql | 2 +- .../persistence/h2/upgrade_base_004_005.sql | 18 + .../persistence/mysql/create_base_tables.sql | 2 +- .../persistence/mysql/upgrade_base_004_005.sql | 18 + .../persistence/pgsql/create_base_tables.sql | 13 +- .../kiwi/persistence/pgsql/drop_base_tables.sql | 1 + .../persistence/pgsql/statements.properties | 26 +- .../persistence/pgsql/upgrade_base_004_005.sql | 41 + .../apache/marmotta/kiwi/test/DialectTest.java | 2 +- 97 files changed, 8867 insertions(+), 946 deletions(-) ----------------------------------------------------------------------
